MSG_RETURN(MSG_TRANSFER_FAILURE);
}
}
- xbt_assert1(!(h_simdata->sleeping[channel]),
- "A process is already blocked on channel %d",
- channel);
+ xbt_assert1(!(h_simdata->sleeping[channel]),"A process is already blocked on channel %d", channel);
cond = SIMIX_cond_init();
h_simdata->sleeping[channel] = cond;
}
t_simdata = t->simdata;
- /* *task = __MSG_task_copy(t); */
+ t_simdata->receiver = process;
*task=t;
SIMIX_mutex_lock(t_simdata->mutex);
- // DEBUG1("OK, Mutex task locked (%s)", t->name);
/* Transfer */
t_simdata->using++;
/* create SIMIX action to the communication */
- // DEBUG3("Action (%s), Size (%lf), Rate (%lf)", t->name,t_simdata->message_size, t_simdata->rate);
t_simdata->comm = SIMIX_action_communicate(t_simdata->sender->simdata->host->simdata->host,
- process->simdata->host->simdata->host,t->name, t_simdata->message_size, t_simdata->rate);
- /*
+ process->simdata->host->simdata->host,t->name, t_simdata->message_size,
+ t_simdata->rate);
+ /* if the process is suspend, create the action but stop its execution, it will be restart when the sender process resume */
if (MSG_process_is_suspended(t_simdata->sender)) {
- SIMIX_set_priority(t_simdata->comm,0);
- t_simdata->comm = SIMIX_action_communicate(t_simdata->sender->simdata->host->simdata->host,
- process->simdata->host->simdata->host,t->name, t_simdata->message_size, t_simdata->rate);
+ DEBUG1("Process sender (%s) suspended", t_simdata->sender->name);
+ SIMIX_action_set_priority(t_simdata->comm,0);
}
- */
- /* if the process is suspend, create the action but stop its execution, it will be restart when the sender process resume */
+ process->simdata->waiting_task = t;
SIMIX_register_action_to_condition(t_simdata->comm, t_simdata->cond);
SIMIX_register_condition_to_action(t_simdata->comm, t_simdata->cond);
SIMIX_cond_wait(t_simdata->cond,t_simdata->mutex);
- DEBUG1("TASSK %s",t->name );
- /* action ended, set comm and compute = NULL, the actions is already destroyed in the main function */
- t->simdata->comm = NULL;
- t->simdata->compute = NULL;
+ process->simdata->waiting_task = NULL;
+
+ /* the task has already finished and the pointer must be null*/
+ if (t->simdata->sender) {
+ t->simdata->sender->simdata->waiting_task = NULL;
+ /* action ended, set comm and compute = NULL, the actions is already destroyed in the main function */
+ t->simdata->comm = NULL;
+ t->simdata->compute = NULL;
+ }
+ /* for this process, don't need to change in get function*/
+ t->simdata->receiver = NULL;
SIMIX_mutex_unlock(t_simdata->mutex);
-
- MSG_task_destroy(t);
-
MSG_RETURN(MSG_OK);
}
-
+
/** \ingroup msg_gos_functions
* \brief Listen on a channel and wait for receiving a task.
*
*/
int MSG_task_Iprobe(m_channel_t channel)
{
- xbt_die("not implemented yet");
- return 0;
+ m_host_t h = NULL;
+
+ xbt_assert1((channel>=0) && (channel < msg_global->max_channel),"Invalid channel %d",channel);
+ CHECK_HOST();
+
+ DEBUG2("Probing on channel %d (%s)", channel,h->name);
+
+ h = MSG_host_self();
+ return(xbt_fifo_get_first_item(h->simdata->mbox[channel])!=NULL);
}
/** \ingroup msg_gos_functions
*/
int MSG_task_probe_from(m_channel_t channel)
{
- xbt_die("not implemented yet");
- return 0;
+ m_host_t h = NULL;
+ 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();
+
+ DEBUG2("Probing on channel %d (%s)", channel,h->name);
+
+ 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
and #MSG_OK otherwise.
*/
MSG_error_t MSG_channel_select_from(m_channel_t channel, double max_duration,
- int *PID)
+ int *PID)
{
- xbt_die("not implemented yet");
- MSG_RETURN(MSG_OK);
+ m_host_t h = NULL;
+ simdata_host_t h_simdata = NULL;
+ xbt_fifo_item_t item;
+ m_task_t t;
+ int first_time = 1;
+ smx_cond_t cond;
+
+ xbt_assert1((channel>=0) && (channel < msg_global->max_channel),"Invalid channel %d",channel);
+ if(PID) {
+ *PID = -1;
+ }
+
+ if(max_duration==0.0) {
+ *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_get_first_item(h->simdata->mbox[channel]))) {
+ if(max_duration>0) {
+ if(!first_time) {
+ MSG_RETURN(MSG_OK);
+ }
+ }
+ SIMIX_mutex_lock(h_simdata->mutex);
+ xbt_assert1(!(h_simdata->sleeping[channel]),
+ "A process is already blocked on this channel %d", channel);
+ cond = SIMIX_cond_init();
+ h_simdata->sleeping[channel] = cond; /* I'm waiting. Wake me up when you're ready */
+ if(max_duration>0) {
+ SIMIX_cond_wait_timeout(cond,h_simdata->mutex, max_duration);
+ } 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->host)==0) {
+ MSG_RETURN(MSG_HOST_FAILURE);
+ }
+ h_simdata->sleeping[channel] = NULL;
+ first_time = 0;
+ }
+ if (!item || !(t = xbt_fifo_get_item_content(item))) {
+ MSG_RETURN(MSG_OK);
+ }
+ if(PID) {
+ *PID = MSG_process_get_PID(t->simdata->sender);
+ }
+ MSG_RETURN(MSG_OK);
+ }
}
*/
int MSG_task_probe_from_host(int channel, m_host_t host)
{
- xbt_die("not implemented yet");
- return 0;
+ 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();
+
+ 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
xbt_assert0(task_simdata->using==1,
"This taks is still being used somewhere else. You cannot send it now. Go fix your code!");
task_simdata->comm = NULL;
- task_simdata->cond = SIMIX_cond_init();
local_host = ((simdata_process_t) process->simdata)->host;
remote_host = dest;
if(remote_host->simdata->sleeping[channel]) {
DEBUG0("Somebody is listening. Let's wake him up!");
- //__MSG_process_unblock(remote_host->simdata->sleeping[channel]);
SIMIX_cond_signal(remote_host->simdata->sleeping[channel]);
}
SIMIX_mutex_unlock(remote_host->simdata->mutex);
process->simdata->put_channel = channel;
SIMIX_mutex_lock(task->simdata->mutex);
// DEBUG4("Task sent (%g kB) from %s to %s on channel %d, waiting...", task->simdata->message_size/1000,local_host->name, remote_host->name, channel);
- DEBUG0("Waiting action finish!");
+
+ process->simdata->waiting_task = task;
if (max_duration >0) {
SIMIX_cond_wait_timeout(task->simdata->cond,task->simdata->mutex,max_duration);
}
SIMIX_cond_wait(task->simdata->cond,task->simdata->mutex);
}
DEBUG1("Action terminated %s",task->name);
+ task->simdata->using--;
+ process->simdata->waiting_task = NULL;
+ /* the task has already finished and the pointer must be null*/
+ if (task->simdata->receiver) {
+ task->simdata->receiver->simdata->waiting_task = NULL;
+ /* action ended, set comm and compute = NULL, the actions is already destroyed in the main function */
+ task->simdata->comm = NULL;
+ task->simdata->compute = NULL;
+ }
+ /* for this process, don't need to change in get function*/
+ task->simdata->sender = NULL;
SIMIX_mutex_unlock(task->simdata->mutex);
MSG_RETURN(MSG_OK);
}
+
/** \ingroup msg_gos_functions
* \brief Put a task on a channel of an host and waits for the end of the
* transmission.
MSG_error_t MSG_task_execute(m_task_t task)
{
simdata_task_t simdata = NULL;
-
+ m_process_t self = MSG_process_self();
CHECK_HOST();
simdata = task->simdata;
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);
SIMIX_register_condition_to_action(simdata->compute, simdata->cond);
-
SIMIX_cond_wait(simdata->cond, simdata->mutex);
+ self->simdata->waiting_task = NULL;
/* action ended, set comm and compute = NULL, the actions is already destroyed in the main function */
simdata->comm = NULL;
SIMIX_mutex_unlock(simdata->mutex);
simdata->using--;
-
-// MSG_RETURN(MSG_OK);
- return MSG_OK;
+ MSG_RETURN(MSG_OK);
}
-void __MSG_task_execute(m_process_t process, m_task_t task)
-{
-
-}
-MSG_error_t __MSG_wait_for_computation(m_process_t process, m_task_t task)
-{
- MSG_RETURN(MSG_OK);
-}
/** \ingroup m_task_management
* \brief Creates a new #m_task_t (a parallel one....).
*
SIMIX_mutex_unlock(mutex);
/* remove variables */
- SIMIX_action_destroy(act_sleep);
SIMIX_cond_destroy(cond);
SIMIX_mutex_destroy(mutex);
