X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/79f2c630c9587d494cb154e6d074294c1e23208e..064b14e9ad70077e74cbc8ce42d4925f80d76ed4:/src/msg/instr_msg_process.cpp

diff --git a/src/msg/instr_msg_process.cpp b/src/msg/instr_msg_process.cpp
index db8621630a..e7e4604c90 100644
--- a/src/msg/instr_msg_process.cpp
+++ b/src/msg/instr_msg_process.cpp
@@ -1,17 +1,18 @@
-/* Copyright (c) 2010, 2012-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2010, 2012-2017. The SimGrid Team. All rights reserved.    */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "msg_private.h"
-#include "src/simix/smx_process_private.h"
+#include "simgrid/s4u/Host.hpp"
+#include "src/instr/instr_private.hpp"
+#include "src/msg/msg_private.hpp"
+#include "src/simix/ActorImpl.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_msg_process, instr, "MSG process");
 
 char *instr_process_id (msg_process_t proc, char *str, int len)
 {
-  return instr_process_id_2 (proc->name, proc->pid, str, len);//MSG_process_get_name(proc), MSG_process_get_PID(proc), str, len);
+  return instr_process_id_2(proc->getCname(), proc->getPid(), str, len);
 }
 
 char *instr_process_id_2 (const char *process_name, int process_pid, char *str, int len)
@@ -23,7 +24,7 @@ char *instr_process_id_2 (const char *process_name, int process_pid, char *str,
 /*
  * Instrumentation functions to trace MSG processes (msg_process_t)
  */
-void TRACE_msg_process_change_host(msg_process_t process, msg_host_t old_host, msg_host_t new_host)
+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;
@@ -35,9 +36,9 @@ void TRACE_msg_process_change_host(msg_process_t process, msg_host_t old_host, m
     char str[INSTR_DEFAULT_STR_SIZE];
 
     //start link
-    container_t msg = PJ_container_get (instr_process_id(process, str, len));
-    type_t type = PJ_type_get ("MSG_PROCESS_LINK", PJ_type_get_root());
-    new_pajeStartLink (MSG_get_clock(), PJ_container_get_root(), type, msg, "M", key);
+    container_t msg            = simgrid::instr::Container::byName(instr_process_id(process, str, len));
+    simgrid::instr::Type* type = PJ_type_get_root()->getChild("MSG_PROCESS_LINK");
+    new simgrid::instr::StartLinkEvent(MSG_get_clock(), PJ_container_get_root(), type, msg, "M", key);
 
     //destroy existing container of this process
     TRACE_msg_process_destroy (MSG_process_get_name (process), MSG_process_get_PID (process));
@@ -46,9 +47,9 @@ void TRACE_msg_process_change_host(msg_process_t process, msg_host_t old_host, m
     TRACE_msg_process_create (MSG_process_get_name (process), MSG_process_get_PID (process), new_host);
 
     //end link
-    msg = PJ_container_get(instr_process_id(process, str, len));
-    type = PJ_type_get ("MSG_PROCESS_LINK", PJ_type_get_root());
-    new_pajeEndLink (MSG_get_clock(), PJ_container_get_root(), type, msg, "M", key);
+    msg  = simgrid::instr::Container::byName(instr_process_id(process, str, len));
+    type = PJ_type_get_root()->getChild("MSG_PROCESS_LINK");
+    new simgrid::instr::EndLinkEvent(MSG_get_clock(), PJ_container_get_root(), type, msg, "M", key);
   }
 }
 
@@ -58,8 +59,9 @@ void TRACE_msg_process_create (const char *process_name, int process_pid, msg_ho
     int len = INSTR_DEFAULT_STR_SIZE;
     char str[INSTR_DEFAULT_STR_SIZE];
 
-    container_t host_container = PJ_container_get (SIMIX_host_get_name(host));
-    PJ_container_new(instr_process_id_2(process_name, process_pid, str, len), INSTR_MSG_PROCESS, host_container);
+    container_t host_container = simgrid::instr::Container::byName(host->getName());
+    new simgrid::instr::Container(instr_process_id_2(process_name, process_pid, str, len),
+                                  simgrid::instr::INSTR_MSG_PROCESS, host_container);
   }
 }
 
@@ -69,10 +71,11 @@ void TRACE_msg_process_destroy (const char *process_name, int process_pid)
     int len = INSTR_DEFAULT_STR_SIZE;
     char str[INSTR_DEFAULT_STR_SIZE];
 
-    container_t process = PJ_container_get_or_null(instr_process_id_2(process_name, process_pid, str, len));
+    container_t process =
+        simgrid::instr::Container::byNameOrNull(instr_process_id_2(process_name, process_pid, str, len));
     if (process) {
-      PJ_container_remove_from_parent (process);
-      PJ_container_free (process);
+      process->removeFromParent();
+      delete process;
     }
   }
 }
@@ -81,7 +84,7 @@ void TRACE_msg_process_kill(smx_process_exit_status_t status, msg_process_t proc
 {
   if (TRACE_msg_process_is_enabled() && status==SMX_EXIT_FAILURE){
     //kill means that this process no longer exists, let's destroy it
-    TRACE_msg_process_destroy(process->name, process->pid);
+    TRACE_msg_process_destroy(process->getCname(), process->getPid());
   }
 }
 
@@ -91,10 +94,10 @@ void TRACE_msg_process_suspend(msg_process_t process)
     int len = INSTR_DEFAULT_STR_SIZE;
     char str[INSTR_DEFAULT_STR_SIZE];
 
-    container_t process_container = PJ_container_get (instr_process_id(process, str, len));
-    type_t type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
-    val_t value = PJ_value_get ("suspend", type);
-    new_pajePushState (MSG_get_clock(), process_container, type, value);
+    container_t process_container = simgrid::instr::Container::byName(instr_process_id(process, str, len));
+    simgrid::instr::Type* type    = process_container->type_->getChild("MSG_PROCESS_STATE");
+    simgrid::instr::Value* val    = simgrid::instr::Value::byName("suspend", type);
+    new simgrid::instr::PushStateEvent(MSG_get_clock(), process_container, type, val);
   }
 }
 
@@ -104,9 +107,9 @@ void TRACE_msg_process_resume(msg_process_t process)
     int len = INSTR_DEFAULT_STR_SIZE;
     char str[INSTR_DEFAULT_STR_SIZE];
 
-    container_t process_container = PJ_container_get (instr_process_id(process, str, len));
-    type_t type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
-    new_pajePopState (MSG_get_clock(), process_container, type);
+    container_t process_container = simgrid::instr::Container::byName(instr_process_id(process, str, len));
+    simgrid::instr::Type* type    = process_container->type_->getChild("MSG_PROCESS_STATE");
+    new simgrid::instr::PopStateEvent(MSG_get_clock(), process_container, type);
   }
 }
 
@@ -116,10 +119,10 @@ void TRACE_msg_process_sleep_in(msg_process_t process)
     int len = INSTR_DEFAULT_STR_SIZE;
     char str[INSTR_DEFAULT_STR_SIZE];
 
-    container_t process_container = PJ_container_get (instr_process_id(process, str, len));
-    type_t type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
-    val_t value = PJ_value_get ("sleep", type);
-    new_pajePushState (MSG_get_clock(), process_container, type, value);
+    container_t process_container = simgrid::instr::Container::byName(instr_process_id(process, str, len));
+    simgrid::instr::Type* type    = process_container->type_->getChild("MSG_PROCESS_STATE");
+    simgrid::instr::Value* val    = simgrid::instr::Value::byName("sleep", type);
+    new simgrid::instr::PushStateEvent(MSG_get_clock(), process_container, type, val);
   }
 }
 
@@ -129,8 +132,8 @@ void TRACE_msg_process_sleep_out(msg_process_t process)
     int len = INSTR_DEFAULT_STR_SIZE;
     char str[INSTR_DEFAULT_STR_SIZE];
 
-    container_t process_container = PJ_container_get (instr_process_id(process, str, len));
-    type_t type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
-    new_pajePopState (MSG_get_clock(), process_container, type);
+    container_t process_container = simgrid::instr::Container::byName(instr_process_id(process, str, len));
+    simgrid::instr::Type* type    = process_container->type_->getChild("MSG_PROCESS_STATE");
+    new simgrid::instr::PopStateEvent(MSG_get_clock(), process_container, type);
   }
 }