X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9532edf044eed31bcf6de22916c8824e18f373ad..17c6e831aec2cc024154308cbb46bd7c5965a599:/src/msg/msg_gos.c

diff --git a/src/msg/msg_gos.c b/src/msg/msg_gos.c
index 11218c98b1..fcafb21976 100644
--- a/src/msg/msg_gos.c
+++ b/src/msg/msg_gos.c
@@ -73,7 +73,7 @@ msg_error_t MSG_parallel_task_execute(msg_task_t task)
       simdata->isused = (void*)1;
 
     if (simdata->host_nb > 0) {
-      simdata->compute = simcall_host_parallel_execute(task->name,
+      simdata->compute = simcall_process_parallel_execute(task->name,
                                                        simdata->host_nb,
                                                        simdata->host_list,
                                                        simdata->flops_parallel_amount,
@@ -81,11 +81,10 @@ msg_error_t MSG_parallel_task_execute(msg_task_t task)
                                                        1.0, -1.0);
       XBT_DEBUG("Parallel execution action created: %p", simdata->compute);
     } else {
-      unsigned long affinity_mask = (unsigned long) xbt_dict_get_or_null_ext(simdata->affinity_mask_db, (char *) p_simdata->m_host, sizeof(msg_host_t));
+      unsigned long affinity_mask = (unsigned long)(uintptr_t) xbt_dict_get_or_null_ext(simdata->affinity_mask_db, (char *) p_simdata->m_host, sizeof(msg_host_t));
       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_host_execute(task->name,
-                                              p_simdata->m_host,
+      simdata->compute = simcall_process_execute(task->name,
                                               simdata->flops_amount,
                                               simdata->priority,
                                               simdata->bound,
@@ -95,7 +94,7 @@ msg_error_t MSG_parallel_task_execute(msg_task_t task)
     }
     simcall_set_category(simdata->compute, task->category);
     p_simdata->waiting_action = simdata->compute;
-    comp_state = simcall_host_execution_wait(simdata->compute);
+    comp_state = simcall_process_execution_wait(simdata->compute);
 
     p_simdata->waiting_action = NULL;
 
@@ -587,7 +586,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, NULL, rate);
+  comm->s_comm = simcall_comm_irecv(MSG_process_self(), rdv, task, NULL, NULL, NULL, NULL, rate);
 
   return comm;
 }