X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/25d6952dcf52e6ffc1e4a402af0e2d3c17ac3935..80f442e05f4079b95d52af88f58374dcbc3a8f72:/src/msg/gos.c diff --git a/src/msg/gos.c b/src/msg/gos.c index c7e34c24a7..da0b42528d 100644 --- a/src/msg/gos.c +++ b/src/msg/gos.c @@ -16,57 +16,10 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gos, msg, * by an agent for handling some task. */ -/* \ingroup msg_gos_functions - * \brief This function is now deprecated and useless. Please stop using it. - */ -MSG_error_t MSG_process_start(m_process_t process) -{ - xbt_assert0(0,"This function is now deprecated and useless. Please stop using it."); - - return MSG_OK; -} - -/** \ingroup msg_gos_functions - * \brief Listen on a channel and wait for receiving a task. - * - * It takes two parameters. - * \param task a memory location for storing a #m_task_t. It will - hold a task when this function will return. Thus \a task should not - be equal to \c NULL and \a *task should be equal to \c NULL. If one of - those two condition does not hold, there will be a warning message. - * \param channel the channel on which the agent should be - listening. This value has to be >=0 and < than the maximal - number of channels fixed with MSG_set_channel_number(). - * \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) -{ - return MSG_task_get_with_time_out(task, channel, -1); -} - -/** \ingroup msg_gos_functions - * \brief Listen on a channel and wait for receiving a task with a timeout. - * - * It takes three parameters. - * \param task a memory location for storing a #m_task_t. It will - hold a task when this function will return. Thus \a task should not - be equal to \c NULL and \a *task should be equal to \c NULL. If one of - those two condition does not hold, there will be a warning message. - * \param channel the channel on which the agent should be - listening. This value has to be >=0 and < than the maximal - number of channels fixed with MSG_set_channel_number(). - * \param max_duration the maximum time to wait for a task before giving - up. In such a case, \a task will not be modified and will still be - equal to \c NULL when returning. - * \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_with_time_out(m_task_t * task, - m_channel_t channel, - double max_duration) +static MSG_error_t __MSG_task_get_with_time_out_from_host(m_task_t * task, + m_channel_t channel, + double max_duration, + m_host_t host) { m_process_t process = MSG_process_self(); m_task_t t = NULL; @@ -75,8 +28,10 @@ MSG_error_t MSG_task_get_with_time_out(m_task_t * task, simdata_host_t h_simdata = NULL; int first_time = 1; e_surf_action_state_t state = SURF_ACTION_NOT_IN_THE_SYSTEM; - + xbt_fifo_item_t item = NULL; + CHECK_HOST(); + xbt_assert1((channel>=0) && (channel < msg_global->max_channel),"Invalid channel %d",channel); /* Sanity check */ xbt_assert0(task,"Null pointer for the task\n"); @@ -89,7 +44,22 @@ MSG_error_t MSG_task_get_with_time_out(m_task_t * task, DEBUG2("Waiting for a task on channel %d (%s)", channel,h->name); - while ((t = xbt_fifo_shift(h_simdata->mbox[channel])) == NULL) { + while (1) { + if(xbt_fifo_size(h_simdata->mbox[channel])>0) { + if(!host) { + t = xbt_fifo_shift(h_simdata->mbox[channel]); + break; + } else { + xbt_fifo_foreach(h->simdata->mbox[channel],item,t,m_task_t) { + if(t->simdata->source==host) break; + } + if(item) { + xbt_fifo_remove_item(h->simdata->mbox[channel],item); + break; + } + } + } + if(max_duration>0) { if(!first_time) { MSG_RETURN(MSG_OK); @@ -113,6 +83,8 @@ MSG_error_t MSG_task_get_with_time_out(m_task_t * task, /* OK, we should both be ready now. Are you there ? */ } + DEBUG1("OK, got a task (%s)", t->name); + t_simdata = t->simdata; /* *task = __MSG_task_copy(t); */ *task=t; @@ -120,21 +92,46 @@ MSG_error_t MSG_task_get_with_time_out(m_task_t * task, /* Transfer */ t_simdata->using++; + while(MSG_process_is_suspended(t_simdata->sender)) { + DEBUG1("Oooups, the sender (%s) has been suspended in the meantime. Let's wait for him", + t_simdata->sender->name); + m_task_t task_to_wait_for = t_simdata->sender->simdata->waiting_task; + if(__MSG_process_isBlocked(t_simdata->sender)) { + DEBUG0("He's blocked. Let's wait for him to go in the suspended state"); + __MSG_process_unblock(t_simdata->sender); + task_to_wait_for->simdata->using++; + __MSG_task_wait_event(process, task_to_wait_for); + MSG_task_destroy(task_to_wait_for); + } else { + DEBUG0("He's suspended. Let's wait for him to go in the resumed state"); + task_to_wait_for->simdata->using++; + __MSG_task_wait_event(process, task_to_wait_for); + MSG_task_destroy(task_to_wait_for); + DEBUG0("He's resumed. He should block again. So let's free him."); + __MSG_process_unblock(t_simdata->sender); + break; + } + } + DEBUG0("Calling SURF for communication creation"); t_simdata->comm = surf_workstation_resource->extension_public-> communicate(MSG_process_get_host(t_simdata->sender)->simdata->host, h->simdata->host, t_simdata->message_size,t_simdata->rate); surf_workstation_resource->common_public->action_set_data(t_simdata->comm,t); - if(__MSG_process_isBlocked(t_simdata->sender)) + if(__MSG_process_isBlocked(t_simdata->sender)) { + DEBUG1("Unblocking %s",t_simdata->sender->name); __MSG_process_unblock(t_simdata->sender); + } PAJE_PROCESS_PUSH_STATE(process,"C"); do { + DEBUG0("Waiting for action termination"); __MSG_task_wait_event(process, t); state=surf_workstation_resource->common_public->action_get_state(t_simdata->comm); } while (state==SURF_ACTION_RUNNING); + DEBUG0("Action terminated"); if(t->simdata->using>1) { xbt_fifo_unshift(msg_global->process_to_run,process); @@ -160,6 +157,71 @@ MSG_error_t MSG_task_get_with_time_out(m_task_t * task, } } +/** \ingroup msg_gos_functions + * \brief Listen on a channel and wait for receiving a task. + * + * It takes two parameters. + * \param task a memory location for storing a #m_task_t. It will + hold a task when this function will return. Thus \a task should not + be equal to \c NULL and \a *task should be equal to \c NULL. If one of + those two condition does not hold, there will be a warning message. + * \param channel the channel on which the agent should be + listening. This value has to be >=0 and < than the maximal + number of channels fixed with MSG_set_channel_number(). + * \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) +{ + return MSG_task_get_with_time_out(task, channel, -1); +} + +/** \ingroup msg_gos_functions + * \brief Listen on a channel and wait for receiving a task with a timeout. + * + * It takes three parameters. + * \param task a memory location for storing a #m_task_t. It will + hold a task when this function will return. Thus \a task should not + be equal to \c NULL and \a *task should be equal to \c NULL. If one of + those two condition does not hold, there will be a warning message. + * \param channel the channel on which the agent should be + listening. This value has to be >=0 and < than the maximal + number of channels fixed with MSG_set_channel_number(). + * \param max_duration the maximum time to wait for a task before giving + up. In such a case, \a task will not be modified and will still be + equal to \c NULL when returning. + * \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_with_time_out(m_task_t * task, + m_channel_t channel, + double max_duration) +{ + return __MSG_task_get_with_time_out_from_host(task, channel, max_duration, NULL); +} + +/** \ingroup msg_gos_functions + * \brief Listen on \a channel and waits for receiving a task from \a host. + * + * It takes three parameters. + * \param task a memory location for storing a #m_task_t. It will + hold a task when this function will return. Thus \a task should not + be equal to \c NULL and \a *task should be equal to \c NULL. If one of + those two condition does not hold, there will be a warning message. + * \param channel the channel on which the agent should be + listening. This value has to be >=0 and < than the maximal + number of channels fixed with MSG_set_channel_number(). + * \param host the host that is to be watched. + * \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_from_host(m_task_t * task, int channel, + m_host_t host) +{ + return __MSG_task_get_with_time_out_from_host(task, channel, -1, host); +} + /** \ingroup msg_gos_functions * \brief Test whether there is a pending communication on a channel. * @@ -174,11 +236,12 @@ int MSG_task_Iprobe(m_channel_t channel) m_host_t h = NULL; simdata_host_t h_simdata = NULL; + xbt_assert1((channel>=0) && (channel < msg_global->max_channel),"Invalid channel %d",channel); DEBUG2("Probing on channel %d (%s)", channel,h->name); CHECK_HOST(); h = MSG_host_self(); h_simdata = h->simdata; - return(xbt_fifo_getFirstItem(h_simdata->mbox[channel])!=NULL); + return(xbt_fifo_get_first_item(h_simdata->mbox[channel])!=NULL); } /** \ingroup msg_gos_functions @@ -197,19 +260,36 @@ int MSG_task_probe_from(m_channel_t channel) xbt_fifo_item_t item; m_task_t t; + xbt_assert1((channel>=0) && (channel < msg_global->max_channel),"Invalid channel %d",channel); CHECK_HOST(); h = MSG_host_self(); h_simdata = h->simdata; DEBUG2("Probing on channel %d (%s)", channel,h->name); - item = xbt_fifo_getFirstItem(h->simdata->mbox[channel]); + item = xbt_fifo_get_first_item(h->simdata->mbox[channel]); if (!item || !(t = xbt_fifo_get_item_content(item))) return -1; return MSG_process_get_PID(t->simdata->sender); } +/** \ingroup msg_gos_functions + * \brief Wait for at most \a max_duration second for a task reception + on \a channel. *\a PID is updated with the PID of the first process + that triggered this event if any. + * + * It takes three parameters: + * \param channel the channel on which the agent should be + listening. This value has to be >=0 and < than the maximal. + number of channels fixed with MSG_set_channel_number(). + * \param PID a memory location for storing an int. + * \param max_duration the maximum time to wait for a task before + giving up. In the case of a reception, *\a PID will be updated + with the PID of the first process to send a task. + * \return #MSG_HOST_FAILURE if the host is shut down in the meantime + and #MSG_OK otherwise. + */ MSG_error_t MSG_channel_select_from(m_channel_t channel, double max_duration, int *PID) { @@ -220,19 +300,21 @@ MSG_error_t MSG_channel_select_from(m_channel_t channel, double max_duration, int first_time = 1; m_process_t process = MSG_process_self(); + xbt_assert1((channel>=0) && (channel < msg_global->max_channel),"Invalid channel %d",channel); if(PID) { *PID = -1; } if(max_duration==0.0) { - return MSG_task_probe_from(channel); + *PID = MSG_task_probe_from(channel); + MSG_RETURN(MSG_OK); } else { CHECK_HOST(); h = MSG_host_self(); h_simdata = h->simdata; DEBUG2("Probing on channel %d (%s)", channel,h->name); - while(!(item = xbt_fifo_getFirstItem(h->simdata->mbox[channel]))) { + while(!(item = xbt_fifo_get_first_item(h->simdata->mbox[channel]))) { if(max_duration>0) { if(!first_time) { MSG_RETURN(MSG_OK); @@ -264,6 +346,43 @@ MSG_error_t MSG_channel_select_from(m_channel_t channel, double max_duration, MSG_RETURN(MSG_OK); } } + + +/** \ingroup msg_gos_functions + + * \brief Return the number of tasks waiting to be received on a \a + channel and sent by \a host. + * + * It takes two parameters. + * \param channel the channel on which the agent should be + listening. This value has to be >=0 and < than the maximal + number of channels fixed with MSG_set_channel_number(). + * \param host the host that is to be watched. + * \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) +{ + simdata_host_t h_simdata = NULL; + xbt_fifo_item_t item; + m_task_t t; + int count = 0; + m_host_t h = NULL; + + xbt_assert1((channel>=0) && (channel < msg_global->max_channel),"Invalid channel %d",channel); + CHECK_HOST(); + h = MSG_host_self(); + h_simdata = h->simdata; + + DEBUG2("Probing on channel %d (%s)", channel,h->name); + + xbt_fifo_foreach(h->simdata->mbox[channel],item,t,m_task_t) { + if(t->simdata->source==host) count++; + } + + return count; +} + /** \ingroup msg_gos_functions * \brief Put a task on a channel of an host and waits for the end of the * transmission. @@ -298,8 +417,11 @@ MSG_error_t MSG_task_put(m_task_t task, CHECK_HOST(); + xbt_assert1((channel>=0) && (channel < msg_global->max_channel),"Invalid channel %d",channel); + task_simdata = task->simdata; task_simdata->sender = process; + task_simdata->source = MSG_process_get_host(process); xbt_assert0(task_simdata->using==1,"Gargl!"); task_simdata->comm = NULL; @@ -314,13 +436,18 @@ MSG_error_t MSG_task_put(m_task_t task, PAJE_COMM_START(process,task,channel); - if(remote_host->simdata->sleeping[channel]) + if(remote_host->simdata->sleeping[channel]) { + DEBUG0("Somebody is listening. Let's wake him up!"); __MSG_process_unblock(remote_host->simdata->sleeping[channel]); + } process->simdata->put_host = dest; process->simdata->put_channel = channel; - while(!(task_simdata->comm)) + while(!(task_simdata->comm)) { + DEBUG0("Communication not initiated yet. Let's block!"); __MSG_process_block(-1); + } + DEBUG0("Registering to this communication"); surf_workstation_resource->common_public->action_use(task_simdata->comm); process->simdata->put_host = NULL; process->simdata->put_channel = -1; @@ -330,10 +457,12 @@ MSG_error_t MSG_task_put(m_task_t task, state=surf_workstation_resource->common_public->action_get_state(task_simdata->comm); while (state==SURF_ACTION_RUNNING) { + DEBUG0("Waiting for action termination"); __MSG_task_wait_event(process, task); state=surf_workstation_resource->common_public->action_get_state(task_simdata->comm); } - + DEBUG0("Action terminated"); + task->simdata->rate=-1.0; /* Sets the rate back to default */ PAJE_PROCESS_POP_STATE(process); @@ -369,7 +498,6 @@ MSG_error_t MSG_task_put_bounded(m_task_t task, MSG_error_t res = MSG_OK; task->simdata->rate=max_rate; res = MSG_task_put(task, dest, channel); - task->simdata->rate=-1.0; return(res); } @@ -409,6 +537,9 @@ void __MSG_task_execute(m_process_t process, m_task_t task) simdata->compute = surf_workstation_resource->extension_public-> execute(MSG_process_get_host(process)->simdata->host, simdata->computation_amount); + surf_workstation_resource->common_public-> + set_priority(simdata->compute, simdata->priority); + surf_workstation_resource->common_public->action_set_data(simdata->compute,task); } @@ -417,6 +548,7 @@ MSG_error_t __MSG_wait_for_computation(m_process_t process, m_task_t task) e_surf_action_state_t state = SURF_ACTION_NOT_IN_THE_SYSTEM; simdata_task_t simdata = task->simdata; + XBT_IN4("(%p(%s) %p(%s))",process,process->name,task,task->name); simdata->using++; do { __MSG_task_wait_event(process, task); @@ -429,16 +561,19 @@ MSG_error_t __MSG_wait_for_computation(m_process_t process, m_task_t task) if(surf_workstation_resource->common_public->action_free(simdata->compute)) simdata->compute = NULL; simdata->computation_amount = 0.0; + XBT_OUT; MSG_RETURN(MSG_OK); } else if(surf_workstation_resource->extension_public-> get_state(MSG_process_get_host(process)->simdata->host) == SURF_CPU_OFF) { if(surf_workstation_resource->common_public->action_free(simdata->compute)) simdata->compute = NULL; + XBT_OUT; MSG_RETURN(MSG_HOST_FAILURE); } else { if(surf_workstation_resource->common_public->action_free(simdata->compute)) simdata->compute = NULL; + XBT_OUT; MSG_RETURN(MSG_TASK_CANCELLED); } } @@ -450,11 +585,11 @@ MSG_error_t __MSG_wait_for_computation(m_process_t process, m_task_t task) * \param name a name for the object. It is for user-level information and can be NULL. * \param host_nb the number of hosts implied in the parallel task. - * \param host_list an array of #host_nb m_host_t. - * \param computation_amount an array of #host_nb + * \param host_list an array of \p host_nb m_host_t. + * \param computation_amount an array of \p host_nb doubles. computation_amount[i] is the total number of operations that have to be performed on host_list[i]. - * \param communication_amount an array of #host_nb*#host_nb doubles. + * \param communication_amount an array of \p host_nb* \p host_nb doubles. * \param data a pointer to any data may want to attach to the new object. It is for user-level information and can be NULL. It can be retrieved with the function \ref MSG_task_get_data. @@ -482,6 +617,7 @@ m_task_t MSG_parallel_task_create(const char *name, simdata->rate = -1.0; simdata->using = 1; simdata->sender = NULL; + simdata->source = NULL; simdata->host_nb = host_nb; simdata->host_list = xbt_new0(void *, host_nb); @@ -591,7 +727,7 @@ MSG_error_t MSG_process_sleep(double nb_sec) } /** \ingroup msg_gos_functions - * \brief Return the number of MSG tasks currently running on a + * \brief Return the number of MSG tasks currently running on * the host of the current running process. */ static int MSG_get_msgload(void) @@ -607,7 +743,7 @@ static int MSG_get_msgload(void) /** \ingroup msg_gos_functions * - * \brief Return the the last value returned by a MSG function (except + * \brief Return the last value returned by a MSG function (except * MSG_get_errno...). */ MSG_error_t MSG_get_errno(void)