Merge branch 'master' of 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 efe693f..f39cdd0 100644 (file)
--- a/src/msg/msg_private.h
+++ b/src/msg/msg_private.h
@@ -17,6 +17,10 @@
 #include "xbt/dict.h"
 #include "xbt/config.h"
 #include "src/instr/instr_private.h"
+
+#include "src/simix/SynchroExec.hpp"
+#include "src/simix/SynchroComm.hpp"
+
 SG_BEGIN_DECL()
 
 /**************** datatypes **********************************/
@@ -38,8 +42,8 @@ SG_BEGIN_DECL()
   ptr = _xbt_ex_t; } while(0)
 
 typedef struct simdata_task {
-  smx_synchro_t compute;         /* SIMIX modeling of computation */
-  smx_synchro_t comm;            /* SIMIX modeling of communication */
+  simgrid::simix::Exec *compute;         /* SIMIX modeling of computation */
+  simgrid::simix::Comm *comm;            /* SIMIX modeling of communication */
   double bytes_amount;    /* Data size */
   double flops_amount;    /* Computation size */
   msg_process_t sender;
@@ -148,11 +152,6 @@ XBT_PRIVATE void MSG_post_create_environment(void);
 
 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);
-/* @brief MSG_mailbox_free - release a mailbox from the memory.
- * Releases a mailbox from the memory but does not remove it from the dictionary.
- * @param   mailbox  The mailbox to release.
- */
-XBT_PRIVATE void MSG_mailbox_free(void *mailbox);
 
 /********** Tracing **********/
 /* declaration of instrumentation functions from msg_task_instr.c */