Merge branch 'master' into actor-priority

[simgrid.git] / src / msg / instr_msg_task.cpp

diff --git a/src/msg/instr_msg_task.cpp b/src/msg/instr_msg_task.cpp
index 4c54cf2..4eb14d3 100644 (file)
--- a/src/msg/instr_msg_task.cpp
+++ b/src/msg/instr_msg_task.cpp
@@ -52,9 +52,9 @@ void TRACE_msg_task_execute_start(msg_task_t task)
     int len = INSTR_DEFAULT_STR_SIZE;
     char str[INSTR_DEFAULT_STR_SIZE];
 
-    container_t process_container = PJ_container_get (instr_process_id(MSG_process_self(), str, len));
-    simgrid::instr::Type* type    = process_container->type_->getChild("MSG_PROCESS_STATE");
-    simgrid::instr::Value* val    = simgrid::instr::Value::get("task_execute", type);
+    container_t process_container = simgrid::instr::Container::byName(instr_process_id(MSG_process_self(), str, len));
+    simgrid::instr::Type* type    = process_container->type_->byName("MSG_PROCESS_STATE");
+    simgrid::instr::Value* val    = simgrid::instr::Value::byName("task_execute", type);
     new simgrid::instr::PushStateEvent(MSG_get_clock(), process_container, type, val);
   }
 }
@@ -67,8 +67,8 @@ void TRACE_msg_task_execute_end(msg_task_t task)
     int len = INSTR_DEFAULT_STR_SIZE;
     char str[INSTR_DEFAULT_STR_SIZE];
 
-    container_t process_container = PJ_container_get (instr_process_id(MSG_process_self(), str, len));
-    simgrid::instr::Type* type    = process_container->type_->getChild("MSG_PROCESS_STATE");
+    container_t process_container = simgrid::instr::Container::byName(instr_process_id(MSG_process_self(), str, len));
+    simgrid::instr::Type* type    = process_container->type_->byName("MSG_PROCESS_STATE");
     new simgrid::instr::PopStateEvent(MSG_get_clock(), process_container, type);
   }
 }
@@ -92,9 +92,9 @@ void TRACE_msg_task_get_start()
     int len = INSTR_DEFAULT_STR_SIZE;
     char str[INSTR_DEFAULT_STR_SIZE];
 
-    container_t process_container = PJ_container_get (instr_process_id(MSG_process_self(), str, len));
-    simgrid::instr::Type* type    = process_container->type_->getChild("MSG_PROCESS_STATE");
-    simgrid::instr::Value* val    = simgrid::instr::Value::get("receive", type);
+    container_t process_container = simgrid::instr::Container::byName(instr_process_id(MSG_process_self(), str, len));
+    simgrid::instr::Type* type    = process_container->type_->byName("MSG_PROCESS_STATE");
+    simgrid::instr::Value* val    = simgrid::instr::Value::byName("receive", type);
     new simgrid::instr::PushStateEvent(MSG_get_clock(), process_container, type, val);
   }
 }
@@ -107,13 +107,13 @@ void TRACE_msg_task_get_end(double start_time, msg_task_t task)
     int len = INSTR_DEFAULT_STR_SIZE;
     char str[INSTR_DEFAULT_STR_SIZE];
 
-    container_t process_container = PJ_container_get (instr_process_id(MSG_process_self(), str, len));
-    simgrid::instr::Type* type    = process_container->type_->getChild("MSG_PROCESS_STATE");
+    container_t process_container = simgrid::instr::Container::byName(instr_process_id(MSG_process_self(), str, len));
+    simgrid::instr::Type* type    = process_container->type_->byName("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_root()->getChild("MSG_PROCESS_TASK_LINK");
+    type = simgrid::instr::Type::getRootType()->byName("MSG_PROCESS_TASK_LINK");
     new simgrid::instr::EndLinkEvent(MSG_get_clock(), PJ_container_get_root(), type, process_container, "SR", key);
   }
 }
@@ -127,14 +127,14 @@ int TRACE_msg_task_put_start(msg_task_t task)
     int len = INSTR_DEFAULT_STR_SIZE;
     char str[INSTR_DEFAULT_STR_SIZE];
 
-    container_t process_container = PJ_container_get (instr_process_id(MSG_process_self(), str, len));
-    simgrid::instr::Type* type    = process_container->type_->getChild("MSG_PROCESS_STATE");
-    simgrid::instr::Value* val    = simgrid::instr::Value::get("send", type);
+    container_t process_container = simgrid::instr::Container::byName(instr_process_id(MSG_process_self(), str, len));
+    simgrid::instr::Type* type    = process_container->type_->byName("MSG_PROCESS_STATE");
+    simgrid::instr::Value* val    = simgrid::instr::Value::byName("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_root()->getChild("MSG_PROCESS_TASK_LINK");
+    type = simgrid::instr::Type::getRootType()->byName("MSG_PROCESS_TASK_LINK");
     new simgrid::instr::StartLinkEvent(MSG_get_clock(), PJ_container_get_root(), type, process_container, "SR", key);
   }
 
@@ -149,8 +149,8 @@ void TRACE_msg_task_put_end()
     int len = INSTR_DEFAULT_STR_SIZE;
     char str[INSTR_DEFAULT_STR_SIZE];
 
-    container_t process_container = PJ_container_get (instr_process_id(MSG_process_self(), str, len));
-    simgrid::instr::Type* type    = process_container->type_->getChild("MSG_PROCESS_STATE");
+    container_t process_container = simgrid::instr::Container::byName(instr_process_id(MSG_process_self(), str, len));
+    simgrid::instr::Type* type    = process_container->type_->byName("MSG_PROCESS_STATE");
     new simgrid::instr::PopStateEvent(MSG_get_clock(), process_container, type);
   }
 }