X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/95d328f9ca4dd6ccd2065c6c84aca83d43001804..dff9e15c44ab6340d27215957c56fa72fad246a2:/src/msg/gos.c diff --git a/src/msg/gos.c b/src/msg/gos.c index ba0d5be5a1..cee89a4dd4 100644 --- a/src/msg/gos.c +++ b/src/msg/gos.c @@ -14,17 +14,16 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_gos, msg, - "Logging specific to MSG (gos)"); + "Logging specific to MSG (gos)"); /** \ingroup msg_gos_functions * * \brief Return the last value returned by a MSG function (except * MSG_get_errno...). */ -MSG_error_t -MSG_get_errno(void) +MSG_error_t MSG_get_errno(void) { - return PROCESS_GET_ERRNO(); + return PROCESS_GET_ERRNO(); } /** \ingroup msg_gos_functions @@ -37,61 +36,59 @@ MSG_get_errno(void) * \return #MSG_FATAL if \a task is not properly initialized and * #MSG_OK otherwise. */ -MSG_error_t -MSG_task_execute(m_task_t task) +MSG_error_t MSG_task_execute(m_task_t task) { - simdata_task_t simdata = NULL; - m_process_t self = MSG_process_self(); - e_surf_action_state_t state = SURF_ACTION_NOT_IN_THE_SYSTEM; - CHECK_HOST(); - - simdata = task->simdata; - xbt_assert0((!simdata->compute) && (task->simdata->refcount == 1),"This task is executed somewhere else. Go fix your code!"); - - DEBUG1("Computing on %s", MSG_process_self()->simdata->m_host->name); - - simdata->refcount ++; - SIMIX_mutex_lock(simdata->mutex); - simdata->compute = SIMIX_action_execute(SIMIX_host_self(), task->name, simdata->computation_amount); - SIMIX_action_set_priority(simdata->compute, simdata->priority); - - self->simdata->waiting_task = task; - SIMIX_register_action_to_condition(simdata->compute, simdata->cond); - do { - SIMIX_cond_wait(simdata->cond, simdata->mutex); - state = SIMIX_action_get_state(simdata->compute); - } while(state==SURF_ACTION_READY || state==SURF_ACTION_RUNNING); - SIMIX_unregister_action_to_condition(simdata->compute, simdata->cond); - self->simdata->waiting_task = NULL; - - SIMIX_mutex_unlock(simdata->mutex); - simdata->refcount --; - - if (SIMIX_action_get_state(task->simdata->compute) == SURF_ACTION_DONE) - { - /* action ended, set comm and compute = NULL, the actions is already destroyed in the main function */ - SIMIX_action_destroy(task->simdata->compute); - simdata->computation_amount = 0.0; - simdata->comm = NULL; - simdata->compute = NULL; - MSG_RETURN(MSG_OK); - } - else if(SIMIX_host_get_state(SIMIX_host_self()) == 0) - { - /* action ended, set comm and compute = NULL, the actions is already destroyed in the main function */ - SIMIX_action_destroy(task->simdata->compute); - simdata->comm = NULL; - simdata->compute = NULL; - MSG_RETURN(MSG_HOST_FAILURE); - } - else - { - /* action ended, set comm and compute = NULL, the actions is already destroyed in the main function */ - SIMIX_action_destroy(task->simdata->compute); - simdata->comm = NULL; - simdata->compute = NULL; - MSG_RETURN(MSG_TASK_CANCELLED); - } + simdata_task_t simdata = NULL; + m_process_t self = MSG_process_self(); + e_surf_action_state_t state = SURF_ACTION_NOT_IN_THE_SYSTEM; + CHECK_HOST(); + + simdata = task->simdata; + xbt_assert0((!simdata->compute) + && (task->simdata->refcount == 1), + "This task is executed somewhere else. Go fix your code!"); + + DEBUG1("Computing on %s", MSG_process_self()->simdata->m_host->name); + + simdata->refcount++; + SIMIX_mutex_lock(simdata->mutex); + simdata->compute = + SIMIX_action_execute(SIMIX_host_self(), task->name, + simdata->computation_amount); + SIMIX_action_set_priority(simdata->compute, simdata->priority); + + self->simdata->waiting_task = task; + SIMIX_register_action_to_condition(simdata->compute, simdata->cond); + do { + SIMIX_cond_wait(simdata->cond, simdata->mutex); + state = SIMIX_action_get_state(simdata->compute); + } while (state == SURF_ACTION_READY || state == SURF_ACTION_RUNNING); + SIMIX_unregister_action_to_condition(simdata->compute, simdata->cond); + self->simdata->waiting_task = NULL; + + SIMIX_mutex_unlock(simdata->mutex); + simdata->refcount--; + + if (SIMIX_action_get_state(task->simdata->compute) == SURF_ACTION_DONE) { + /* action ended, set comm and compute = NULL, the actions is already destroyed in the main function */ + SIMIX_action_destroy(task->simdata->compute); + simdata->computation_amount = 0.0; + simdata->comm = NULL; + simdata->compute = NULL; + MSG_RETURN(MSG_OK); + } else if (SIMIX_host_get_state(SIMIX_host_self()) == 0) { + /* action ended, set comm and compute = NULL, the actions is already destroyed in the main function */ + SIMIX_action_destroy(task->simdata->compute); + simdata->comm = NULL; + simdata->compute = NULL; + MSG_RETURN(MSG_HOST_FAILURE); + } else { + /* action ended, set comm and compute = NULL, the actions is already destroyed in the main function */ + SIMIX_action_destroy(task->simdata->compute); + simdata->comm = NULL; + simdata->compute = NULL; + MSG_RETURN(MSG_TASK_CANCELLED); + } } /** \ingroup m_task_management @@ -114,102 +111,103 @@ MSG_task_execute(m_task_t task) * \return The new corresponding object. */ m_task_t -MSG_parallel_task_create(const char *name,int host_nb, const m_host_t * host_list, double *computation_amount, double *communication_amount, void *data) +MSG_parallel_task_create(const char *name, int host_nb, + const m_host_t * host_list, + double *computation_amount, + double *communication_amount, void *data) { - int i; - simdata_task_t simdata = xbt_new0(s_simdata_task_t, 1); - m_task_t task = xbt_new0(s_m_task_t, 1); - task->simdata = simdata; - - /* Task structure */ - task->name = xbt_strdup(name); - task->data = data; - - /* Simulator Data */ - simdata->computation_amount = 0; - simdata->message_size = 0; - simdata->cond = SIMIX_cond_init(); - simdata->mutex = SIMIX_mutex_init(); - simdata->compute = NULL; - simdata->comm = NULL; - simdata->rate = -1.0; - simdata->refcount = 1; - simdata->sender = NULL; - simdata->receiver = NULL; - simdata->source = NULL; - - simdata->host_nb = host_nb; - simdata->host_list = xbt_new0(smx_host_t, host_nb); - simdata->comp_amount = computation_amount; - simdata->comm_amount = communication_amount; - - for (i = 0; i < host_nb; i++) - simdata->host_list[i] = host_list[i]->simdata->smx_host; - - return task; + int i; + simdata_task_t simdata = xbt_new0(s_simdata_task_t, 1); + m_task_t task = xbt_new0(s_m_task_t, 1); + task->simdata = simdata; + + /* Task structure */ + task->name = xbt_strdup(name); + task->data = data; + + /* Simulator Data */ + simdata->computation_amount = 0; + simdata->message_size = 0; + simdata->cond = SIMIX_cond_init(); + simdata->mutex = SIMIX_mutex_init(); + simdata->compute = NULL; + simdata->comm = NULL; + simdata->rate = -1.0; + simdata->refcount = 1; + simdata->sender = NULL; + simdata->receiver = NULL; + simdata->source = NULL; + + simdata->host_nb = host_nb; + simdata->host_list = xbt_new0(smx_host_t, host_nb); + simdata->comp_amount = computation_amount; + simdata->comm_amount = communication_amount; + + for (i = 0; i < host_nb; i++) + simdata->host_list[i] = host_list[i]->simdata->smx_host; + + return task; } -MSG_error_t -MSG_parallel_task_execute(m_task_t task) +MSG_error_t MSG_parallel_task_execute(m_task_t task) { - simdata_task_t simdata = NULL; - m_process_t self = MSG_process_self(); - e_surf_action_state_t state = SURF_ACTION_NOT_IN_THE_SYSTEM; - CHECK_HOST(); - - simdata = task->simdata; - - xbt_assert0((!simdata->compute) && (task->simdata->refcount == 1),"This task is executed somewhere else. Go fix your code!"); - - xbt_assert0(simdata->host_nb,"This is not a parallel task. Go to hell."); - - DEBUG1("Computing on %s", MSG_process_self()->simdata->m_host->name); - - simdata->refcount ++; - - SIMIX_mutex_lock(simdata->mutex); - simdata->compute = - SIMIX_action_parallel_execute(task->name, simdata->host_nb, simdata->host_list, simdata->comp_amount, simdata->comm_amount, 1.0, -1.0); - - self->simdata->waiting_task = task; - SIMIX_register_action_to_condition(simdata->compute, simdata->cond); - do { - SIMIX_cond_wait(simdata->cond, simdata->mutex); - state = SIMIX_action_get_state(task->simdata->compute); - } while(state==SURF_ACTION_READY || state==SURF_ACTION_RUNNING); - - SIMIX_unregister_action_to_condition(simdata->compute, simdata->cond); - self->simdata->waiting_task = NULL; - - - SIMIX_mutex_unlock(simdata->mutex); - simdata->refcount --; - - if (SIMIX_action_get_state(task->simdata->compute) == SURF_ACTION_DONE) - { - /* action ended, set comm and compute = NULL, the actions is already destroyed in the main function */ - SIMIX_action_destroy(task->simdata->compute); - simdata->computation_amount = 0.0; - simdata->comm = NULL; - simdata->compute = NULL; - MSG_RETURN(MSG_OK); - } - else if(SIMIX_host_get_state(SIMIX_host_self()) == 0) - { - /* action ended, set comm and compute = NULL, the actions is already destroyed in the main function */ - SIMIX_action_destroy(task->simdata->compute); - simdata->comm = NULL; - simdata->compute = NULL; - MSG_RETURN(MSG_HOST_FAILURE); - } - else - { - /* action ended, set comm and compute = NULL, the actions is already destroyed in the main function */ - SIMIX_action_destroy(task->simdata->compute); - simdata->comm = NULL; - simdata->compute = NULL; - MSG_RETURN(MSG_TASK_CANCELLED); - } + simdata_task_t simdata = NULL; + m_process_t self = MSG_process_self(); + e_surf_action_state_t state = SURF_ACTION_NOT_IN_THE_SYSTEM; + CHECK_HOST(); + + simdata = task->simdata; + + xbt_assert0((!simdata->compute) + && (task->simdata->refcount == 1), + "This task is executed somewhere else. Go fix your code!"); + + xbt_assert0(simdata->host_nb, "This is not a parallel task. Go to hell."); + + DEBUG1("Computing on %s", MSG_process_self()->simdata->m_host->name); + + simdata->refcount++; + + SIMIX_mutex_lock(simdata->mutex); + simdata->compute = + SIMIX_action_parallel_execute(task->name, simdata->host_nb, + simdata->host_list, simdata->comp_amount, + simdata->comm_amount, 1.0, -1.0); + + self->simdata->waiting_task = task; + SIMIX_register_action_to_condition(simdata->compute, simdata->cond); + do { + SIMIX_cond_wait(simdata->cond, simdata->mutex); + state = SIMIX_action_get_state(task->simdata->compute); + } while (state == SURF_ACTION_READY || state == SURF_ACTION_RUNNING); + + SIMIX_unregister_action_to_condition(simdata->compute, simdata->cond); + self->simdata->waiting_task = NULL; + + + SIMIX_mutex_unlock(simdata->mutex); + simdata->refcount--; + + if (SIMIX_action_get_state(task->simdata->compute) == SURF_ACTION_DONE) { + /* action ended, set comm and compute = NULL, the actions is already destroyed in the main function */ + SIMIX_action_destroy(task->simdata->compute); + simdata->computation_amount = 0.0; + simdata->comm = NULL; + simdata->compute = NULL; + MSG_RETURN(MSG_OK); + } else if (SIMIX_host_get_state(SIMIX_host_self()) == 0) { + /* action ended, set comm and compute = NULL, the actions is already destroyed in the main function */ + SIMIX_action_destroy(task->simdata->compute); + simdata->comm = NULL; + simdata->compute = NULL; + MSG_RETURN(MSG_HOST_FAILURE); + } else { + /* action ended, set comm and compute = NULL, the actions is already destroyed in the main function */ + SIMIX_action_destroy(task->simdata->compute); + simdata->comm = NULL; + simdata->compute = NULL; + MSG_RETURN(MSG_TASK_CANCELLED); + } } @@ -221,63 +219,59 @@ MSG_parallel_task_execute(m_task_t task) * * \param nb_sec a number of second */ -MSG_error_t -MSG_process_sleep(double nb_sec) +MSG_error_t MSG_process_sleep(double nb_sec) { - smx_action_t act_sleep; - m_process_t proc = MSG_process_self(); - e_surf_action_state_t state = SURF_ACTION_NOT_IN_THE_SYSTEM; - smx_mutex_t mutex; - smx_cond_t cond; - - /* create action to sleep */ - act_sleep = SIMIX_action_sleep(SIMIX_process_get_host(proc->simdata->s_process), nb_sec); - - mutex = SIMIX_mutex_init(); - SIMIX_mutex_lock(mutex); - - /* create conditional and register action to it */ - cond = SIMIX_cond_init(); - - SIMIX_register_action_to_condition(act_sleep, cond); - do { - SIMIX_cond_wait(cond, mutex); - state = SIMIX_action_get_state(act_sleep); - } while(state==SURF_ACTION_READY || state==SURF_ACTION_RUNNING); - SIMIX_unregister_action_to_condition(act_sleep, cond); - SIMIX_mutex_unlock(mutex); - - /* remove variables */ - SIMIX_cond_destroy(cond); - SIMIX_mutex_destroy(mutex); - - if (SIMIX_action_get_state(act_sleep) == SURF_ACTION_DONE) - { - if (SIMIX_host_get_state(SIMIX_host_self()) == SURF_CPU_OFF) - { - SIMIX_action_destroy(act_sleep); - MSG_RETURN(MSG_HOST_FAILURE); - } - } - else - { - SIMIX_action_destroy(act_sleep); - MSG_RETURN(MSG_HOST_FAILURE); - } - - SIMIX_action_destroy(act_sleep); - MSG_RETURN(MSG_OK); + smx_action_t act_sleep; + m_process_t proc = MSG_process_self(); + e_surf_action_state_t state = SURF_ACTION_NOT_IN_THE_SYSTEM; + smx_mutex_t mutex; + smx_cond_t cond; + + /* create action to sleep */ + act_sleep = + SIMIX_action_sleep(SIMIX_process_get_host(proc->simdata->s_process), + nb_sec); + + mutex = SIMIX_mutex_init(); + SIMIX_mutex_lock(mutex); + + /* create conditional and register action to it */ + cond = SIMIX_cond_init(); + + SIMIX_register_action_to_condition(act_sleep, cond); + do { + SIMIX_cond_wait(cond, mutex); + state = SIMIX_action_get_state(act_sleep); + } while (state == SURF_ACTION_READY || state == SURF_ACTION_RUNNING); + SIMIX_unregister_action_to_condition(act_sleep, cond); + SIMIX_mutex_unlock(mutex); + + /* remove variables */ + SIMIX_cond_destroy(cond); + SIMIX_mutex_destroy(mutex); + + if (SIMIX_action_get_state(act_sleep) == SURF_ACTION_DONE) { + if (SIMIX_host_get_state(SIMIX_host_self()) == SURF_CPU_OFF) { + SIMIX_action_destroy(act_sleep); + MSG_RETURN(MSG_HOST_FAILURE); + } + } else { + SIMIX_action_destroy(act_sleep); + MSG_RETURN(MSG_HOST_FAILURE); + } + + SIMIX_action_destroy(act_sleep); + MSG_RETURN(MSG_OK); } /** \ingroup msg_gos_functions * \brief Return the number of MSG tasks currently running on * the host of the current running process. */ -static int -MSG_get_msgload(void) +static int MSG_get_msgload(void) { - xbt_die("not implemented yet"); - return 0; + xbt_die("not implemented yet"); + return 0; } @@ -300,7 +294,7 @@ MSG_get_msgload(void) MSG_error_t MSG_task_get_from_host(m_task_t * task, m_channel_t channel, m_host_t host) { - return MSG_task_get_ext(task, channel, -1, host); + return MSG_task_get_ext(task, channel, -1, host); } /** \ingroup msg_gos_functions @@ -317,10 +311,9 @@ MSG_task_get_from_host(m_task_t * task, m_channel_t channel, m_host_t host) * \return #MSG_FATAL if \a task is equal to \c NULL, #MSG_WARNING * if \a *task is not equal to \c NULL, and #MSG_OK otherwise. */ -MSG_error_t -MSG_task_get(m_task_t * task, m_channel_t channel) +MSG_error_t MSG_task_get(m_task_t * task, m_channel_t channel) { - return MSG_task_get_with_timeout(task, channel, -1); + return MSG_task_get_with_timeout(task, channel, -1); } /** \ingroup msg_gos_functions @@ -342,7 +335,8 @@ MSG_task_get(m_task_t * task, m_channel_t channel) if \a *task is not equal to \c NULL, and #MSG_OK otherwise. */ MSG_error_t -MSG_task_get_with_timeout(m_task_t * task, m_channel_t channel, double max_duration) +MSG_task_get_with_timeout(m_task_t * task, m_channel_t channel, + double max_duration) { return MSG_task_get_ext(task, channel, max_duration, NULL); } @@ -353,35 +347,42 @@ MSG_task_get_with_timeout(m_task_t * task, m_channel_t channel, double max_durat */ MSG_error_t -MSG_task_get_ext(m_task_t * task, m_channel_t channel, double timeout,m_host_t host) +MSG_task_get_ext(m_task_t * task, m_channel_t channel, double timeout, + m_host_t host) { - xbt_assert1((channel >= 0) && (channel < msg_global->max_channel), "Invalid channel %d",channel); + xbt_assert1((channel >= 0) + && (channel < msg_global->max_channel), "Invalid channel %d", + channel); - return MSG_mailbox_get_task_ext(MSG_mailbox_get_by_channel(MSG_host_self(), channel), task, host, timeout); + return + MSG_mailbox_get_task_ext(MSG_mailbox_get_by_channel + (MSG_host_self(), channel), task, host, timeout); } MSG_error_t -MSG_task_receive_from_host(m_task_t * task, const char* alias, m_host_t host) +MSG_task_receive_from_host(m_task_t * task, const char *alias, m_host_t host) { - return MSG_task_receive_ext(task, alias, -1, host); + return MSG_task_receive_ext(task, alias, -1, host); } -MSG_error_t -MSG_task_receive(m_task_t * task, const char* alias) +MSG_error_t MSG_task_receive(m_task_t * task, const char *alias) { - return MSG_task_receive_with_timeout(task, alias, -1); + return MSG_task_receive_with_timeout(task, alias, -1); } MSG_error_t -MSG_task_receive_with_timeout(m_task_t * task, const char* alias, double timeout) +MSG_task_receive_with_timeout(m_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, NULL); } MSG_error_t -MSG_task_receive_ext(m_task_t* task, const char* alias, double timeout, m_host_t host) +MSG_task_receive_ext(m_task_t * task, const char *alias, double timeout, + m_host_t host) { - return MSG_mailbox_get_task_ext(MSG_mailbox_get_by_alias(alias), task, host, timeout); + return MSG_mailbox_get_task_ext(MSG_mailbox_get_by_alias(alias), task, host, + timeout); } @@ -411,10 +412,9 @@ MSG_task_receive_ext(m_task_t* task, const char* alias, double timeout, m_host_t * #MSG_TRANSFER_FAILURE if the transfer could not be properly done * (network failure, dest failure) */ -MSG_error_t -MSG_task_put(m_task_t task, m_host_t dest, m_channel_t channel) +MSG_error_t MSG_task_put(m_task_t task, m_host_t dest, m_channel_t channel) { - return MSG_task_put_with_timeout(task, dest, channel, -1.0); + return MSG_task_put_with_timeout(task, dest, channel, -1.0); } /** \ingroup msg_gos_functions @@ -424,10 +424,11 @@ MSG_task_put(m_task_t task, m_host_t dest, m_channel_t channel) * \sa MSG_task_put */ MSG_error_t -MSG_task_put_bounded(m_task_t task, m_host_t dest, m_channel_t channel, double maxrate) +MSG_task_put_bounded(m_task_t task, m_host_t dest, m_channel_t channel, + double maxrate) { - task->simdata->rate = maxrate; - return MSG_task_put(task, dest, channel); + task->simdata->rate = maxrate; + return MSG_task_put(task, dest, channel); } /** \ingroup msg_gos_functions \brief Put a task on a channel of an @@ -460,40 +461,44 @@ MSG_task_put_bounded(m_task_t task, m_host_t dest, m_channel_t channel, double m (network failure, dest failure, timeout...) */ MSG_error_t -MSG_task_put_with_timeout(m_task_t task, m_host_t dest, m_channel_t channel, double timeout) +MSG_task_put_with_timeout(m_task_t task, m_host_t dest, m_channel_t channel, + double timeout) { - xbt_assert1((channel >= 0) && (channel < msg_global->max_channel), "Invalid channel %d", channel); + xbt_assert1((channel >= 0) + && (channel < msg_global->max_channel), "Invalid channel %d", + channel); - return MSG_mailbox_put_with_timeout(MSG_mailbox_get_by_channel(dest, channel), task, timeout); + return + MSG_mailbox_put_with_timeout(MSG_mailbox_get_by_channel(dest, channel), + task, timeout); } -MSG_error_t -MSG_task_send(m_task_t task,const char* alias) +MSG_error_t MSG_task_send(m_task_t task, const char *alias) { - return MSG_task_send_with_timeout(task, alias, -1); + return MSG_task_send_with_timeout(task, alias, -1); } MSG_error_t -MSG_task_send_bounded(m_task_t task, const char* alias, double maxrate) +MSG_task_send_bounded(m_task_t task, const char *alias, double maxrate) { - task->simdata->rate = maxrate; - return MSG_task_send(task, alias); + task->simdata->rate = maxrate; + return MSG_task_send(task, alias); } MSG_error_t -MSG_task_send_with_timeout(m_task_t task, const char* alias, double timeout) +MSG_task_send_with_timeout(m_task_t task, const char *alias, double timeout) { - return MSG_mailbox_put_with_timeout(MSG_mailbox_get_by_alias(alias), task, timeout); + return MSG_mailbox_put_with_timeout(MSG_mailbox_get_by_alias(alias), task, + timeout); } -int -MSG_task_listen(const char* alias) +int MSG_task_listen(const char *alias) { - CHECK_HOST(); + CHECK_HOST(); - return !MSG_mailbox_is_empty(MSG_mailbox_get_by_alias(alias)); + return !MSG_mailbox_is_empty(MSG_mailbox_get_by_alias(alias)); } /** \ingroup msg_gos_functions @@ -505,14 +510,17 @@ MSG_task_listen(const char* alias) number of channels fixed with MSG_set_channel_number(). * \return 1 if there is a pending communication and 0 otherwise */ -int -MSG_task_Iprobe(m_channel_t channel) +int MSG_task_Iprobe(m_channel_t channel) { - xbt_assert1((channel >= 0) && (channel < msg_global->max_channel), "Invalid channel %d", channel); + xbt_assert1((channel >= 0) + && (channel < msg_global->max_channel), "Invalid channel %d", + channel); CHECK_HOST(); - return !MSG_mailbox_is_empty(MSG_mailbox_get_by_channel(MSG_host_self(), channel)); + return + !MSG_mailbox_is_empty(MSG_mailbox_get_by_channel + (MSG_host_self(), channel)); } /** \ingroup msg_gos_functions @@ -528,23 +536,28 @@ MSG_task_Iprobe(m_channel_t channel) * \return the number of tasks waiting to be received on \a channel and sent by \a host. */ -int -MSG_task_probe_from_host(int channel, m_host_t host) +int MSG_task_probe_from_host(int channel, m_host_t host) { - xbt_assert1((channel >= 0) && (channel < msg_global->max_channel), "Invalid channel %d", channel); + xbt_assert1((channel >= 0) + && (channel < msg_global->max_channel), "Invalid channel %d", + channel); - CHECK_HOST(); + CHECK_HOST(); - return MSG_mailbox_get_count_host_waiting_tasks(MSG_mailbox_get_by_channel(MSG_host_self(), channel),host); + return + MSG_mailbox_get_count_host_waiting_tasks(MSG_mailbox_get_by_channel + (MSG_host_self(), channel), + host); } -int -MSG_task_listen_from_host(const char* alias, m_host_t host) +int MSG_task_listen_from_host(const char *alias, m_host_t host) { - CHECK_HOST(); + CHECK_HOST(); - return MSG_mailbox_get_count_host_waiting_tasks(MSG_mailbox_get_by_alias(alias),host); + return + MSG_mailbox_get_count_host_waiting_tasks(MSG_mailbox_get_by_alias(alias), + host); } /** \ingroup msg_gos_functions @@ -556,32 +569,35 @@ MSG_task_listen_from_host(const char* alias, m_host_t host) number of channels fixed with MSG_set_channel_number(). * \return -1 if there is no pending communication and the PID of the process who sent it otherwise */ -int -MSG_task_probe_from(m_channel_t channel) +int MSG_task_probe_from(m_channel_t channel) { - m_task_t task; + m_task_t task; - CHECK_HOST(); + CHECK_HOST(); - xbt_assert1((channel >= 0) && (channel < msg_global->max_channel), "Invalid channel %d", channel); + xbt_assert1((channel >= 0) + && (channel < msg_global->max_channel), "Invalid channel %d", + channel); - if(NULL == (task = MSG_mailbox_get_head(MSG_mailbox_get_by_channel(MSG_host_self(), channel)))) - return -1; + if (NULL == + (task = + MSG_mailbox_get_head(MSG_mailbox_get_by_channel + (MSG_host_self(), channel)))) + return -1; - return MSG_process_get_PID(task->simdata->sender); + return MSG_process_get_PID(task->simdata->sender); } -int -MSG_task_listen_from(const char* alias) +int MSG_task_listen_from(const char *alias) { - m_task_t task; + m_task_t task; - CHECK_HOST(); + CHECK_HOST(); - if(NULL == (task = MSG_mailbox_get_head(MSG_mailbox_get_by_alias(alias)))) - return -1; + if (NULL == (task = MSG_mailbox_get_head(MSG_mailbox_get_by_alias(alias)))) + return -1; - return MSG_process_get_PID(task->simdata->sender); + return MSG_process_get_PID(task->simdata->sender); } /** \ingroup msg_gos_functions @@ -602,171 +618,145 @@ MSG_task_listen_from(const char* alias) and #MSG_OK otherwise. */ MSG_error_t -MSG_channel_select_from(m_channel_t channel,double timeout, int *PID) +MSG_channel_select_from(m_channel_t channel, double timeout, int *PID) { - m_host_t h = NULL; - simdata_host_t h_simdata = NULL; - m_task_t t; - int first_time = 1; - smx_cond_t cond; - msg_mailbox_t mailbox; - - xbt_assert1((channel >= 0) && (channel < msg_global->max_channel), "Invalid channel %d",channel); - - if(PID) - { - *PID = -1; - } - - if (timeout == 0.0) - { - *PID = MSG_task_probe_from(channel); - MSG_RETURN(MSG_OK); - } - else - { - CHECK_HOST(); - h = MSG_host_self(); - h_simdata = h->simdata; - - mailbox = MSG_mailbox_get_by_channel(MSG_host_self(), channel); - - while(MSG_mailbox_is_empty(mailbox)) - { - if(timeout > 0) - { - if (!first_time) - { - MSG_RETURN(MSG_OK); - } - } - - SIMIX_mutex_lock(h_simdata->mutex); - - xbt_assert1(!MSG_mailbox_get_cond(mailbox),"A process is already blocked on this channel %d",channel); - - cond = SIMIX_cond_init(); - - MSG_mailbox_set_cond(mailbox, cond); - - if (timeout > 0) - { - SIMIX_cond_wait_timeout(cond, h_simdata->mutex, timeout); - } - else - { - SIMIX_cond_wait(cond, h_simdata->mutex); - } - - SIMIX_cond_destroy(cond); - SIMIX_mutex_unlock(h_simdata->mutex); - - if (SIMIX_host_get_state(h_simdata->smx_host) == 0) - { - MSG_RETURN(MSG_HOST_FAILURE); - } - - MSG_mailbox_set_cond(mailbox,NULL); - first_time = 0; - } - - if(NULL == (t = MSG_mailbox_get_head(mailbox))) - MSG_RETURN(MSG_OK); - - - if (PID) - { - *PID = MSG_process_get_PID(t->simdata->sender); - } - - MSG_RETURN(MSG_OK); - } + m_host_t h = NULL; + simdata_host_t h_simdata = NULL; + m_task_t t; + int first_time = 1; + smx_cond_t cond; + msg_mailbox_t mailbox; + + xbt_assert1((channel >= 0) + && (channel < msg_global->max_channel), "Invalid channel %d", + channel); + + if (PID) { + *PID = -1; + } + + if (timeout == 0.0) { + *PID = MSG_task_probe_from(channel); + MSG_RETURN(MSG_OK); + } else { + CHECK_HOST(); + h = MSG_host_self(); + h_simdata = h->simdata; + + mailbox = MSG_mailbox_get_by_channel(MSG_host_self(), channel); + + while (MSG_mailbox_is_empty(mailbox)) { + if (timeout > 0) { + if (!first_time) { + MSG_RETURN(MSG_OK); + } + } + + SIMIX_mutex_lock(h_simdata->mutex); + + xbt_assert1(!MSG_mailbox_get_cond(mailbox), + "A process is already blocked on this channel %d", channel); + + cond = SIMIX_cond_init(); + + MSG_mailbox_set_cond(mailbox, cond); + + if (timeout > 0) { + SIMIX_cond_wait_timeout(cond, h_simdata->mutex, timeout); + } else { + SIMIX_cond_wait(cond, h_simdata->mutex); + } + + SIMIX_cond_destroy(cond); + SIMIX_mutex_unlock(h_simdata->mutex); + + if (SIMIX_host_get_state(h_simdata->smx_host) == 0) { + MSG_RETURN(MSG_HOST_FAILURE); + } + + MSG_mailbox_set_cond(mailbox, NULL); + first_time = 0; + } + + if (NULL == (t = MSG_mailbox_get_head(mailbox))) + MSG_RETURN(MSG_OK); + + + if (PID) { + *PID = MSG_process_get_PID(t->simdata->sender); + } + + MSG_RETURN(MSG_OK); + } } -MSG_error_t -MSG_alias_select_from(const char* alias, double timeout, int* PID) +MSG_error_t MSG_alias_select_from(const char *alias, double timeout, int *PID) { - m_host_t h = NULL; - simdata_host_t h_simdata = NULL; - m_task_t t; - int first_time = 1; - smx_cond_t cond; - msg_mailbox_t mailbox; - - if (PID) - { - *PID = -1; - } - - if(timeout == 0.0) - { - *PID = MSG_task_listen_from(alias); - MSG_RETURN(MSG_OK); - } - else - { - CHECK_HOST(); - h = MSG_host_self(); - h_simdata = h->simdata; - - DEBUG2("Probing on alias %s (%s)", alias, h->name); - - mailbox = MSG_mailbox_get_by_alias(alias); - - while(MSG_mailbox_is_empty(mailbox)) - { - if(timeout > 0) - { - if (!first_time) - { - MSG_RETURN(MSG_OK); - } - } - - SIMIX_mutex_lock(h_simdata->mutex); - - xbt_assert1(!MSG_mailbox_get_cond(mailbox),"A process is already blocked on this alias %s",alias); - - cond = SIMIX_cond_init(); - - MSG_mailbox_set_cond(mailbox, cond); - - if (timeout > 0) - { - SIMIX_cond_wait_timeout(cond, h_simdata->mutex, timeout); - } - else - { - SIMIX_cond_wait(cond, h_simdata->mutex); - } - - SIMIX_cond_destroy(cond); - SIMIX_mutex_unlock(h_simdata->mutex); - - if (SIMIX_host_get_state(h_simdata->smx_host) == 0) - { - MSG_RETURN(MSG_HOST_FAILURE); - } - - MSG_mailbox_set_cond(mailbox,NULL); - first_time = 0; - } - - if(NULL == (t = MSG_mailbox_get_head(mailbox))) - MSG_RETURN(MSG_OK); - - - if (PID) - { - *PID = MSG_process_get_PID(t->simdata->sender); - } - - MSG_RETURN(MSG_OK); - } -} + m_host_t h = NULL; + simdata_host_t h_simdata = NULL; + m_task_t t; + int first_time = 1; + smx_cond_t cond; + msg_mailbox_t mailbox; + + if (PID) { + *PID = -1; + } + if (timeout == 0.0) { + *PID = MSG_task_listen_from(alias); + MSG_RETURN(MSG_OK); + } else { + CHECK_HOST(); + h = MSG_host_self(); + h_simdata = h->simdata; + DEBUG2("Probing on alias %s (%s)", alias, h->name); + mailbox = MSG_mailbox_get_by_alias(alias); + while (MSG_mailbox_is_empty(mailbox)) { + if (timeout > 0) { + if (!first_time) { + MSG_RETURN(MSG_OK); + } + } + SIMIX_mutex_lock(h_simdata->mutex); + + xbt_assert1(!MSG_mailbox_get_cond(mailbox), + "A process is already blocked on this alias %s", alias); + + cond = SIMIX_cond_init(); + + MSG_mailbox_set_cond(mailbox, cond); + + if (timeout > 0) { + SIMIX_cond_wait_timeout(cond, h_simdata->mutex, timeout); + } else { + SIMIX_cond_wait(cond, h_simdata->mutex); + } + + SIMIX_cond_destroy(cond); + SIMIX_mutex_unlock(h_simdata->mutex); + + if (SIMIX_host_get_state(h_simdata->smx_host) == 0) { + MSG_RETURN(MSG_HOST_FAILURE); + } + + MSG_mailbox_set_cond(mailbox, NULL); + first_time = 0; + } + + if (NULL == (t = MSG_mailbox_get_head(mailbox))) + MSG_RETURN(MSG_OK); + + + if (PID) { + *PID = MSG_process_get_PID(t->simdata->sender); + } + + MSG_RETURN(MSG_OK); + } +}