X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b3a5b32a673e51a66c380cb2722893e0a298944c..c5f13796049934534009468a92c64392d0092510:/src/instr/instr_interface.c

diff --git a/src/instr/instr_interface.c b/src/instr/instr_interface.c
index 56cfd6a0eb..17515ef4b2 100644
--- a/src/instr/instr_interface.c
+++ b/src/instr/instr_interface.c
@@ -9,15 +9,10 @@
 #ifdef HAVE_TRACING
 
 #include "instr/instr_private.h"
+#include "surf/network_private.h"
 
 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);
@@ -25,9 +20,12 @@ 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;
 
+  xbt_assert (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;
@@ -45,7 +43,7 @@ void TRACE_category_with_color (const char *category, const char *color)
     snprintf (final_color, INSTR_DEFAULT_STR_SIZE, "%s", color);
   }
 
-  DEBUG2("CAT,declare %s, %s", category, final_color);
+  XBT_DEBUG("CAT,declare %s, %s", category, final_color);
 
 //FIXME
 //  -  if (final) {
@@ -63,19 +61,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_variable_type (category, final_color);
   }
 }
 
@@ -86,8 +72,8 @@ void TRACE_declare_mark(const char *mark_type)
   if (!mark_type)
     return;
 
-  DEBUG1("MARK,declare %s", mark_type);
-  pajeDefineEventType(mark_type, "0", mark_type);
+  XBT_DEBUG("MARK,declare %s", mark_type);
+  getEventType(mark_type, NULL, getRootType());
 }
 
 void TRACE_mark(const char *mark_type, const char *mark_value)
@@ -97,8 +83,94 @@ void TRACE_mark(const char *mark_type, const char *mark_value)
   if (!mark_type || !mark_value)
     return;
 
-  DEBUG2("MARK %s %s", mark_type, mark_value);
-  pajeNewEvent(MSG_get_clock(), mark_type, "0", mark_value);
+  XBT_DEBUG("MARK %s %s", mark_type, mark_value);
+  type_t type = getEventType (mark_type, NULL, getRootContainer()->type);
+  val_t value = getValue (mark_value, NULL, type);
+  new_pajeNewEvent (MSG_get_clock(), getRootContainer(), type, value);
+}
+
+void TRACE_user_variable(double time,
+                         const char *resource,
+                         const char *variable,
+                         const char *father_type,
+                         double value,
+                         InstrUserVariable what)
+{
+  if (!TRACE_is_active())
+    return;
+
+  xbt_assert (instr_platform_traced(),
+      "%s must be called after environment creation", __FUNCTION__);
+
+  char valuestr[100];
+  snprintf(valuestr, 100, "%g", value);
+
+  switch (what){
+  case INSTR_US_DECLARE:
+    instr_new_user_variable_type (father_type, variable, NULL);
+    break;
+  case INSTR_US_SET:
+  {
+    container_t container = getContainerByName(resource);
+    type_t type = getVariableType (variable, NULL, container->type);
+    new_pajeSetVariable(time, container, type, value);
+    break;
+  }
+  case INSTR_US_ADD:
+  {
+    container_t container = getContainerByName(resource);
+    type_t type = getVariableType (variable, NULL, container->type);
+    new_pajeAddVariable(time, container, type, value);
+    break;
+  }
+  case INSTR_US_SUB:
+  {
+    container_t container = getContainerByName(resource);
+    type_t type = getVariableType (variable, NULL, container->type);
+    new_pajeSubVariable(time, container, type, value);
+    break;
+  }
+  default:
+    //TODO: launch exception
+    break;
+  }
+}
+
+void TRACE_user_srcdst_variable(double time,
+                              const char *src,
+                              const char *dst,
+                              const char *variable,
+                              const char *father_type,
+                              double value,
+                              InstrUserVariable what)
+{
+  xbt_dynar_t route = global_routing->get_route (src, dst);
+  unsigned int i;
+  void *link;
+  xbt_dynar_foreach (route, i, link) {
+    char *link_name = ((link_CM02_t)link)->lmm_resource.generic_resource.name;
+    TRACE_user_variable (time, link_name, variable, father_type, value, what);
+  }
+}
+
+const char *TRACE_node_name (xbt_node_t node)
+{
+  void *data = xbt_graph_node_get_data(node);
+  char *str = (char*)data;
+  return str;
+}
+
+xbt_graph_t TRACE_platform_graph (void)
+{
+  if (!TRACE_is_active())
+    return NULL;
+
+  return instr_routing_platform_graph ();
+}
+
+void TRACE_platform_graph_export_graphviz (xbt_graph_t g, const char *filename)
+{
+  instr_routing_platform_graph_export_graphviz (g, filename);
 }
 
 #endif /* HAVE_TRACING */