[trace] merging instr_variables.c into instr_interface.c (code re-organization)

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

diff --git a/src/instr/instr_interface.c b/src/instr/instr_interface.c
index 56cfd6a..7dc439d 100644 (file)
--- a/src/instr/instr_interface.c
+++ b/src/instr/instr_interface.c
@@ -12,12 +12,8 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_api, instr, "API");
 
-xbt_dict_t defined_types;
 xbt_dict_t created_categories;
 
-extern xbt_dict_t hosts_types;
-extern xbt_dict_t links_types;
-
 void TRACE_category(const char *category)
 {
   TRACE_category_with_color (category, NULL);
@@ -28,6 +24,9 @@ void TRACE_category_with_color (const char *category, const char *color)
   if (!TRACE_is_active())
     return;
 
+  xbt_assert1 (instr_platform_traced(),
+      "%s must be called after environment creation", __FUNCTION__);
+
   //check if category is already created
   char *created = xbt_dict_get_or_null(created_categories, category);
   if (created) return;
@@ -63,19 +62,7 @@ void TRACE_category_with_color (const char *category, const char *color)
 
   //define the type of this category on top of hosts and links
   if (TRACE_categorized ()){
-    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", category, type);
-      pajeDefineVariableTypeWithColor(new_type, type, category, final_color);
-    }
-    cursor = NULL;
-    xbt_dict_foreach(hosts_types, cursor, type, data) {
-      snprintf (new_type, INSTR_DEFAULT_STR_SIZE, "%s-%s", category, type);
-      pajeDefineVariableTypeWithColor(new_type, type, category, final_color);
-    }
+    instr_new_user_variable_type (category, final_color);
   }
 }
 
@@ -101,4 +88,62 @@ void TRACE_mark(const char *mark_type, const char *mark_value)
   pajeNewEvent(MSG_get_clock(), mark_type, "0", mark_value);
 }
 
+
+void TRACE_user_link_variable(double time, const char *resource,
+                              const char *variable,
+                              double value, const char *what)
+{
+  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) {
+    instr_new_user_link_variable_type (variable, NULL);
+  } else{
+    char *variable_id = instr_variable_type(variable, resource);
+    char *resource_id = instr_resource_type(resource);
+    if (strcmp(what, "set") == 0) {
+      pajeSetVariable(time, variable_id, resource_id, valuestr);
+    } else if (strcmp(what, "add") == 0) {
+      pajeAddVariable(time, variable_id, resource_id, valuestr);
+    } else if (strcmp(what, "sub") == 0) {
+      pajeSubVariable(time, variable_id, resource_id, valuestr);
+    }
+  }
+}
+
+void TRACE_user_host_variable(double time, const char *variable,
+                              double value, const char *what)
+{
+  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) {
+    instr_new_user_host_variable_type (variable, NULL);
+  } else{
+    char *host_name = MSG_host_self()->name;
+    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_id, resource_id, valuestr);
+    } else if (strcmp(what, "add") == 0) {
+      pajeAddVariable(time, variable_id, resource_id, valuestr);
+    } else if (strcmp(what, "sub") == 0) {
+      pajeSubVariable(time, variable_id, resource_id, valuestr);
+    }
+  }
+}
+
+
 #endif /* HAVE_TRACING */