X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/98674d6baf1883ed72c4de907efed12e6e91d0b9..905e26b959375a249abcfdf1599f6178fe031f44:/src/msg/msg_private.h

diff --git a/src/msg/msg_private.h b/src/msg/msg_private.h
index 3edff2f8d9..82ee1b0684 100644
--- a/src/msg/msg_private.h
+++ b/src/msg/msg_private.h
@@ -7,6 +7,9 @@
 #ifndef METASIMGRID_PRIVATE_H
 #define METASIMGRID_PRIVATE_H
 
+#include <exception>
+#include <functional>
+
 #include "simgrid/msg.h"
 #include "simgrid/simix.h"
 #include "src/include/surf/surf.h"
@@ -17,47 +20,56 @@
 #include "xbt/dict.h"
 #include "xbt/config.h"
 #include "src/instr/instr_private.h"
+
+#include "src/kernel/activity/SynchroExec.hpp"
+#include "src/kernel/activity/SynchroComm.hpp"
+
 SG_BEGIN_DECL()
 
 /**************** datatypes **********************************/
 
 /********************************* Task **************************************/
-#define MSG_BT(ptr, m)                              \
-  do {xbt_ex_t *_xbt_ex_t = xbt_new0(xbt_ex_t, 1); \
-  /* build the exception */                                             \
-  _xbt_ex_t->msg      = (bprintf(m));                                 \
-  _xbt_ex_t->category = (xbt_errcat_t)(0);                   \
-  _xbt_ex_t->value    = (0);                                 \
-  _xbt_ex_t->procname = (char*)xbt_procname();               \
-  _xbt_ex_t->pid      = xbt_getpid();                        \
-  _xbt_ex_t->file     = (char*)__FILE__;                     \
-  _xbt_ex_t->line     = __LINE__;                            \
-  _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 */
-  double bytes_amount;    /* Data size */
-  double flops_amount;    /* Computation size */
-  msg_process_t sender;
-  msg_process_t receiver;
-  msg_host_t source;
-  double priority;
-  double bound; /* Capping for CPU resource */
-  double rate;  /* Capping for network resource */
+  ~simdata_task()
+  {
+    if (this->compute)
+      this->compute->unref();
+
+    /* parallel tasks only */
+    xbt_free(this->host_list);
+
+    xbt_dict_free(&this->affinity_mask_db);
+  }
+  void setUsed();
+  void setNotUsed()
+  {
+    this->isused = false;
+  }
+
+  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;
+  msg_process_t receiver = nullptr;
+  msg_host_t source = nullptr;
+  double priority = 0.0;
+  double bound = 0.0; /* Capping for CPU resource */
+  double rate = 0.0;  /* Capping for network resource */
 
   /* CPU affinity database of this task */
-  xbt_dict_t affinity_mask_db; /* smx_host_t host => unsigned long mask */
+  xbt_dict_t affinity_mask_db = nullptr; /* smx_host_t host => unsigned long mask */
 
-  void *isused;  /* Indicates whether the task is used in SIMIX currently */
-  int host_nb;                  /* ==0 if sequential task; parallel task if not */
+  bool isused = false;  /* Indicates whether the task is used in SIMIX currently */
+  int host_nb = 0;      /* ==0 if sequential task; parallel task if not */
   /*******  Parallel Tasks Only !!!! *******/
-  sg_host_t *host_list;
-  double *flops_parallel_amount;
-  double *bytes_parallel_amount;
+  sg_host_t *host_list = nullptr;
+  double *flops_parallel_amount = nullptr;
+  double *bytes_parallel_amount = nullptr;
+
+private:
+  void reportMultipleUse() const;
 } s_simdata_task_t;
 
 /********************************* File **************************************/
@@ -75,8 +87,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 */
@@ -126,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);
@@ -137,9 +144,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);
@@ -187,4 +193,19 @@ 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);
+
+inline void simdata_task::setUsed()
+{
+  if (this->isused)
+    this->reportMultipleUse();
+  if (msg_global->debug_multiple_use) {
+    // TODO, backtrace
+  }
+  this->isused = true;
+}
+
 #endif