/* 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"xbt/sysdep.h"
-#include "xbt/error.h"
+#include "private.h"
+#include "xbt/sysdep.h"
+#include "xbt/log.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gos, msg,
"Logging specific to MSG (gos)");
* 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.
*
e_surf_action_state_t state = SURF_ACTION_NOT_IN_THE_SYSTEM;
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");
/* 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;
/* Transfer */
t_simdata->using++;
+ 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))
__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);
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
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;
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;
}
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);
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;
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;
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");
PAJE_PROCESS_POP_STATE(process);
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);
}
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);