X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d99d201b97673c0aafcf1d57524c1375ab4f2533..8cfd4f9b786027431b78a9b74db0843634ab7397:/src/msg/msg_private.hpp

diff --git a/src/msg/msg_private.hpp b/src/msg/msg_private.hpp
index cf12610f43..25cead3612 100644
--- a/src/msg/msg_private.hpp
+++ b/src/msg/msg_private.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-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. */
@@ -10,9 +10,6 @@
 
 #include "src/kernel/activity/CommImpl.hpp"
 #include "src/kernel/activity/ExecImpl.hpp"
-#include "xbt/Extendable.hpp"
-
-#include <atomic>
 
 /**************** datatypes **********************************/
 /********************************* Task **************************************/
@@ -77,19 +74,14 @@ public:
 
 /************************** Global variables ********************************/
 struct s_MSG_Global_t {
-  int debug_multiple_use;            /* whether we want an error message when reusing the same Task for 2 things */
+  bool debug_multiple_use;           /* whether we want an error message when reusing the same Task for 2 things */
   std::atomic_int_fast32_t sent_msg; /* Total amount of messages sent during the simulation */
   void (*task_copy_callback)(msg_task_t task, msg_process_t src, msg_process_t dst);
   void_f_pvoid_t process_data_cleanup;
 };
 typedef s_MSG_Global_t* MSG_Global_t;
 
-XBT_PRIVATE void TRACE_msg_process_create(std::string process_name, int process_pid, msg_host_t host);
-XBT_PRIVATE void TRACE_msg_process_destroy(std::string process_name, int process_pid);
-
-extern "C" {
-
-XBT_PUBLIC_DATA(MSG_Global_t) msg_global;
+XBT_PUBLIC_DATA MSG_Global_t msg_global;
 
 /*************************************************************/
 XBT_PRIVATE void MSG_process_cleanup_from_SIMIX(smx_actor_t smx_proc);
@@ -107,13 +99,9 @@ XBT_PRIVATE void TRACE_msg_task_execute_end(msg_task_t task);
 XBT_PRIVATE void TRACE_msg_task_destroy(msg_task_t task);
 XBT_PRIVATE void TRACE_msg_task_get_end(msg_task_t task);
 XBT_PRIVATE void TRACE_msg_task_get_start();
-XBT_PRIVATE int TRACE_msg_task_put_start(msg_task_t task); // returns TRUE if the task_put_end must be called
+XBT_PRIVATE void TRACE_msg_task_put_start(msg_task_t task);
 XBT_PRIVATE void TRACE_msg_task_put_end();
 
-/* declaration of instrumentation functions from msg_process_instr.c */
-XBT_PRIVATE void TRACE_msg_process_change_host(msg_process_t process, msg_host_t new_host);
-XBT_PRIVATE void TRACE_msg_process_kill(smx_process_exit_status_t status, msg_process_t process);
-}
 
 inline void s_simdata_task_t::setUsed()
 {