X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ae855a0d996d06d373fbc233e78b0fbe7f1f2df6..5423275bf80828ba9e68147dc76a6fcc737826a7:/src/instr/instr_surf.c

diff --git a/src/instr/instr_surf.c b/src/instr/instr_surf.c
index 235a890ede..b790425c3d 100644
--- a/src/instr/instr_surf.c
+++ b/src/instr/instr_surf.c
@@ -9,10 +9,8 @@
 
 #ifdef HAVE_TRACING
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(tracing_surf, tracing, "Tracing Surf");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_surf, instr, "Tracing Surf");
 
-static xbt_dict_t created_links;
-static xbt_dict_t host_containers;
 static xbt_dict_t resource_variables;   /* (host|link)#variable -> value */
 
 /* to trace gtnets */
@@ -21,8 +19,6 @@ static xbt_dict_t gtnets_dst;   /* %p (action) -> %s */
 
 void TRACE_surf_alloc(void)
 {
-  created_links = xbt_dict_new();
-  host_containers = xbt_dict_new();
   resource_variables = xbt_dict_new();
   gtnets_src = xbt_dict_new();
   gtnets_dst = xbt_dict_new();
@@ -32,17 +28,7 @@ void TRACE_surf_alloc(void)
 
 void TRACE_surf_release(void)
 {
-  char *key, *value;
-  xbt_dict_cursor_t cursor = NULL;
   TRACE_surf_resource_utilization_release();
-
-  /* get all host from host_containers */
-  xbt_dict_foreach(host_containers, cursor, key, value) {
-    pajeDestroyContainer(MSG_get_clock(), "HOST", key);
-  }
-  xbt_dict_foreach(created_links, cursor, key, value) {
-    pajeDestroyContainer(MSG_get_clock(), "LINK", key);
-  }
 }
 
 static void TRACE_surf_set_resource_variable(double date,
@@ -52,7 +38,7 @@ static void TRACE_surf_set_resource_variable(double date,
 {
   char aux[100], key[100];
   char *last_value = NULL;
-  if (!IS_TRACING)
+  if (!TRACE_is_active())
     return;
   snprintf(aux, 100, "%f", value);
   snprintf(key, 100, "%s#%s", resource, variable);
@@ -68,59 +54,10 @@ static void TRACE_surf_set_resource_variable(double date,
                xbt_free);
 }
 
-/*
- * TRACE_surf_link_declaration (name, bandwidth, latency): this function
- * saves the bandwidth and latency of a link identified by name. This
- * information is used in the future to create the link container in the trace.
- *
- * caller: net_link_new (from each network model)
- * main: create LINK container, set initial bandwidth and latency
- * return: void
- */
-void TRACE_surf_link_declaration(void *link, char *name, double bw,
-                                 double lat)
-{
-  if (!IS_TRACING)
-    return;
-
-  if (!link){
-    xbt_die ("link is NULL");
-  }
-
-  //filter out loopback
-  if (!strcmp(name, "loopback") || !strcmp(name, "__loopback__"))
-    return;
-
-  char alias[100];
-  snprintf(alias, 100, "%p", link);
-  pajeCreateContainer(SIMIX_get_clock(), alias, "LINK", "platform", name);
-  xbt_dict_set(created_links, alias, xbt_strdup("1"), xbt_free);
-  TRACE_surf_link_set_bandwidth(SIMIX_get_clock(), link, bw);
-  TRACE_surf_link_set_latency(SIMIX_get_clock(), link, lat);
-}
-
-/*
- * TRACE_surf_host_declaration (name, power): this function
- * saves the power of a host identified by name. This information
- * is used to create the host container in the trace.
- *
- * caller: cpu_new (from each cpu model) + router parser
- * main: create HOST containers, set initial power value
- * return: void
- */
-void TRACE_surf_host_declaration(const char *name, double power)
-{
-  if (!IS_TRACING)
-    return;
-  pajeCreateContainer(SIMIX_get_clock(), name, "HOST", "platform", name);
-  xbt_dict_set(host_containers, name, xbt_strdup("1"), xbt_free);
-  TRACE_surf_host_set_power(SIMIX_get_clock(), name, power);
-}
-
 void TRACE_surf_host_set_power(double date, const char *resource,
                                double power)
 {
-  if (!IS_TRACING)
+  if (!TRACE_is_active())
     return;
   TRACE_surf_set_resource_variable(date, "power", resource, power);
 }
@@ -128,7 +65,7 @@ void TRACE_surf_host_set_power(double date, const char *resource,
 void TRACE_surf_link_set_bandwidth(double date, void *link,
                                    double bandwidth)
 {
-  if (!IS_TRACING)
+  if (!TRACE_is_active())
     return;
   if (!TRACE_surf_link_is_traced(link))
     return;
@@ -140,7 +77,7 @@ void TRACE_surf_link_set_bandwidth(double date, void *link,
 
 void TRACE_surf_link_set_latency(double date, void *link, double latency)
 {
-  if (!IS_TRACING)
+  if (!TRACE_is_active())
     return;
   if (!TRACE_surf_link_is_traced(link))
     return;
@@ -154,7 +91,7 @@ void TRACE_surf_link_set_latency(double date, void *link, double latency)
 void TRACE_surf_gtnets_communicate(void *action, int src, int dst)
 {
   char key[100], aux[100];
-  if (!IS_TRACING)
+  if (!TRACE_is_active())
     return;
   snprintf(key, 100, "%p", action);
 
@@ -168,7 +105,7 @@ int TRACE_surf_gtnets_get_src(void *action)
 {
   char key[100];
   char *aux = NULL;
-  if (!IS_TRACING)
+  if (!TRACE_is_active())
     return -1;
   snprintf(key, 100, "%p", action);
 
@@ -184,7 +121,7 @@ int TRACE_surf_gtnets_get_dst(void *action)
 {
   char key[100];
   char *aux = NULL;
-  if (!IS_TRACING)
+  if (!TRACE_is_active())
     return -1;
   snprintf(key, 100, "%p", action);
 
@@ -199,7 +136,7 @@ int TRACE_surf_gtnets_get_dst(void *action)
 void TRACE_surf_gtnets_destroy(void *action)
 {
   char key[100];
-  if (!IS_TRACING)
+  if (!TRACE_is_active())
     return;
   snprintf(key, 100, "%p", action);
   xbt_dict_remove(gtnets_src, key);
@@ -210,7 +147,7 @@ void TRACE_surf_host_vivaldi_parse(char *host, double x, double y,
                                    double h)
 {
   char valuestr[100];
-  if (!IS_TRACING || !IS_TRACING_PLATFORM)
+  if (!TRACE_is_active() || !TRACE_platform_is_enabled())
     return;
 
   snprintf(valuestr, 100, "%g", x);
@@ -224,7 +161,7 @@ void TRACE_surf_host_vivaldi_parse(char *host, double x, double y,
 extern routing_global_t global_routing;
 void TRACE_surf_save_onelink(void)
 {
-  if (!IS_TRACING)
+  if (!TRACE_is_active())
     return;
 
   //get the onelinks from the parsed platform
@@ -250,27 +187,15 @@ void TRACE_surf_save_onelink(void)
   }
 }
 
-int TRACE_surf_link_is_traced(void *link)
-{
-  char alias[100];
-  snprintf(alias, 100, "%p", link);
-  if (xbt_dict_get_or_null(created_links, alias)) {
-    return 1;
-  } else {
-    return 0;
-  }
-}
-
 void TRACE_surf_action(surf_action_t surf_action, const char *category)
 {
-  if (!IS_TRACING)
+  if (!TRACE_is_active())
     return;
-  if (!IS_TRACING_PLATFORM)
+  if (!TRACE_categorized ())
     return;
   if (!category)
     return;
 
-  surf_action->category = xbt_new(char, strlen(category) + 1);
-  strncpy(surf_action->category, category, strlen(category) + 1);
+  surf_action->category = xbt_strdup(category);
 }
-#endif
+#endif /* HAVE_TRACING */