Sonar: extract assignment from expression.

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

diff --git a/src/msg/instr_msg_process.cpp b/src/msg/instr_msg_process.cpp
index 2066f50..ceaafb2 100644 (file)
--- a/src/msg/instr_msg_process.cpp
+++ b/src/msg/instr_msg_process.cpp
@@ -20,13 +20,14 @@ void TRACE_msg_process_change_host(msg_process_t process, msg_host_t new_host)
   if (TRACE_msg_process_is_enabled()){
     static long long int counter = 0;
 
-    std::string key = std::to_string(counter++);
+    std::string key = std::to_string(counter);
+    counter++;
 
     //start link
-    container_t msg = simgrid::instr::Container::byName(instr_pid(process));
-    simgrid::instr::LinkType* link =
-        static_cast<simgrid::instr::LinkType*>(simgrid::instr::Type::getRootType()->byName("MSG_PROCESS_LINK"));
-    link->startEvent(MSG_get_clock(), simgrid::instr::Container::getRootContainer(), msg, "M", key);
+    container_t msg                = simgrid::instr::Container::byName(instr_pid(process));
+    container_t root               = simgrid::instr::Container::getRootContainer();
+    simgrid::instr::LinkType* link = root->getLink("MSG_PROCESS_LINK");
+    link->startEvent(root, msg, "M", key);
 
     //destroy existing container of this process
     TRACE_msg_process_destroy (MSG_process_get_name (process), MSG_process_get_PID (process));
@@ -36,24 +37,22 @@ void TRACE_msg_process_change_host(msg_process_t process, msg_host_t new_host)
 
     //end link
     msg = simgrid::instr::Container::byName(instr_pid(process));
-    link->endEvent(MSG_get_clock(), simgrid::instr::Container::getRootContainer(), msg, "M", key);
+    link->endEvent(root, msg, "M", key);
   }
 }
 
-void TRACE_msg_process_create (const char *process_name, int process_pid, msg_host_t host)
+void TRACE_msg_process_create(std::string process_name, int process_pid, msg_host_t host)
 {
   if (TRACE_msg_process_is_enabled()){
     container_t host_container = simgrid::instr::Container::byName(host->getName());
-    new simgrid::instr::Container(std::string(process_name) + "-" + std::to_string(process_pid), "MSG_PROCESS",
-                                  host_container);
+    new simgrid::instr::Container(process_name + "-" + std::to_string(process_pid), "MSG_PROCESS", host_container);
   }
 }
 
-void TRACE_msg_process_destroy (const char *process_name, int process_pid)
+void TRACE_msg_process_destroy(std::string process_name, int process_pid)
 {
   if (TRACE_msg_process_is_enabled()) {
-    container_t process =
-        simgrid::instr::Container::byNameOrNull(std::string(process_name) + "-" + std::to_string(process_pid));
+    container_t process = simgrid::instr::Container::byNameOrNull(process_name + "-" + std::to_string(process_pid));
     if (process) {
       process->removeFromParent();
       delete process;