X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5180ef8a951643b07bf2d6f8b8f13138fff7389b..579222ddee9e350c59189d9ee93d089292a64c15:/src/msg/instr_msg_process.cpp

diff --git a/src/msg/instr_msg_process.cpp b/src/msg/instr_msg_process.cpp
index 8bb5b20cce..a0aa2123eb 100644
--- a/src/msg/instr_msg_process.cpp
+++ b/src/msg/instr_msg_process.cpp
@@ -1,137 +1,24 @@
-/* Copyright (c) 2010, 2012-2016. The SimGrid Team. All rights reserved.    */
+/* Copyright (c) 2010-2018. 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 "simgrid/s4u/host.hpp"
-#include "src/instr/instr_private.h"
-#include "src/msg/msg_private.h"
+#include "src/instr/instr_private.hpp"
+#include "src/msg/msg_private.hpp"
 #include "src/simix/ActorImpl.hpp"
+#include <simgrid/actor.h>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_msg_process, instr, "MSG process");
 
-char *instr_process_id (msg_process_t proc, char *str, int len)
+std::string instr_pid(msg_process_t proc)
 {
-  return instr_process_id_2 (proc->cname(), proc->pid(), str, len);
-}
-
-char *instr_process_id_2 (const char *process_name, int process_pid, char *str, int len)
-{
-  snprintf (str, len, "%s-%d", process_name, process_pid);
-  return 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)
-{
-  if (TRACE_msg_process_is_enabled()){
-    static long long int counter = 0;
-
-    char key[INSTR_DEFAULT_STR_SIZE];
-    snprintf (key, INSTR_DEFAULT_STR_SIZE, "%lld", counter++);
-
-    int len = INSTR_DEFAULT_STR_SIZE;
-    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);
-
-    //destroy existing container of this process
-    TRACE_msg_process_destroy (MSG_process_get_name (process), MSG_process_get_PID (process));
-
-    //create new container on the new_host location
-    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);
-  }
-}
-
-void TRACE_msg_process_create (const char *process_name, int process_pid, msg_host_t host)
-{
-  if (TRACE_msg_process_is_enabled()){
-    int len = INSTR_DEFAULT_STR_SIZE;
-    char str[INSTR_DEFAULT_STR_SIZE];
-
-    container_t host_container = PJ_container_get(host->cname());
-    PJ_container_new(instr_process_id_2(process_name, process_pid, str, len), INSTR_MSG_PROCESS, host_container);
-  }
-}
-
-void TRACE_msg_process_destroy (const char *process_name, int process_pid)
-{
-  if (TRACE_msg_process_is_enabled()) {
-    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));
-    if (process) {
-      PJ_container_remove_from_parent (process);
-      PJ_container_free (process);
-    }
-  }
+  return std::string(proc->get_cname()) + "-" + std::to_string(proc->get_pid());
 }
 
 void TRACE_msg_process_kill(smx_process_exit_status_t status, msg_process_t process)
 {
-  if (TRACE_msg_process_is_enabled() && status==SMX_EXIT_FAILURE){
+  if (TRACE_actor_is_enabled() && status == SMX_EXIT_FAILURE) {
     //kill means that this process no longer exists, let's destroy it
-    TRACE_msg_process_destroy(process->cname(), process->pid());
-  }
-}
-
-void TRACE_msg_process_suspend(msg_process_t process)
-{
-  if (TRACE_msg_process_is_enabled()){
-    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);
-  }
-}
-
-void TRACE_msg_process_resume(msg_process_t process)
-{
-  if (TRACE_msg_process_is_enabled()){
-    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);
-  }
-}
-
-void TRACE_msg_process_sleep_in(msg_process_t process)
-{
-  if (TRACE_msg_process_is_enabled()){
-    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);
-  }
-}
-
-void TRACE_msg_process_sleep_out(msg_process_t process)
-{
-  if (TRACE_msg_process_is_enabled()){
-    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);
+    simgrid::instr::Container::by_name(instr_pid(process))->remove_from_parent();
   }
 }