Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

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

diff --git a/src/instr/instr_interface.c b/src/instr/instr_interface.c
index fabcf00..e49403a 100644 (file)
--- a/src/instr/instr_interface.c
+++ b/src/instr/instr_interface.c
@@ -15,7 +15,7 @@ typedef enum {
   INSTR_US_DECLARE,
   INSTR_US_SET,
   INSTR_US_ADD,
-  INSTR_US_SUB,
+  INSTR_US_SUB
 } InstrUserVariable;
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_api, instr, "API");
@@ -38,7 +38,7 @@ void TRACE_category_with_color (const char *category, const char *color)
   //check if category is already created
   char *created = xbt_dict_get_or_null(created_categories, category);
   if (created) return;
-  xbt_dict_set (created_categories, category, xbt_strdup("1"), xbt_free);
+  xbt_dict_set (created_categories, category, xbt_strdup("1"), NULL);
 
   //define final_color
   char final_color[INSTR_DEFAULT_STR_SIZE];
@@ -66,7 +66,7 @@ void TRACE_declare_mark(const char *mark_type)
   if (!mark_type) return;
 
   XBT_DEBUG("MARK,declare %s", mark_type);
-  getEventType(mark_type, NULL, getRootType());
+  PJ_type_event_new(mark_type, NULL, PJ_type_get_root());
 }
 
 void TRACE_mark(const char *mark_type, const char *mark_value)
@@ -77,9 +77,15 @@ void TRACE_mark(const char *mark_type, const char *mark_value)
   if (!mark_type || !mark_value) return;
 
   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);
+  type_t type = PJ_type_get (mark_type, PJ_type_get_root());
+  if (type == NULL){
+    THROWF (tracing_error, 1, "mark_type with name (%s) not declared before", mark_type);
+  }
+  val_t value = PJ_value_get (mark_value, type);
+  if (value == NULL){
+    value = PJ_value_new (mark_value, NULL, type);
+  }
+  new_pajeNewEvent (MSG_get_clock(), PJ_container_get_root(), type, value);
 }
 
 static void instr_user_variable(double time,
@@ -105,22 +111,22 @@ static void instr_user_variable(double time,
     break;
   case INSTR_US_SET:
   {
-    container_t container = getContainerByName(resource);
-    type_t type = getVariableType (variable, NULL, container->type);
+    container_t container = PJ_container_get(resource);
+    type_t type = PJ_type_get (variable, 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);
+    container_t container = PJ_container_get(resource);
+    type_t type = PJ_type_get (variable, 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);
+    container_t container = PJ_container_get(resource);
+    type_t type = PJ_type_get (variable, container->type);
     new_pajeSubVariable(time, container, type, value);
     break;
   }
@@ -138,7 +144,16 @@ static void instr_user_srcdst_variable(double time,
                               double value,
                               InstrUserVariable what)
 {
-  xbt_dynar_t route = global_routing->get_route (src, dst);
+  xbt_dynar_t route=NULL;
+  network_element_t src_elm = xbt_lib_get_or_null(host_lib,src,ROUTING_HOST_LEVEL);
+  if(!src_elm) src_elm = xbt_lib_get_or_null(as_router_lib,src,ROUTING_ASR_LEVEL);
+  if(!src_elm) xbt_die("Element '%s' not found!",src);
+
+  network_element_t dst_elm = xbt_lib_get_or_null(host_lib,dst,ROUTING_HOST_LEVEL);
+  if(!dst_elm) dst_elm = xbt_lib_get_or_null(as_router_lib,dst,ROUTING_ASR_LEVEL);
+  if(!dst_elm) xbt_die("Element '%s' not found!",dst);
+
+  routing_get_route_and_latency (src_elm, dst_elm, &route,NULL);
   unsigned int i;
   void *link;
   xbt_dynar_foreach (route, i, link) {