-/* $Id$ */
-
-/* Copyright (c) 2002,2003,2004 Arnaud Legrand. All rights reserved. */
+/* $Id$ */
+
+/* Copyright (c) 2002-2007 Arnaud Legrand. */
+/* Copyright (c) 2007 Bruno Donassolo. */
+/* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-
-#include "private.h"
+
+#include "msg/private.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_gos, msg,
- "Logging specific to MSG (gos)");
+
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_gos, msg, "Logging specific to MSG (gos)");
/** \defgroup msg_gos_functions MSG Operating System Functions
* \brief This section describes the functions that can be used
double max_duration,
m_host_t host)
{
+
m_process_t process = MSG_process_self();
m_task_t t = NULL;
m_host_t h = NULL;
- m_task_t task_to_wait_for;
simdata_task_t t_simdata = NULL;
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;
+ smx_cond_t cond = NULL; //conditional wait if the task isn't on the channel yet
+
CHECK_HOST();
xbt_assert1((channel>=0) && (channel < msg_global->max_channel),"Invalid channel %d",channel);
/* Sanity check */
DEBUG2("Waiting for a task on channel %d (%s)", channel,h->name);
+ SIMIX_mutex_lock(h->simdata->mutex);
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) {
- PAJE_PROCESS_POP_STATE(process);
- MSG_RETURN(MSG_TRANSFER_FAILURE);
- }
- }
- xbt_assert3(!(h_simdata->sleeping[channel]),
- "A process (%s(%d)) is already blocked on channel %d",
- h_simdata->sleeping[channel]->name,
- h_simdata->sleeping[channel]->simdata->PID,
- channel);
- h_simdata->sleeping[channel] = process; /* I'm waiting. Wake me up when you're ready */
- if(max_duration>0) {
- __MSG_process_block(max_duration,"");
- } else {
- __MSG_process_block(-1,"");
- }
- h_simdata->sleeping[channel] = NULL;
- first_time = 0;
- if(surf_workstation_resource->extension_public->get_state(h_simdata->host)
- == SURF_CPU_OFF)
+ 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) {
+ SIMIX_mutex_unlock(h->simdata->mutex);
+ h_simdata->sleeping[channel] = NULL;
+ SIMIX_cond_destroy(cond);
+ MSG_RETURN(MSG_TRANSFER_FAILURE);
+ }
+ }
+ xbt_assert1(!(h_simdata->sleeping[channel]),"A process is already blocked on channel %d", channel);
+
+ cond = SIMIX_cond_init();
+ h_simdata->sleeping[channel] = cond;
+ if (max_duration > 0) {
+ SIMIX_cond_wait_timeout(cond, h->simdata->mutex, max_duration);
+ }
+ else SIMIX_cond_wait(h_simdata->sleeping[channel],h->simdata->mutex);
+
+ if(SIMIX_host_get_state(h_simdata->s_host)==0)
MSG_RETURN(MSG_HOST_FAILURE);
- /* OK, we should both be ready now. Are you there ? */
- }
+
+ first_time = 0;
+ }
+ SIMIX_mutex_unlock(h->simdata->mutex);
DEBUG1("OK, got a task (%s)", t->name);
+ /* clean conditional */
+ if (cond) {
+ SIMIX_cond_destroy(cond);
+ h_simdata->sleeping[channel] = NULL;
+ }
t_simdata = t->simdata;
- /* *task = __MSG_task_copy(t); */
+ t_simdata->receiver = process;
*task=t;
+ SIMIX_mutex_lock(t_simdata->mutex);
+
/* Transfer */
t_simdata->using++;
+ /* create SIMIX action to the communication */
+ t_simdata->comm = SIMIX_action_communicate(t_simdata->sender->simdata->m_host->simdata->s_host,
+ process->simdata->m_host->simdata->s_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)) {
+ DEBUG1("Process sender (%s) suspended", t_simdata->sender->name);
+ SIMIX_action_set_priority(t_simdata->comm,0);
+ }
+ process->simdata->waiting_task = t;
+ SIMIX_register_action_to_condition(t_simdata->comm, t_simdata->cond);
+ SIMIX_cond_wait(t_simdata->cond,t_simdata->mutex);
+ 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);
- 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);
- 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)) {
- DEBUG1("Unblocking %s",t_simdata->sender->name);
- __MSG_process_unblock(t_simdata->sender);
- }
-
- PAJE_PROCESS_PUSH_STATE(process,"C",t);
-
- 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);
- xbt_context_yield();
- }
-
- PAJE_PROCESS_POP_STATE(process);
- PAJE_COMM_STOP(process,t,channel);
- if(state == SURF_ACTION_DONE) {
- if(surf_workstation_resource->common_public->action_free(t_simdata->comm))
- t_simdata->comm = NULL;
+ if(SIMIX_action_get_state(t_simdata->comm) == SURF_ACTION_DONE) {
+ //t_simdata->comm = NULL;
+ SIMIX_action_destroy(t_simdata->comm);
+ t_simdata->comm = NULL;
MSG_RETURN(MSG_OK);
- } else if(surf_workstation_resource->extension_public->get_state(h_simdata->host)
- == SURF_CPU_OFF) {
- if(surf_workstation_resource->common_public->action_free(t_simdata->comm))
- t_simdata->comm = NULL;
+ } else if (SIMIX_host_get_state(h_simdata->s_host)==0) {
+ //t_simdata->comm = NULL;
+ SIMIX_action_destroy(t_simdata->comm);
+ t_simdata->comm = NULL;
MSG_RETURN(MSG_HOST_FAILURE);
- } else {
- if(surf_workstation_resource->common_public->action_free(t_simdata->comm))
- t_simdata->comm = NULL;
+ } else {
+ //t_simdata->comm = NULL;
+ SIMIX_action_destroy(t_simdata->comm);
+ t_simdata->comm = NULL;
MSG_RETURN(MSG_TRANSFER_FAILURE);
}
-}
+}
+
/** \ingroup msg_gos_functions
* \brief Listen on a channel and wait for receiving a task.
*
m_host_t h = 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();
+
+ DEBUG2("Probing on channel %d (%s)", channel,h->name);
+
h = MSG_host_self();
return(xbt_fifo_get_first_item(h->simdata->mbox[channel])!=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);
item = xbt_fifo_get_first_item(h->simdata->mbox[channel]);
- if (!item || !(t = xbt_fifo_get_item_content(item)))
+ if ( (!item) || (!(t = xbt_fifo_get_item_content(item))) )
return -1;
return MSG_process_get_PID(t->simdata->sender);
and #MSG_OK otherwise.
*/
MSG_error_t MSG_channel_select_from(m_channel_t channel, double max_duration,
- int *PID)
+ int *PID)
{
- m_host_t h = NULL;
- simdata_host_t h_simdata = NULL;
- xbt_fifo_item_t item;
- m_task_t t;
- 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;
- }
+ 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);
+ 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->s_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);
}
- }
- xbt_assert2(!(h_simdata->sleeping[channel]),
- "A process (%s(%d)) is already blocked on this channel",
- h_simdata->sleeping[channel]->name,
- h_simdata->sleeping[channel]->simdata->PID);
- h_simdata->sleeping[channel] = process; /* I'm waiting. Wake me up when you're ready */
- if(max_duration>0) {
- __MSG_process_block(max_duration,"");
- } else {
- __MSG_process_block(-1,"");
- }
- if(surf_workstation_resource->extension_public->get_state(h_simdata->host)
- == SURF_CPU_OFF) {
- 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);
- }
}
MSG_error_t MSG_task_put_with_timeout(m_task_t task, m_host_t dest,
m_channel_t channel, double max_duration)
{
+
+
m_process_t process = MSG_process_self();
simdata_task_t task_simdata = NULL;
- e_surf_action_state_t state = SURF_ACTION_NOT_IN_THE_SYSTEM;
m_host_t local_host = NULL;
m_host_t remote_host = NULL;
- int first_time = 1;
-
CHECK_HOST();
xbt_assert1((channel>=0) && (channel < msg_global->max_channel),"Invalid channel %d",channel);
task_simdata->sender = process;
task_simdata->source = MSG_process_get_host(process);
xbt_assert0(task_simdata->using==1,
- "This taks is still being used somewhere else. You cannot send it now. Go fix your code!");
+ "This task is still being used somewhere else. You cannot send it now. Go fix your code!");
task_simdata->comm = NULL;
- local_host = ((simdata_process_t) process->simdata)->host;
+ local_host = ((simdata_process_t) process->simdata)->m_host;
remote_host = dest;
DEBUG4("Trying to send a task (%g kB) from %s to %s on channel %d",
task->simdata->message_size/1000,local_host->name, remote_host->name, channel);
+ SIMIX_mutex_lock(remote_host->simdata->mutex);
xbt_fifo_push(((simdata_host_t) remote_host->simdata)->
mbox[channel], task);
- PAJE_COMM_START(process,task,channel);
-
+
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_host = dest;
process->simdata->put_channel = channel;
- while(!(task_simdata->comm)) {
- if(max_duration>0) {
- if(!first_time) {
- PAJE_PROCESS_POP_STATE(process);
- PAJE_COMM_STOP(process,task,channel);
- MSG_RETURN(MSG_TRANSFER_FAILURE);
- }
- }
- DEBUG0("Communication not initiated yet. Let's block!");
- if(max_duration>0)
- __MSG_process_block(max_duration,task->name);
- else
- __MSG_process_block(-1,task->name);
-
- first_time = 0;
-
- if(surf_workstation_resource->extension_public->
- get_state(local_host->simdata->host) == SURF_CPU_OFF) {
- xbt_fifo_remove(((simdata_host_t) remote_host->simdata)->mbox[channel],
- task);
- PAJE_PROCESS_POP_STATE(process);
- PAJE_COMM_STOP(process,task,channel);
- MSG_task_destroy(task);
- MSG_RETURN(MSG_HOST_FAILURE);
- }
- }
- 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;
-
-
- PAJE_PROCESS_PUSH_STATE(process,"C",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 */
+ 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);
+
+ process->simdata->waiting_task = task;
+ if (max_duration >0) {
+ SIMIX_cond_wait_timeout(task->simdata->cond,task->simdata->mutex,max_duration);
+ /* verify if the timeout happened and the communication didn't started yet */
+ if (task->simdata->comm==NULL) {
+ task->simdata->using--;
+ process->simdata->waiting_task = NULL;
+ xbt_fifo_remove(((simdata_host_t) remote_host->simdata)->mbox[channel],
+ task);
+ if (task->simdata->receiver) {
+ task->simdata->receiver->simdata->waiting_task = NULL;
+ }
+ task->simdata->sender = NULL;
+ SIMIX_mutex_unlock(task->simdata->mutex);
+ MSG_RETURN(MSG_TRANSFER_FAILURE);
+ }
+ }
+ else {
+ SIMIX_cond_wait(task->simdata->cond,task->simdata->mutex);
+ }
- PAJE_PROCESS_POP_STATE(process);
+ 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;
+ }
+ task->simdata->sender = NULL;
+ SIMIX_mutex_unlock(task->simdata->mutex);
- if(state == SURF_ACTION_DONE) {
- if(surf_workstation_resource->common_public->action_free(task_simdata->comm))
- task_simdata->comm = NULL;
- MSG_task_destroy(task);
+ if(SIMIX_action_get_state(task->simdata->comm) == SURF_ACTION_DONE) {
MSG_RETURN(MSG_OK);
- } else if(surf_workstation_resource->extension_public->get_state(local_host->simdata->host)
- == SURF_CPU_OFF) {
- if(surf_workstation_resource->common_public->action_free(task_simdata->comm))
- task_simdata->comm = NULL;
- MSG_task_destroy(task);
+ } else if (SIMIX_host_get_state(local_host->simdata->s_host)==0) {
MSG_RETURN(MSG_HOST_FAILURE);
} else {
- if(surf_workstation_resource->common_public->action_free(task_simdata->comm))
- task_simdata->comm = NULL;
- MSG_task_destroy(task);
MSG_RETURN(MSG_TRANSFER_FAILURE);
}
}
+
/** \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)
{
- m_process_t process = MSG_process_self();
- MSG_error_t res;
-
- DEBUG1("Computing on %s", process->simdata->host->name);
-
- __MSG_task_execute(process, task);
-
- PAJE_PROCESS_PUSH_STATE(process,"E",task);
- res = __MSG_wait_for_computation(process,task);
- PAJE_PROCESS_POP_STATE(process);
- return res;
-}
-
-void __MSG_task_execute(m_process_t process, m_task_t task)
-{
- simdata_task_t simdata = NULL;
-
+ simdata_task_t simdata = NULL;
+ m_process_t self = MSG_process_self();
CHECK_HOST();
simdata = task->simdata;
xbt_assert0((!simdata->compute)&&(task->simdata->using==1),
- "This taks is executed somewhere else. Go fix your code!");
- task->simdata->using++;
- 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);
- task->simdata->using--;
-}
+ "This task is executed somewhere else. Go fix your code!");
+
+ DEBUG1("Computing on %s", MSG_process_self()->simdata->m_host->name);
+ simdata->using++;
+ 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);
-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;
+ self->simdata->waiting_task = task;
+ SIMIX_register_action_to_condition(simdata->compute, simdata->cond);
+ SIMIX_cond_wait(simdata->cond, simdata->mutex);
+ self->simdata->waiting_task = NULL;
- XBT_IN4("(%p(%s) %p(%s))",process,process->name,task,task->name);
- simdata->using++;
- do {
- __MSG_task_wait_event(process, task);
- state=surf_workstation_resource->common_public->action_get_state(simdata->compute);
- } while (state==SURF_ACTION_RUNNING);
+ SIMIX_mutex_unlock(simdata->mutex);
simdata->using--;
-
- if(state == SURF_ACTION_DONE) {
- if(surf_workstation_resource->common_public->action_free(simdata->compute))
- simdata->compute = NULL;
- simdata->computation_amount = 0.0;
- XBT_OUT;
+ 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(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;
+ } 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 {
- if(surf_workstation_resource->common_public->action_free(simdata->compute))
- simdata->compute = NULL;
- XBT_OUT;
+ } 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
* \brief Creates a new #m_task_t (a parallel one....).
*
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);
- int i;
+ task->simdata = simdata;
/* Task structure */
task->name = xbt_strdup(name);
- task->simdata = simdata;
task->data = data;
/* Simulator Data */
- simdata->sleeping = xbt_dynar_new(sizeof(m_process_t),NULL);
+ 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->using = 1;
simdata->sender = NULL;
+ simdata->receiver = NULL;
simdata->source = NULL;
+
simdata->host_nb = host_nb;
-
simdata->host_list = xbt_new0(void *, 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->host;
+ simdata->host_list[i] = host_list[i]->simdata->s_host;
return task;
+
}
-static void __MSG_parallel_task_execute(m_process_t process, m_task_t task)
+MSG_error_t MSG_parallel_task_execute(m_task_t task)
{
- simdata_task_t simdata = NULL;
-
+ simdata_task_t simdata = NULL;
+ m_process_t self = MSG_process_self();
CHECK_HOST();
simdata = task->simdata;
+ xbt_assert0((!simdata->compute)&&(task->simdata->using==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->using++;
+ 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);
- simdata->compute = surf_workstation_resource->extension_public->
- execute_parallel_task(task->simdata->host_nb,
- task->simdata->host_list,
- task->simdata->comp_amount,
- task->simdata->comm_amount,
- 1.0,
- -1.0);
- if(simdata->compute)
- surf_workstation_resource->common_public->action_set_data(simdata->compute,task);
-}
+ self->simdata->waiting_task = task;
+ SIMIX_register_action_to_condition(simdata->compute, simdata->cond);
+ SIMIX_cond_wait(simdata->cond, simdata->mutex);
+ self->simdata->waiting_task = NULL;
-MSG_error_t MSG_parallel_task_execute(m_task_t task)
-{
- m_process_t process = MSG_process_self();
- MSG_error_t res;
- DEBUG0("Computing on a tons of guys");
-
- __MSG_parallel_task_execute(process, task);
+ SIMIX_mutex_unlock(simdata->mutex);
+ simdata->using--;
- if(task->simdata->compute)
- res = __MSG_wait_for_computation(process,task);
- else
- res = MSG_OK;
+ 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);
+ }
- return res;
}
*/
MSG_error_t MSG_process_sleep(double nb_sec)
{
- e_surf_action_state_t state = SURF_ACTION_NOT_IN_THE_SYSTEM;
- m_process_t process = MSG_process_self();
- m_task_t dummy = NULL;
- simdata_task_t simdata = NULL;
-
- xbt_assert1(nb_sec>=0,"Invalid duration %g",nb_sec);
-
- CHECK_HOST();
- dummy = MSG_task_create("MSG_sleep", nb_sec, 0.0, NULL);
- simdata = dummy->simdata;
-
- simdata->compute = surf_workstation_resource->extension_public->
- sleep(MSG_process_get_host(process)->simdata->host,
- simdata->computation_amount);
- surf_workstation_resource->common_public->action_set_data(simdata->compute,dummy);
-
-
- simdata->using++;
- do {
- __MSG_task_wait_event(process, dummy);
- state=surf_workstation_resource->common_public->action_get_state(simdata->compute);
- } while (state==SURF_ACTION_RUNNING);
- simdata->using--;
-
- if(state == SURF_ACTION_DONE) {
- 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;
- MSG_RETURN(MSG_HOST_FAILURE);
- }
- if(__MSG_process_isBlocked(process)) {
- __MSG_process_unblock(MSG_process_self());
- }
- 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;
+ smx_action_t act_sleep;
+ m_process_t proc = MSG_process_self();
+ 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);
+ SIMIX_cond_wait(cond,mutex);
+ 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);
}
- if(surf_workstation_resource->common_public->action_free(simdata->compute))
- simdata->compute = NULL;
- MSG_task_destroy(dummy);
- MSG_RETURN(MSG_OK);
- } else MSG_RETURN(MSG_HOST_FAILURE);
+ }
+ else {
+ SIMIX_action_destroy(act_sleep);
+ MSG_RETURN(MSG_HOST_FAILURE);
+ }
+
+
+ MSG_RETURN(MSG_OK);
}
/** \ingroup msg_gos_functions
*/
static int MSG_get_msgload(void)
{
- m_process_t process;
-
- CHECK_HOST();
-
- xbt_assert0(0, "This function is still to be specified correctly (what do you mean by 'load', exactly?). In the meantime, please don't use it");
- process = MSG_process_self();
- return xbt_fifo_size(process->simdata->host->simdata->process_list);
+ xbt_die("not implemented yet");
+ return 0;
}
/** \ingroup msg_gos_functions
