move all inst declarations into their namespace

[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 11c9293..f804005 100644 (file)
--- a/src/msg/instr_msg_task.cpp
+++ b/src/msg/instr_msg_task.cpp
@@ -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));
     char str[INSTR_DEFAULT_STR_SIZE];
 
     container_t process_container = PJ_container_get (instr_process_id(MSG_process_self(), str, len));

-    Type* type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
-    Value* val                    = Value::get("task_execute", type);
-    new PushStateEvent(MSG_get_clock(), process_container, type, val);
+    simgrid::instr::Type* type    = PJ_type_get("MSG_PROCESS_STATE", process_container->type);
+    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));
     char str[INSTR_DEFAULT_STR_SIZE];
 
     container_t process_container = PJ_container_get (instr_process_id(MSG_process_self(), str, len));

-    Type* type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
-    new PopStateEvent (MSG_get_clock(), process_container, type);
+    simgrid::instr::Type* type    = PJ_type_get("MSG_PROCESS_STATE", process_container->type);
+    new simgrid::instr::PopStateEvent(MSG_get_clock(), process_container, type);

   }
 }
 
   }
 }
 


@@ -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));
     char str[INSTR_DEFAULT_STR_SIZE];
 
     container_t process_container = PJ_container_get (instr_process_id(MSG_process_self(), str, len));

-    Type* type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
-    Value* val                    = Value::get("receive", type);
-    new PushStateEvent(MSG_get_clock(), process_container, type, val);
+    simgrid::instr::Type* type    = PJ_type_get("MSG_PROCESS_STATE", process_container->type);
+    simgrid::instr::Value* val    = simgrid::instr::Value::get("receive", type);
+    new simgrid::instr::PushStateEvent(MSG_get_clock(), process_container, type, val);

   }
 }
 
   }
 }
 


@@ -108,13 +108,13 @@ 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));
     char str[INSTR_DEFAULT_STR_SIZE];
 
     container_t process_container = PJ_container_get (instr_process_id(MSG_process_self(), str, len));

-    Type* type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
-    new PopStateEvent (MSG_get_clock(), process_container, type);
+    simgrid::instr::Type* type    = PJ_type_get("MSG_PROCESS_STATE", process_container->type);
+    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());
 
     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);
+    new simgrid::instr::EndLinkEvent(MSG_get_clock(), PJ_container_get_root(), type, process_container, "SR", key);

   }
 }
 
   }
 }
 


@@ -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));
     char str[INSTR_DEFAULT_STR_SIZE];
 
     container_t process_container = PJ_container_get (instr_process_id(MSG_process_self(), str, len));

-    Type* type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
-    Value* val                    = Value::get("send", type);
-    new PushStateEvent(MSG_get_clock(), process_container, type, val);
+    simgrid::instr::Type* type    = PJ_type_get("MSG_PROCESS_STATE", process_container->type);
+    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());
 
     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);
+    new simgrid::instr::StartLinkEvent(MSG_get_clock(), PJ_container_get_root(), type, process_container, "SR", key);

   }
 
   return 1;
   }
 
   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));
     char str[INSTR_DEFAULT_STR_SIZE];
 
     container_t process_container = PJ_container_get (instr_process_id(MSG_process_self(), str, len));

-    Type* type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
-    new PopStateEvent (MSG_get_clock(), process_container, type);
+    simgrid::instr::Type* type    = PJ_type_get("MSG_PROCESS_STATE", process_container->type);
+    new simgrid::instr::PopStateEvent(MSG_get_clock(), process_container, type);

   }
 }
   }
 }