X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/921f78391cfb481ec3305c8e4129e744a50db522..e50e29d976f19e5a7f581d2bac01c44986092f07:/src/msg/msg_gos.c diff --git a/src/msg/msg_gos.c b/src/msg/msg_gos.c index 6c9427a39a..7b0f6ee130 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, @@ -84,8 +84,7 @@ msg_error_t MSG_parallel_task_execute(msg_task_t task) 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)); 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; @@ -338,8 +337,6 @@ MSG_task_receive_ext(msg_task_t * task, const char *alias, double timeout, } CATCH(e) { switch (e.category) { - case host_error: - ret = MSG_HOST_FAILURE; case cancel_error: /* may be thrown by MSG_mailbox_get_by_alias */ ret = MSG_HOST_FAILURE; break; @@ -589,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; }