X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0f5e8daaa6e9f74521068aa75837200bcd182ea6..79a76bdef6197f3fd8c3b44f8d53a68fcdffb8f7:/src/instr/surf_instr.c

diff --git a/src/instr/surf_instr.c b/src/instr/surf_instr.c
index 6f48031679..f73e28095f 100644
--- a/src/instr/surf_instr.c
+++ b/src/instr/surf_instr.c
@@ -11,8 +11,6 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(tracing_surf, tracing, "Tracing Surf");
 
-#define VARIABLE_SEPARATOR '#'
-
 static xbt_dict_t created_links;
 static xbt_dict_t host_containers;
 static xbt_dict_t resource_variables;   /* (host|link)#variable -> value */
@@ -57,7 +55,7 @@ static void TRACE_surf_set_resource_variable(double date,
   if (!IS_TRACING)
     return;
   snprintf(aux, 100, "%f", value);
-  snprintf(key, 100, "%s%c%s", resource, VARIABLE_SEPARATOR, variable);
+  snprintf(key, 100, "%s#%s", resource, variable);
 
   last_value = xbt_dict_get_or_null(resource_variables, key);
   if (last_value) {
@@ -65,8 +63,7 @@ static void TRACE_surf_set_resource_variable(double date,
       return;
     }
   }
-  if (IS_TRACING_PLATFORM)
-    pajeSetVariable(date, variable, resource, aux);
+  pajeSetVariable(date, variable, resource, aux);
   xbt_dict_set(resource_variables, xbt_strdup(key), xbt_strdup(aux),
                xbt_free);
 }
@@ -86,6 +83,10 @@ void TRACE_surf_link_declaration(void *link, char *name, double bw,
   if (!IS_TRACING)
     return;
 
+  if (!link){
+    xbt_die ("link is NULL");
+  }
+
   //filter out loopback
   if (!strcmp(name, "loopback") || !strcmp(name, "__loopback__"))
     return;
@@ -119,12 +120,16 @@ void TRACE_surf_host_declaration(const char *name, double power)
 void TRACE_surf_host_set_power(double date, const char *resource,
                                double power)
 {
+  if (!IS_TRACING)
+    return;
   TRACE_surf_set_resource_variable(date, "power", resource, power);
 }
 
 void TRACE_surf_link_set_bandwidth(double date, void *link,
                                    double bandwidth)
 {
+  if (!IS_TRACING)
+    return;
   if (!TRACE_surf_link_is_traced(link))
     return;
 
@@ -135,6 +140,8 @@ 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)
+    return;
   if (!TRACE_surf_link_is_traced(link))
     return;
 
@@ -237,8 +244,8 @@ void TRACE_surf_save_onelink(void)
       char resource[100];
       snprintf(resource, 100, "%p", link);
 
-      pajeNewEvent(0.1, "source", resource, src);
-      pajeNewEvent(0.1, "destination", resource, dst);
+      pajeNewEvent(0, "source", resource, src);
+      pajeNewEvent(0, "destination", resource, dst);
     }
   }
 }
@@ -260,9 +267,9 @@ void TRACE_surf_action(surf_action_t surf_action, const char *category)
     return;
   if (!IS_TRACING_PLATFORM)
     return;
-  if (!category) {
-    xbt_die("invalid tracing category");
-  }
+  if (!category)
+    return;
+
   surf_action->category = xbt_new(char, strlen(category) + 1);
   strncpy(surf_action->category, category, strlen(category) + 1);
 }