Reduce the amount of implicit include directories

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

diff --git a/src/msg/instr_msg_process.c b/src/msg/instr_msg_process.c
index dba5b6b..1af7c96 100644 (file)
--- a/src/msg/instr_msg_process.c
+++ b/src/msg/instr_msg_process.c
@@ -1,16 +1,11 @@
-/* Copyright (c) 2010. The SimGrid Team.
+/* Copyright (c) 2010, 2012-2015. 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. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "msg_private.h"
-#include "mc/mc.h"
-
-#include "msg/datatypes.h"
-#include "simix/smx_process_private.h"
-
-#ifdef HAVE_TRACING
+#include "src/simix/smx_process_private.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_msg_process, instr, "MSG process");
 
@@ -33,9 +28,6 @@ void TRACE_msg_process_change_host(msg_process_t process, msg_host_t old_host, m
   if (TRACE_msg_process_is_enabled()){
     static long long int counter = 0;
 
-    if(MC_is_active())
-      MC_ignore_data_bss(&counter, sizeof(counter));
-
     char key[INSTR_DEFAULT_STR_SIZE];
     snprintf (key, INSTR_DEFAULT_STR_SIZE, "%lld", counter++);
 
@@ -66,7 +58,7 @@ 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->smx_host));
+    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);
   }
 }
@@ -81,11 +73,11 @@ void TRACE_msg_process_destroy (const char *process_name, int process_pid, msg_h
   PJ_container_free (process);
 }
 
-void TRACE_msg_process_kill(msg_process_t process)
+void TRACE_msg_process_kill(smx_process_exit_status_t status, msg_process_t process)
 {
-  if (TRACE_msg_process_is_enabled()){
+  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 (MSG_process_get_name (process), MSG_process_get_PID (process), MSG_process_get_host (process));
+    TRACE_msg_process_destroy(MSG_process_get_name (process), MSG_process_get_PID (process), MSG_process_get_host (process));
   }
 }
 
@@ -151,5 +143,3 @@ void TRACE_msg_process_end(msg_process_t process)
     PJ_container_free (container);
   }
 }
-
-#endif /* HAVE_TRACING */