X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7fc7124c05e03245515decbf6d54163d5990c2a6..6e604bae957c88e7d4375ec965935473f359d9ea:/src/instr/instr_interface.c

diff --git a/src/instr/instr_interface.c b/src/instr/instr_interface.c
index 2b03005b2e..34d03af197 100644
--- a/src/instr/instr_interface.c
+++ b/src/instr/instr_interface.c
@@ -12,8 +12,6 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_api, instr, "API");
 
-xbt_dict_t created_categories;
-
 void TRACE_category(const char *category)
 {
   TRACE_category_with_color (category, NULL);
@@ -21,14 +19,11 @@ void TRACE_category(const char *category)
 
 void TRACE_category_with_color (const char *category, const char *color)
 {
-  if (!TRACE_is_active())
+  if (!(TRACE_is_active() && category != NULL))
     return;
-//
-//  {
-//    //check if hosts have been created
-//    xbt_assert1 (allHostTypes != NULL && xbt_dict_length(allHostTypes) != 0,
-//        "%s must be called after environment creation", __FUNCTION__);
-//  }
+
+  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);
@@ -77,7 +72,7 @@ void TRACE_declare_mark(const char *mark_type)
     return;
 
   DEBUG1("MARK,declare %s", mark_type);
-  pajeDefineEventType(mark_type, "0", mark_type);
+  getEventType(mark_type, NULL, getRootType());
 }
 
 void TRACE_mark(const char *mark_type, const char *mark_value)
@@ -88,7 +83,65 @@ void TRACE_mark(const char *mark_type, const char *mark_value)
     return;
 
   DEBUG2("MARK %s %s", mark_type, mark_value);
-  pajeNewEvent(MSG_get_clock(), mark_type, "0", mark_value);
+  type_t type = getEventType (mark_type, NULL, getRootContainer()->type);
+  new_pajeNewEvent (MSG_get_clock(), getRootContainer(), type, 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{
+    container_t container = getContainerByName (resource);
+    type_t type = getVariableType (variable, NULL, container->type);
+    if (strcmp(what, "set") == 0) {
+      new_pajeSetVariable(time, container, type, value);
+    } else if (strcmp(what, "add") == 0) {
+      new_pajeAddVariable(time, container, type, value);
+    } else if (strcmp(what, "sub") == 0) {
+      new_pajeSubVariable(time, container, type, value);
+    }
+  }
+}
+
+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;
+    container_t container = getContainerByName(host_name);
+    type_t type = getVariableType (variable, NULL, container->type);
+    if (strcmp(what, "set") == 0) {
+      new_pajeSetVariable(time, container, type, value);
+    } else if (strcmp(what, "add") == 0) {
+      new_pajeAddVariable(time, container, type, value);
+    } else if (strcmp(what, "sub") == 0) {
+      new_pajeSubVariable(time, container, type, value);
+    }
+  }
 }
 
 #endif /* HAVE_TRACING */