[trace] protecting the declaration of multiple types with the same name

[simgrid.git] / src / instr / instr_variables.c

diff --git a/src/instr/instr_variables.c b/src/instr/instr_variables.c
index 5c3d1fe..608186b 100644 (file)
--- a/src/instr/instr_variables.c
+++ b/src/instr/instr_variables.c
@@ -10,10 +10,6 @@
 
 #ifdef HAVE_TRACING
 
-//extern routing_global_t global_routing;
-extern xbt_dict_t hosts_types;
-extern xbt_dict_t links_types;
-
 void TRACE_user_link_variable(double time, const char *resource,
                               const char *variable,
                               double value, const char *what)
@@ -21,37 +17,23 @@ void TRACE_user_link_variable(double time, const char *resource,
   if (!TRACE_is_active())
     return;
 
+  xbt_assert1 (instr_platform_traced(),
+      "%s must be called after environment creation", __FUNCTION__);
+
   char valuestr[100];
   snprintf(valuestr, 100, "%g", value);
 
   if (strcmp(what, "declare") == 0) {
-    {
-      //check if links have been created
-      xbt_assert1 (links_types != NULL && xbt_dict_length(links_types) != 0,
-          "%s must be called after environment creation", __FUNCTION__);
-    }
-
-    char new_type[INSTR_DEFAULT_STR_SIZE];
-    xbt_dict_cursor_t cursor = NULL;
-    char *type;
-    void *data;
-    xbt_dict_foreach(links_types, cursor, type, data) {
-      snprintf (new_type, INSTR_DEFAULT_STR_SIZE, "%s-%s", variable, type);
-      pajeDefineVariableType (new_type, type, variable);
-    }
+    instr_new_user_link_variable_type (variable, NULL);
   } else{
-    char *link_type = instr_link_type (resource);
-    xbt_assert2 (link_type != NULL,
-        "link %s provided to %s is not known by the tracing mechanism", resource, __FUNCTION__);
-    char variable_type[INSTR_DEFAULT_STR_SIZE];
-    snprintf (variable_type, INSTR_DEFAULT_STR_SIZE, "%s-%s", variable, link_type);
-
+    char *variable_id = instr_variable_type(variable, resource);
+    char *resource_id = instr_resource_type(resource);
     if (strcmp(what, "set") == 0) {
-      pajeSetVariable(time, variable_type, instr_id(resource), valuestr);
+      pajeSetVariable(time, variable_id, resource_id, valuestr);
     } else if (strcmp(what, "add") == 0) {
-      pajeAddVariable(time, variable_type, instr_id(resource), valuestr);
+      pajeAddVariable(time, variable_id, resource_id, valuestr);
     } else if (strcmp(what, "sub") == 0) {
-      pajeSubVariable(time, variable_type, instr_id(resource), valuestr);
+      pajeSubVariable(time, variable_id, resource_id, valuestr);
     }
   }
 }
@@ -62,36 +44,24 @@ void TRACE_user_host_variable(double time, const char *variable,
   if (!TRACE_is_active())
     return;
 
+  xbt_assert1 (instr_platform_traced(),
+      "%s must be called after environment creation", __FUNCTION__);
+
   char valuestr[100];
   snprintf(valuestr, 100, "%g", value);
 
   if (strcmp(what, "declare") == 0) {
-    {
-      //check if hosts have been created
-      xbt_assert1 (hosts_types != NULL && xbt_dict_length(hosts_types) != 0,
-          "%s must be called after environment creation", __FUNCTION__);
-    }
-
-    char new_type[INSTR_DEFAULT_STR_SIZE];
-    xbt_dict_cursor_t cursor = NULL;
-    char *type;
-    void *data;
-    xbt_dict_foreach(hosts_types, cursor, type, data) {
-      snprintf (new_type, INSTR_DEFAULT_STR_SIZE, "%s-%s", variable, type);
-      pajeDefineVariableType (new_type, type, variable);
-    }
+    instr_new_user_host_variable_type (variable, NULL);
   } else{
     char *host_name = MSG_host_self()->name;
-    char *host_type = instr_host_type (host_name);
-    char variable_type[INSTR_DEFAULT_STR_SIZE];
-    snprintf (variable_type, INSTR_DEFAULT_STR_SIZE, "%s-%s", variable, host_type);
-
+    char *variable_id = instr_variable_type(variable, host_name);
+    char *resource_id = instr_resource_type(host_name);
     if (strcmp(what, "set") == 0) {
-      pajeSetVariable(time, variable_type, instr_id(host_name), valuestr);
+      pajeSetVariable(time, variable_id, resource_id, valuestr);
     } else if (strcmp(what, "add") == 0) {
-      pajeAddVariable(time, variable_type, instr_id(host_name), valuestr);
+      pajeAddVariable(time, variable_id, resource_id, valuestr);
     } else if (strcmp(what, "sub") == 0) {
-      pajeSubVariable(time, variable_type, instr_id(host_name), valuestr);
+      pajeSubVariable(time, variable_id, resource_id, valuestr);
     }
   }
 }