X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1366b293e8c700b12567e45076cf0e6b7a25478f..e6b086a2fdd22931c0a2c75fbba13c50821d108c:/src/msg/instr_msg_task.cpp

diff --git a/src/msg/instr_msg_task.cpp b/src/msg/instr_msg_task.cpp
index b211d1fdf0..49f94db619 100644
--- a/src/msg/instr_msg_task.cpp
+++ b/src/msg/instr_msg_task.cpp
@@ -45,7 +45,7 @@ void TRACE_msg_task_create(msg_task_t task)
 
 /* MSG_task_execute related functions */
 void TRACE_msg_task_execute_start(msg_task_t task)
-{ paje_value pj_value;
+{
   XBT_DEBUG("EXEC,in %p, %lld, %s", task, task->counter, task->category);
 
   if (TRACE_msg_process_is_enabled()){
@@ -53,9 +53,9 @@ void TRACE_msg_task_execute_start(msg_task_t task)
     char str[INSTR_DEFAULT_STR_SIZE];
 
     container_t process_container = PJ_container_get (instr_process_id(MSG_process_self(), str, len));
-    type_t type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
-    val_t value = pj_value.PJ_value_get ("task_execute", type);
-    new PushStateEvent (MSG_get_clock(), process_container, type, value);
+    simgrid::instr::Type* type    = process_container->type_->getChild("MSG_PROCESS_STATE");
+    simgrid::instr::Value* val    = simgrid::instr::Value::get("task_execute", type);
+    new simgrid::instr::PushStateEvent(MSG_get_clock(), process_container, type, val);
   }
 }
 
@@ -68,8 +68,8 @@ void TRACE_msg_task_execute_end(msg_task_t task)
     char str[INSTR_DEFAULT_STR_SIZE];
 
     container_t process_container = PJ_container_get (instr_process_id(MSG_process_self(), str, len));
-    type_t type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
-    new PopStateEvent (MSG_get_clock(), process_container, type);
+    simgrid::instr::Type* type    = process_container->type_->getChild("MSG_PROCESS_STATE");
+    new simgrid::instr::PopStateEvent(MSG_get_clock(), process_container, type);
   }
 }
 
@@ -85,7 +85,7 @@ void TRACE_msg_task_destroy(msg_task_t task)
 
 /* MSG_task_get related functions */
 void TRACE_msg_task_get_start()
-{ paje_value pj_value;
+{
   XBT_DEBUG("GET,in");
 
   if (TRACE_msg_process_is_enabled()){
@@ -93,9 +93,9 @@ void TRACE_msg_task_get_start()
     char str[INSTR_DEFAULT_STR_SIZE];
 
     container_t process_container = PJ_container_get (instr_process_id(MSG_process_self(), str, len));
-    type_t type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
-    val_t value = pj_value.PJ_value_get ("receive", type);
-    new PushStateEvent (MSG_get_clock(), process_container, type, value);
+    simgrid::instr::Type* type    = process_container->type_->getChild("MSG_PROCESS_STATE");
+    simgrid::instr::Value* val    = simgrid::instr::Value::get("receive", type);
+    new simgrid::instr::PushStateEvent(MSG_get_clock(), process_container, type, val);
   }
 }
 
@@ -108,19 +108,19 @@ void TRACE_msg_task_get_end(double start_time, msg_task_t task)
     char str[INSTR_DEFAULT_STR_SIZE];
 
     container_t process_container = PJ_container_get (instr_process_id(MSG_process_self(), str, len));
-    type_t type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
-    new PopStateEvent (MSG_get_clock(), process_container, type);
+    simgrid::instr::Type* type    = process_container->type_->getChild("MSG_PROCESS_STATE");
+    new simgrid::instr::PopStateEvent(MSG_get_clock(), process_container, type);
 
     char key[INSTR_DEFAULT_STR_SIZE];
     snprintf (key, INSTR_DEFAULT_STR_SIZE, "p%lld", task->counter);
-    type = PJ_type_get ("MSG_PROCESS_TASK_LINK", PJ_type_get_root());
-    new EndLinkEvent(MSG_get_clock(), PJ_container_get_root(), type, process_container, "SR", key);
+    type = PJ_type_get_root()->getChild("MSG_PROCESS_TASK_LINK");
+    new simgrid::instr::EndLinkEvent(MSG_get_clock(), PJ_container_get_root(), type, process_container, "SR", key);
   }
 }
 
 /* MSG_task_put related functions */
 int TRACE_msg_task_put_start(msg_task_t task)
-{ paje_value pj_value;
+{
   XBT_DEBUG("PUT,in %p, %lld, %s", task, task->counter, task->category);
 
   if (TRACE_msg_process_is_enabled()){
@@ -128,14 +128,14 @@ int TRACE_msg_task_put_start(msg_task_t task)
     char str[INSTR_DEFAULT_STR_SIZE];
 
     container_t process_container = PJ_container_get (instr_process_id(MSG_process_self(), str, len));
-    type_t type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
-    val_t value = pj_value.PJ_value_get ("send", type);
-    new PushStateEvent (MSG_get_clock(), process_container, type, value);
+    simgrid::instr::Type* type    = process_container->type_->getChild("MSG_PROCESS_STATE");
+    simgrid::instr::Value* val    = simgrid::instr::Value::get("send", type);
+    new simgrid::instr::PushStateEvent(MSG_get_clock(), process_container, type, val);
 
     char key[INSTR_DEFAULT_STR_SIZE];
     snprintf (key, INSTR_DEFAULT_STR_SIZE, "p%lld", task->counter);
-    type = PJ_type_get ("MSG_PROCESS_TASK_LINK", PJ_type_get_root());
-    new StartLinkEvent(MSG_get_clock(), PJ_container_get_root(), type, process_container, "SR", key);
+    type = PJ_type_get_root()->getChild("MSG_PROCESS_TASK_LINK");
+    new simgrid::instr::StartLinkEvent(MSG_get_clock(), PJ_container_get_root(), type, process_container, "SR", key);
   }
 
   return 1;
@@ -150,7 +150,7 @@ void TRACE_msg_task_put_end()
     char str[INSTR_DEFAULT_STR_SIZE];
 
     container_t process_container = PJ_container_get (instr_process_id(MSG_process_self(), str, len));
-    type_t type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
-    new PopStateEvent (MSG_get_clock(), process_container, type);
+    simgrid::instr::Type* type    = process_container->type_->getChild("MSG_PROCESS_STATE");
+    new simgrid::instr::PopStateEvent(MSG_get_clock(), process_container, type);
   }
 }