add private (optional) data copy function callback to _send _isend _recv _irecv simcalls

[simgrid.git] / src / msg / msg_gos.c

diff --git a/src/msg/msg_gos.c b/src/msg/msg_gos.c
index 7c01ce1..198539f 100644 (file)
--- a/src/msg/msg_gos.c
+++ b/src/msg/msg_gos.c
@@ -431,7 +431,7 @@ msg_comm_t MSG_task_isend_internal(msg_task_t task, const char *alias,
   /* Send it by calling SIMIX network layer */
   smx_action_t act = simcall_comm_isend(mailbox, t_simdata->message_size,
                                         t_simdata->rate, task, sizeof(void *),
-                                        match_fun, cleanup, match_data,detached);
+                                        match_fun, cleanup, NULL, match_data,detached);
   t_simdata->comm = act; /* FIXME: is the field t_simdata->comm still useful? */
 
   msg_comm_t comm;
@@ -607,7 +607,7 @@ msg_comm_t MSG_task_irecv_bounded(msg_task_t *task, const char *name,
   comm->task_sent = NULL;
   comm->task_received = task;
   comm->status = MSG_OK;
-  comm->s_comm = simcall_comm_irecv(rdv, task, NULL, NULL, NULL, rate);
+  comm->s_comm = simcall_comm_irecv(rdv, task, NULL, NULL, NULL, NULL, rate);
 
   return comm;
 }
@@ -630,10 +630,9 @@ int MSG_comm_test(msg_comm_t comm)
 
     if (finished && comm->task_received != NULL) {
       /* I am the receiver */
-      simdata_task_t simdata = (*comm->task_received)->simdata;
-      if (msg_global->debug_multiple_use && simdata->isused!=0)
-        xbt_ex_free(*(xbt_ex_t*)simdata->isused);
-      simdata->isused = 0;
+      if (msg_global->debug_multiple_use && (*comm->task_received)->simdata->isused!=0)
+        xbt_ex_free(*(xbt_ex_t*)(*comm->task_received)->simdata->isused);
+      (*comm->task_received)->simdata->isused = 0;
     }
   }
   CATCH(e) {
@@ -707,10 +706,9 @@ int MSG_comm_testany(xbt_dynar_t comms)
 
     if (status == MSG_OK && comm->task_received != NULL) {
       /* I am the receiver */
-      simdata_task_t simdata = (*comm->task_received)->simdata;
-      if (msg_global->debug_multiple_use && simdata->isused!=0)
-        xbt_ex_free(*(xbt_ex_t*)simdata->isused);
-      simdata->isused = 0;
+      if (msg_global->debug_multiple_use && (*comm->task_received)->simdata->isused!=0)
+        xbt_ex_free(*(xbt_ex_t*)(*comm->task_received)->simdata->isused);
+      (*comm->task_received)->simdata->isused = 0;
     }
   }
 
@@ -743,10 +741,9 @@ msg_error_t MSG_comm_wait(msg_comm_t comm, double timeout)
 
     if (comm->task_received != NULL) {
       /* I am the receiver */
-      simdata_task_t simdata = (*comm->task_received)->simdata;
-      if (msg_global->debug_multiple_use && simdata->isused!=0)
-        xbt_ex_free(*(xbt_ex_t*)simdata->isused);
-      simdata->isused = 0;
+      if (msg_global->debug_multiple_use && (*comm->task_received)->simdata->isused!=0)
+        xbt_ex_free(*(xbt_ex_t*)(*comm->task_received)->simdata->isused);
+      (*comm->task_received)->simdata->isused = 0;
     }
 
     /* FIXME: these functions are not traceable */
@@ -833,10 +830,9 @@ int MSG_comm_waitany(xbt_dynar_t comms)
 
   if (comm->task_received != NULL) {
     /* I am the receiver */
-    simdata_task_t simdata = (*comm->task_received)->simdata;
-    if (msg_global->debug_multiple_use && simdata->isused!=0)
-      xbt_ex_free(*(xbt_ex_t*)simdata->isused);
-    simdata->isused = 0;
+    if (msg_global->debug_multiple_use && (*comm->task_received)->simdata->isused!=0)
+      xbt_ex_free(*(xbt_ex_t*)(*comm->task_received)->simdata->isused);
+    (*comm->task_received)->simdata->isused = 0;
   }
 
   return finished_index;