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

diff --git a/src/instr/instr_interface.c b/src/instr/instr_interface.c
index df21be5b9a..2ff128da1f 100644
--- 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");
@@ -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;
   }
@@ -131,8 +137,8 @@ static void instr_user_variable(double time,
 }
 
 static void instr_user_srcdst_variable(double time,
-                              const char *src,
-                              const char *dst,
+                              void *src,
+                              void *dst,
                               const char *variable,
                               const char *father_type,
                               double value,
@@ -256,32 +262,32 @@ void TRACE_link_variable_sub_with_time (double time, const char *link, const cha
 }
 
 /* for link variables, but with src and dst used for get_route */
-void TRACE_link_srcdst_variable_set (const char *src, const char *dst, const char *variable, double value)
+void TRACE_link_srcdst_variable_set (void *src, void *dst, const char *variable, double value)
 {
   TRACE_link_srcdst_variable_set_with_time (MSG_get_clock(), src, dst, variable, value);
 }
 
-void TRACE_link_srcdst_variable_add (const char *src, const char *dst, const char *variable, double value)
+void TRACE_link_srcdst_variable_add (void *src, void *dst, const char *variable, double value)
 {
   TRACE_link_srcdst_variable_add_with_time (MSG_get_clock(), src, dst, variable, value);
 }
 
-void TRACE_link_srcdst_variable_sub (const char *src, const char *dst, const char *variable, double value)
+void TRACE_link_srcdst_variable_sub (void *src, void *dst, const char *variable, double value)
 {
   TRACE_link_srcdst_variable_sub_with_time (MSG_get_clock(), src, dst, variable, value);
 }
 
-void TRACE_link_srcdst_variable_set_with_time (double time, const char *src, const char *dst, const char *variable, double value)
+void TRACE_link_srcdst_variable_set_with_time (double time, void *src, void *dst, const char *variable, double value)
 {
   instr_user_srcdst_variable (time, src, dst, variable, "LINK", value, INSTR_US_SET);
 }
 
-void TRACE_link_srcdst_variable_add_with_time (double time, const char *src, const char *dst, const char *variable, double value)
+void TRACE_link_srcdst_variable_add_with_time (double time, void *src, void *dst, const char *variable, double value)
 {
   instr_user_srcdst_variable (time, src, dst, variable, "LINK", value, INSTR_US_ADD);
 }
 
-void TRACE_link_srcdst_variable_sub_with_time (double time, const char *src, const char *dst, const char *variable, double value)
+void TRACE_link_srcdst_variable_sub_with_time (double time, void *src, void *dst, const char *variable, double value)
 {
   instr_user_srcdst_variable (time, src, dst, variable, "LINK", value, INSTR_US_SUB);
 }