#include "surf/surf_resource.h"
#include "xbt/xbt_os_thread.h"
+XBT_LOG_NEW_CATEGORY(surf, "All SURF categories");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf,
"Logging specific to SURF (kernel)");
return min;
}
-XBT_LOG_EXTERNAL_CATEGORY(surf_cpu);
-XBT_LOG_EXTERNAL_CATEGORY(surf_kernel);
-XBT_LOG_EXTERNAL_CATEGORY(surf_lagrange);
-XBT_LOG_EXTERNAL_CATEGORY(surf_lagrange_dichotomy);
-XBT_LOG_EXTERNAL_CATEGORY(surf_maxmin);
-XBT_LOG_EXTERNAL_CATEGORY(surf_network);
-XBT_LOG_EXTERNAL_CATEGORY(surf_trace);
-XBT_LOG_EXTERNAL_CATEGORY(surf_parse);
-XBT_LOG_EXTERNAL_CATEGORY(surf_workstation);
-XBT_LOG_EXTERNAL_CATEGORY(surf_config);
-XBT_LOG_EXTERNAL_CATEGORY(surf_route);
-
-#ifdef HAVE_GTNETS
-XBT_LOG_EXTERNAL_CATEGORY(surf_network_gtnets);
-#endif
-
static XBT_INLINE void routing_asr_host_free(void *p)
{
- network_element_t elm = p;
+ sg_routing_edge_t elm = p;
free(elm->name);
xbt_free(elm);
}
XBT_DEBUG("ADD ROUTING LEVEL");
ROUTING_HOST_LEVEL = xbt_lib_add_level(host_lib,routing_asr_host_free);
ROUTING_ASR_LEVEL = xbt_lib_add_level(as_router_lib,routing_asr_host_free);
- ROUTING_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,xbt_free);
- ROUTING_STORAGE_HOST_LEVEL = xbt_lib_add_level(storage_lib,routing_storage_host_free);
- ROUTING_STORAGE_TYPE_LEVEL = xbt_lib_add_level(storage_type_lib,routing_storage_type_free);
XBT_DEBUG("ADD SURF LEVELS");
SURF_CPU_LEVEL = xbt_lib_add_level(host_lib,surf_resource_free);
SURF_WKS_LEVEL = xbt_lib_add_level(host_lib,surf_resource_free);
SURF_LINK_LEVEL = xbt_lib_add_level(link_lib,surf_resource_free);
- SURF_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,surf_resource_free);
-
- /* Connect our log channels: that must be done manually under windows */
- XBT_LOG_CONNECT(surf_cpu, surf);
- XBT_LOG_CONNECT(surf_kernel, surf);
- XBT_LOG_CONNECT(surf_lagrange, surf);
- XBT_LOG_CONNECT(surf_lagrange_dichotomy, surf_lagrange);
- XBT_LOG_CONNECT(surf_maxmin, surf);
- XBT_LOG_CONNECT(surf_network, surf);
- XBT_LOG_CONNECT(surf_trace, surf);
- XBT_LOG_CONNECT(surf_parse, surf);
- XBT_LOG_CONNECT(surf_workstation, surf);
- XBT_LOG_CONNECT(surf_config, surf);
- XBT_LOG_CONNECT(surf_route, surf);
-
-#ifdef HAVE_GTNETS
- XBT_LOG_CONNECT(surf_network_gtnets, surf);
-#endif
xbt_init(argc, argv);
if (!model_list)