X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f00f8da2fe2073d48fc817d7d0272997837200fd..95b11095f38bb2b508878eb860d1b52ca7e9d09c:/src/surf/surf.c

diff --git a/src/surf/surf.c b/src/surf/surf.c
index b80d1fd389..2ed4e24e61 100644
--- a/src/surf/surf.c
+++ b/src/surf/surf.c
@@ -288,22 +288,12 @@ double generic_maxmin_share_resources(xbt_swag_t running_actions,
   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_timer);
-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;
+  free(elm->name);
+  xbt_free(elm);
+}
 
 void surf_init(int *argc, char **argv)
 {
@@ -315,8 +305,8 @@ void surf_init(int *argc, char **argv)
   storage_type_lib = xbt_lib_new();
 
   XBT_DEBUG("ADD ROUTING LEVEL");
-  ROUTING_HOST_LEVEL = xbt_lib_add_level(host_lib,xbt_free);
-  ROUTING_ASR_LEVEL  = xbt_lib_add_level(as_router_lib,xbt_free);
+  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);
@@ -327,24 +317,6 @@ void surf_init(int *argc, char **argv)
   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_timer, 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)
     model_list = xbt_dynar_new(sizeof(surf_model_private_t), NULL);