Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / src / msg / msg_private.h

diff --git a/src/msg/msg_private.h b/src/msg/msg_private.h
index 817cbdb..4b799d8 100644 (file)
--- a/src/msg/msg_private.h
+++ b/src/msg/msg_private.h
@@ -21,8 +21,8 @@
 #include "xbt/config.h"
 #include "src/instr/instr_private.h"
 
-#include "src/synchro/SynchroExec.hpp"
-#include "src/synchro/SynchroComm.hpp"
+#include "src/kernel/activity/SynchroExec.hpp"
+#include "src/kernel/activity/SynchroComm.hpp"
 
 SG_BEGIN_DECL()
 
@@ -47,8 +47,8 @@ typedef struct simdata_task {
     this->isused = false;
   }
 
-  simgrid::simix::Exec *compute = nullptr; /* SIMIX modeling of computation */
-  simgrid::simix::Comm *comm = nullptr;    /* SIMIX modeling of communication */
+  simgrid::kernel::activity::Exec *compute = nullptr; /* SIMIX modeling of computation */
+  simgrid::kernel::activity::Comm *comm = nullptr;    /* SIMIX modeling of communication */
   double bytes_amount = 0.0; /* Data size */
   double flops_amount = 0.0; /* Computation size */
   msg_process_t sender = nullptr;
@@ -136,9 +136,6 @@ typedef struct MSG_Global {
 XBT_PUBLIC_DATA(MSG_Global_t) msg_global;
 
 /*************************************************************/
-// FIXME: KILLME
-#  define MSG_RETURN(val) return(val)
-
 XBT_PRIVATE msg_host_t __MSG_host_create(sg_host_t host);
 XBT_PRIVATE msg_storage_t __MSG_storage_create(smx_storage_t storage);
 XBT_PRIVATE void __MSG_host_priv_free(msg_host_priv_t priv);
@@ -153,7 +150,7 @@ XBT_PRIVATE smx_process_t MSG_process_create_from_SIMIX(const char *name,
                                    smx_process_t parent_process);
 XBT_PRIVATE void MSG_comm_copy_data_from_SIMIX(smx_synchro_t comm, void* buff, size_t buff_size);
 
-XBT_PRIVATE void MSG_post_create_environment(void);
+XBT_PRIVATE void MSG_post_create_environment();
 
 XBT_PRIVATE void MSG_host_add_task(msg_host_t host, msg_task_t task);
 XBT_PRIVATE void MSG_host_del_task(msg_host_t host, msg_task_t task);
@@ -166,9 +163,9 @@ XBT_PRIVATE void TRACE_msg_task_execute_start(msg_task_t task);
 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(double start_time, msg_task_t task);
-XBT_PRIVATE void TRACE_msg_task_get_start(void);
+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_end(void);
+XBT_PRIVATE void TRACE_msg_task_put_end();
 
 /* declaration of instrumentation functions from msg_process_instr.c */
 XBT_PRIVATE char *instr_process_id (msg_process_t proc, char *str, int len);