X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d2870500ed94896ec3b064fa67af8d729920c007..2d876f901f44194d3e67936fd054b192a6b7f097:/src/msg/msg_gos.cpp

diff --git a/src/msg/msg_gos.cpp b/src/msg/msg_gos.cpp
index 7138e569b0..6aa14754e6 100644
--- a/src/msg/msg_gos.cpp
+++ b/src/msg/msg_gos.cpp
@@ -51,7 +51,7 @@ msg_error_t MSG_parallel_task_execute(msg_task_t task)
   TRACE_msg_task_execute_start(task);
 
   xbt_assert((!simdata->compute) && (task->simdata->isused == 0),
-             "This task is executed somewhere else. Go fix your code! %d", task->simdata->isused!=NULL);
+             "This task is executed somewhere else. Go fix your code! %d", task->simdata->isused!=nullptr);
 
   XBT_DEBUG("Computing on %s", MSG_process_get_name(MSG_process_self()));
 
@@ -67,9 +67,10 @@ msg_error_t MSG_parallel_task_execute(msg_task_t task)
       simdata->isused = (void*)1;
 
     if (simdata->host_nb > 0) {
-      simdata->compute = simcall_execution_parallel_start(task->name, simdata->host_nb,simdata->host_list,
+      simdata->compute = static_cast<simgrid::simix::Exec*>(
+          simcall_execution_parallel_start(task->name, simdata->host_nb,simdata->host_list,
                                                        simdata->flops_parallel_amount, simdata->bytes_parallel_amount,
-                                                       1.0, -1.0);
+                                                       1.0, -1.0));
       XBT_DEBUG("Parallel execution action created: %p", simdata->compute);
     } else {
       unsigned long affinity_mask =
@@ -78,14 +79,15 @@ msg_error_t MSG_parallel_task_execute(msg_task_t task)
       XBT_DEBUG("execute %s@%s with affinity(0x%04lx)",
                 MSG_task_get_name(task), MSG_host_get_name(p_simdata->m_host), affinity_mask);
 
-      simdata->compute = simcall_execution_start(task->name, simdata->flops_amount, simdata->priority,
-                                                 simdata->bound, affinity_mask);
+          simdata->compute = static_cast<simgrid::simix::Exec*>(
+              simcall_execution_start(task->name, simdata->flops_amount, simdata->priority,
+                                                 simdata->bound, affinity_mask));
     }
     simcall_set_category(simdata->compute, task->category);
     p_simdata->waiting_action = simdata->compute;
     comp_state = simcall_execution_wait(simdata->compute);
 
-    p_simdata->waiting_action = NULL;
+    p_simdata->waiting_action = nullptr;
 
     if (msg_global->debug_multiple_use && simdata->isused!=0)
       xbt_ex_free(*(xbt_ex_t*)simdata->isused);
@@ -106,10 +108,10 @@ msg_error_t MSG_parallel_task_execute(msg_task_t task)
     }
     xbt_ex_free(e);
   }
-  /* action ended, set comm and compute = NULL, the actions is already destroyed in the main function */
+  /* action ended, set comm and compute = nullptr, the actions is already destroyed in the main function */
   simdata->flops_amount = 0.0;
-  simdata->comm = NULL;
-  simdata->compute = NULL;
+  simdata->comm = nullptr;
+  simdata->compute = nullptr;
   TRACE_msg_task_execute_end(task);
 
   MSG_RETURN(status);
@@ -206,7 +208,7 @@ msg_error_t MSG_task_receive_bounded(msg_task_t * task, const char *alias, doubl
  */
 msg_error_t MSG_task_receive_with_timeout(msg_task_t * task, const char *alias, double timeout)
 {
-  return MSG_task_receive_ext(task, alias, timeout, NULL);
+  return MSG_task_receive_ext(task, alias, timeout, nullptr);
 }
 
 /** \ingroup msg_task_usage
@@ -223,7 +225,7 @@ msg_error_t MSG_task_receive_with_timeout(msg_task_t * task, const char *alias,
  */
 msg_error_t MSG_task_receive_with_timeout_bounded(msg_task_t * task, const char *alias, double timeout,double rate)
 {
-  return MSG_task_receive_ext_bounded(task, alias, timeout, NULL, rate);
+  return MSG_task_receive_ext_bounded(task, alias, timeout, nullptr, rate);
 }
 
 /** \ingroup msg_task_usage
@@ -288,7 +290,7 @@ static inline msg_comm_t MSG_task_isend_internal(msg_task_t task, const char *al
                                                      int (*match_fun)(void*,void*, smx_synchro_t),
                                                      void *match_data, void_f_pvoid_t cleanup, int detached)
 {
-  simdata_task_t t_simdata = NULL;
+  simdata_task_t t_simdata = nullptr;
   msg_process_t process = MSG_process_self();
   msg_mailbox_t mailbox = MSG_mailbox_get_by_alias(alias);
   int call_end = TRACE_msg_task_put_start(task);
@@ -315,21 +317,21 @@ static inline msg_comm_t MSG_task_isend_internal(msg_task_t task, const char *al
     MSG_BT(t_simdata->isused, "Using Backtrace");
   else
     t_simdata->isused = (void*)1;
-  t_simdata->comm = NULL;
+  t_simdata->comm = nullptr;
   msg_global->sent_msg++;
 
   /* Send it by calling SIMIX network layer */
   smx_synchro_t act = simcall_comm_isend(SIMIX_process_self(), mailbox, t_simdata->bytes_amount, t_simdata->rate,
-                                         task, sizeof(void *), match_fun, cleanup, NULL, match_data,detached);
-  t_simdata->comm = act; /* FIXME: is the field t_simdata->comm still useful? */
+                                         task, sizeof(void *), match_fun, cleanup, nullptr, match_data,detached);
+  t_simdata->comm = static_cast<simgrid::simix::Comm*>(act); /* FIXME: is the field t_simdata->comm still useful? */
 
   msg_comm_t comm;
   if (detached) {
-    comm = NULL;
+    comm = nullptr;
   } else {
     comm = xbt_new0(s_msg_comm_t, 1);
     comm->task_sent = task;
-    comm->task_received = NULL;
+    comm->task_received = nullptr;
     comm->status = MSG_OK;
     comm->s_comm = act;
   }
@@ -353,7 +355,7 @@ static inline msg_comm_t MSG_task_isend_internal(msg_task_t task, const char *al
  */
 msg_comm_t MSG_task_isend(msg_task_t task, const char *alias)
 {
-  return MSG_task_isend_internal(task, alias, NULL, NULL, NULL, 0);
+  return MSG_task_isend_internal(task, alias, nullptr, nullptr, nullptr, 0);
 }
 
 /** \ingroup msg_task_usage
@@ -370,7 +372,7 @@ msg_comm_t MSG_task_isend(msg_task_t task, const char *alias)
 msg_comm_t MSG_task_isend_bounded(msg_task_t task, const char *alias, double maxrate)
 {
   task->simdata->rate = maxrate;
-  return MSG_task_isend_internal(task, alias, NULL, NULL, NULL, 0);
+  return MSG_task_isend_internal(task, alias, nullptr, nullptr, nullptr, 0);
 }
 
 /** \ingroup msg_task_usage
@@ -390,7 +392,7 @@ msg_comm_t MSG_task_isend_bounded(msg_task_t task, const char *alias, double max
 msg_comm_t MSG_task_isend_with_matching(msg_task_t task, const char *alias,
                                         int (*match_fun)(void*, void*, smx_synchro_t), void *match_data)
 {
-  return MSG_task_isend_internal(task, alias, match_fun, match_data, NULL, 0);
+  return MSG_task_isend_internal(task, alias, match_fun, match_data, nullptr, 0);
 }
 
 /** \ingroup msg_task_usage
@@ -406,11 +408,11 @@ msg_comm_t MSG_task_isend_with_matching(msg_task_t task, const char *alias,
  * \param task a #msg_task_t to send on another location.
  * \param alias name of the mailbox to sent the task to
  * \param cleanup a function to destroy the task if the communication fails, e.g. MSG_task_destroy
- * (if NULL, no function will be called)
+ * (if nullptr, no function will be called)
  */
 void MSG_task_dsend(msg_task_t task, const char *alias, void_f_pvoid_t cleanup)
 {
-  MSG_task_isend_internal(task, alias, NULL, NULL, cleanup, 1);
+  MSG_task_isend_internal(task, alias, nullptr, nullptr, cleanup, 1);
 }
 
 /** \ingroup msg_task_usage
@@ -427,7 +429,7 @@ void MSG_task_dsend(msg_task_t task, const char *alias, void_f_pvoid_t cleanup)
  * \param alias name of the mailbox to sent the task to
  * \param cleanup a function to destroy the task if the
  * communication fails, e.g. MSG_task_destroy
- * (if NULL, no function will be called)
+ * (if nullptr, no function will be called)
  * \param maxrate the maximum communication rate for sending this task
  *
  */
@@ -472,10 +474,10 @@ msg_comm_t MSG_task_irecv_bounded(msg_task_t *task, const char *name, double rat
 
   /* Try to receive it by calling SIMIX network layer */
   msg_comm_t comm = xbt_new0(s_msg_comm_t, 1);
-  comm->task_sent = NULL;
+  comm->task_sent = nullptr;
   comm->task_received = task;
   comm->status = MSG_OK;
-  comm->s_comm = simcall_comm_irecv(MSG_process_self(), rdv, task, NULL, NULL, NULL, NULL, rate);
+  comm->s_comm = simcall_comm_irecv(MSG_process_self(), rdv, task, nullptr, nullptr, nullptr, nullptr, rate);
 
   return comm;
 }
@@ -496,7 +498,7 @@ int MSG_comm_test(msg_comm_t comm)
   TRY {
     finished = simcall_comm_test(comm->s_comm);
 
-    if (finished && comm->task_received != NULL) {
+    if (finished && comm->task_received != nullptr) {
       /* I am the receiver */
       if (msg_global->debug_multiple_use && (*comm->task_received)->simdata->isused!=0)
         xbt_ex_free(*(xbt_ex_t*)(*comm->task_received)->simdata->isused);
@@ -535,7 +537,7 @@ int MSG_comm_testany(xbt_dynar_t comms)
   int finished_index = -1;
 
   /* create the equivalent dynar with SIMIX objects */
-  xbt_dynar_t s_comms = xbt_dynar_new(sizeof(smx_synchro_t), NULL);
+  xbt_dynar_t s_comms = xbt_dynar_new(sizeof(smx_synchro_t), nullptr);
   msg_comm_t comm;
   unsigned int cursor;
   xbt_dynar_foreach(comms, cursor, comm) {
@@ -568,7 +570,7 @@ int MSG_comm_testany(xbt_dynar_t comms)
     /* the communication is finished */
     comm->status = status;
 
-    if (status == MSG_OK && comm->task_received != NULL) {
+    if (status == MSG_OK && comm->task_received != nullptr) {
       /* I am the receiver */
       if (msg_global->debug_multiple_use && (*comm->task_received)->simdata->isused!=0)
         xbt_ex_free(*(xbt_ex_t*)(*comm->task_received)->simdata->isused);
@@ -603,7 +605,7 @@ msg_error_t MSG_comm_wait(msg_comm_t comm, double timeout)
   TRY {
     simcall_comm_wait(comm->s_comm, timeout);
 
-    if (comm->task_received != NULL) {
+    if (comm->task_received != nullptr) {
       /* I am the receiver */
       if (msg_global->debug_multiple_use && (*comm->task_received)->simdata->isused!=0)
         xbt_ex_free(*(xbt_ex_t*)(*comm->task_received)->simdata->isused);
@@ -656,7 +658,7 @@ int MSG_comm_waitany(xbt_dynar_t comms)
   int finished_index = -1;
 
   /* create the equivalent dynar with SIMIX objects */
-  xbt_dynar_t s_comms = xbt_dynar_new(sizeof(smx_synchro_t), NULL);
+  xbt_dynar_t s_comms = xbt_dynar_new(sizeof(smx_synchro_t), nullptr);
   msg_comm_t comm;
   unsigned int cursor;
   xbt_dynar_foreach(comms, cursor, comm) {
@@ -690,7 +692,7 @@ int MSG_comm_waitany(xbt_dynar_t comms)
   /* the communication is finished */
   comm->status = status;
 
-  if (comm->task_received != NULL) {
+  if (comm->task_received != nullptr) {
     /* I am the receiver */
     if (msg_global->debug_multiple_use && (*comm->task_received)->simdata->isused!=0)
       xbt_ex_free(*(xbt_ex_t*)(*comm->task_received)->simdata->isused);
@@ -702,9 +704,9 @@ int MSG_comm_waitany(xbt_dynar_t comms)
 
 /**
  * \ingroup msg_task_usage
- * \brief Returns the error (if any) that occured during a finished communication.
+ * \brief Returns the error (if any) that occurred during a finished communication.
  * \param comm a finished communication
- * \return the status of the communication, or #MSG_OK if no error occured
+ * \return the status of the communication, or #MSG_OK if no error occurred
  * during the communication
  */
 msg_error_t MSG_comm_get_status(msg_comm_t comm) {
@@ -731,14 +733,16 @@ msg_task_t MSG_comm_get_task(msg_comm_t comm)
  * \param buff the data copied
  * \param buff_size size of the buffer
  */
-void MSG_comm_copy_data_from_SIMIX(smx_synchro_t comm, void* buff, size_t buff_size) {
-  // copy the task
+void MSG_comm_copy_data_from_SIMIX(smx_synchro_t synchro, void* buff, size_t buff_size)
+{
+  simgrid::simix::Comm *comm = static_cast<simgrid::simix::Comm*>(synchro);
+
   SIMIX_comm_copy_pointer_callback(comm, buff, buff_size);
 
   // notify the user callback if any
   if (msg_global->task_copy_callback) {
     msg_task_t task = (msg_task_t) buff;
-    msg_global->task_copy_callback(task, simcall_comm_get_src_proc(comm), simcall_comm_get_dst_proc(comm));
+    msg_global->task_copy_callback(task, comm->src_proc, comm->dst_proc);
   }
 }
 
@@ -795,7 +799,7 @@ msg_error_t MSG_task_send_bounded(msg_task_t task, const char *alias, double max
 msg_error_t MSG_task_send_with_timeout(msg_task_t task, const char *alias, double timeout)
 {
   msg_error_t ret = MSG_OK;
-  simdata_task_t t_simdata = NULL;
+  simdata_task_t t_simdata = nullptr;
   msg_process_t process = MSG_process_self();
   simdata_process_t p_simdata = (simdata_process_t) SIMIX_process_self_get_data();
   msg_mailbox_t mailbox = MSG_mailbox_get_by_alias(alias);
@@ -824,7 +828,7 @@ msg_error_t MSG_task_send_with_timeout(msg_task_t task, const char *alias, doubl
     MSG_BT(t_simdata->isused, "Using Backtrace");
   else
     t_simdata->isused = (void*)1;
-  t_simdata->comm = NULL;
+  t_simdata->comm = nullptr;
   msg_global->sent_msg++;
 
   p_simdata->waiting_task = task;
@@ -832,12 +836,12 @@ msg_error_t MSG_task_send_with_timeout(msg_task_t task, const char *alias, doubl
   xbt_ex_t e;
   /* Try to send it by calling SIMIX network layer */
   TRY {
-    smx_synchro_t comm = NULL; /* MC needs the comm to be set to NULL during the simix call  */
+    smx_synchro_t comm = nullptr; /* MC needs the comm to be set to nullptr during the simix call  */
     comm = simcall_comm_isend(SIMIX_process_self(), mailbox,t_simdata->bytes_amount,
-                              t_simdata->rate, task, sizeof(void *), NULL, NULL, NULL, task, 0);
+                              t_simdata->rate, task, sizeof(void *), nullptr, nullptr, nullptr, task, 0);
     if (TRACE_is_enabled())
       simcall_set_category(comm, task->category);
-     t_simdata->comm = comm;
+     t_simdata->comm = static_cast<simgrid::simix::Comm*>(comm);
      simcall_comm_wait(comm, timeout);
   }
 
@@ -863,7 +867,7 @@ msg_error_t MSG_task_send_with_timeout(msg_task_t task, const char *alias, doubl
     t_simdata->isused = 0;
   }
 
-  p_simdata->waiting_task = NULL;
+  p_simdata->waiting_task = nullptr;
   if (call_end)
     TRACE_msg_task_put_end();
   MSG_RETURN(ret);
@@ -913,7 +917,7 @@ int MSG_task_listen_from(const char *alias)
 {
   msg_task_t task;
 
-  if (NULL == (task = MSG_mailbox_get_head(MSG_mailbox_get_by_alias(alias))))
+  if (nullptr == (task = MSG_mailbox_front(MSG_mailbox_get_by_alias(alias))))
     return -1;
 
   return MSG_process_get_PID(task->simdata->sender);
@@ -927,7 +931,7 @@ int MSG_task_listen_from(const char *alias)
  * parameter category must contain a category that was previously declared with the function #TRACE_category
  * (or with #TRACE_category_with_color).
  *
- * See \ref tracing for details on how to trace the (categorized) resource utilization.
+ * See \ref outcomes_vizu for details on how to trace the (categorized) resource utilization.
  *
  * \param task the task that is going to be categorized
  * \param category the name of the category to be associated to the task
@@ -947,7 +951,7 @@ void MSG_task_set_category (msg_task_t task, const char *category)
  *
  * \see MSG_task_set_category
  *
- * \return Returns the name of the tracing category of the given task, NULL otherwise
+ * \return Returns the name of the tracing category of the given task, nullptr otherwise
  */
 const char *MSG_task_get_category (msg_task_t task)
 {
@@ -959,7 +963,7 @@ const char *MSG_task_get_category (msg_task_t task)
  *
  * \param asr the name of a router or AS
  * \param name a property name
- * \return value of a property (or NULL if property not set)
+ * \return value of a property (or nullptr if property not set)
  */
 const char *MSG_as_router_get_property_value(const char* asr, const char *name)
 {