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 b2f710d..bb771f3 100644 (file)
--- a/src/msg/msg_private.h
+++ b/src/msg/msg_private.h
@@ -7,6 +7,8 @@
 #ifndef METASIMGRID_PRIVATE_H
 #define METASIMGRID_PRIVATE_H
 
+#include <functional>
+
 #include "simgrid/msg.h"
 #include "simgrid/simix.h"
 #include "src/include/surf/surf.h"
@@ -17,6 +19,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 **********************************/
@@ -32,14 +38,14 @@ SG_BEGIN_DECL()
   _xbt_ex_t->pid      = xbt_getpid();                        \
   _xbt_ex_t->file     = (char*)__FILE__;                     \
   _xbt_ex_t->line     = __LINE__;                            \
-  _xbt_ex_t->func     = (char*)_XBT_FUNCTION;                \
+  _xbt_ex_t->func     = (char*)__func__;                \
   _xbt_ex_t->bt_strings = NULL;                              \
   xbt_backtrace_current(_xbt_ex_t); \
   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;
@@ -68,15 +74,6 @@ typedef struct simdata_file {
 XBT_PRIVATE int __MSG_host_get_file_descriptor_id(msg_host_t host);
 XBT_PRIVATE void __MSG_host_release_file_descriptor_id(msg_host_t host, int id);
 
-/*************** Begin GPU ***************/
-typedef struct simdata_gpu_task {
-  double flops_amount;    /* Computation size */
-  double dispatch_latency;
-  double collect_latency;
-  int isused;  /* Indicates whether the task is used in SIMIX currently */
-} s_simdata_gpu_task_t;
-/*************** End GPU ***************/
-
 /******************************* Process *************************************/
 
 typedef struct simdata_process {
@@ -84,8 +81,6 @@ typedef struct simdata_process {
   msg_host_t put_host;            /* used for debugging purposes */
   smx_synchro_t waiting_action;
   msg_task_t waiting_task;
-  char **argv;                  /* arguments table if any */
-  int argc;                     /* arguments number if any */
   msg_error_t last_errno;       /* the last value returned by a MSG_function */
 
   void* data;                   /* user data */
@@ -146,9 +141,8 @@ XBT_PRIVATE void __MSG_file_destroy(msg_file_priv_t host);
 
 XBT_PRIVATE void MSG_process_cleanup_from_SIMIX(smx_process_t smx_proc);
 XBT_PRIVATE smx_process_t MSG_process_create_from_SIMIX(const char *name,
-                                   xbt_main_func_t code, void *data,
+                                   std::function<void()> code, void *data,
                                    const char *hostname, double kill_time,
-                                   int argc, char **argv,
                                    xbt_dict_t properties, int auto_restart,
                                    smx_process_t parent_process);
 XBT_PRIVATE void MSG_comm_copy_data_from_SIMIX(smx_synchro_t comm, void* buff, size_t buff_size);
@@ -157,11 +151,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 */
@@ -201,4 +190,9 @@ XBT_PRIVATE void TRACE_msg_vm_restore(msg_vm_t vm);
 XBT_PRIVATE void TRACE_msg_vm_end(msg_vm_t vm);
 
 SG_END_DECL()
+
+XBT_PUBLIC(msg_process_t) MSG_process_create_with_environment(
+  const char *name, std::function<void()> code, void *data,
+  msg_host_t host, xbt_dict_t properties);
+
 #endif