/* 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"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(m_process, msg,
+#include "private.h"
+#include "xbt/sysdep.h"
+#include "xbt/log.h"
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_process, msg,
"Logging specific to MSG (process)");
/** \defgroup m_process_management Management Functions of Agents
* \brief This section describes the agent structure of MSG
* (#m_process_t) and the functions for managing it.
- *
+ * \htmlonly <!-- DOXYGEN_NAVBAR_LABEL="Agents" --> \endhtmlonly
+ *
* We need to simulate many independent scheduling decisions, so
* the concept of <em>process</em> is at the heart of the
* simulator. A process may be defined as a <em>code</em>, with
xbt_fifo_remove(msg_global->process_to_run, arg);
xbt_fifo_remove(((m_process_t) arg)->simdata->host->simdata->process_list, arg);
free(((m_process_t) arg)->name);
+ ((m_process_t) arg)->name = NULL;
free(((m_process_t) arg)->simdata);
+ ((m_process_t) arg)->simdata = NULL;
free(arg);
}
name contains the word get), in \ref m_task_management (to create
or destroy some #m_task_t for example) and in \ref
msg_gos_functions (to handle file transfers and task processing).
- * \param data a pointer to any data may want to attach to the new
+ * \param data a pointer to any data one 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_process_get_data.
* \param host the location where the new agent is executed.
process->simdata = simdata;
process->data = data;
- xbt_fifo_push(host->simdata->process_list, process);
+ xbt_fifo_unshift(host->simdata->process_list, process);
/* /////////////// FIX du current_process !!! ////////////// */
self = msg_global->current_process;
xbt_context_start(process->simdata->context);
msg_global->current_process = self;
- xbt_fifo_push(msg_global->process_list, process);
- xbt_fifo_push(msg_global->process_to_run, process);
+ xbt_fifo_unshift(msg_global->process_list, process);
+ DEBUG2("Inserting %s(%s) in the to_run list",process->name,
+ host->name);
+ xbt_fifo_unshift(msg_global->process_to_run, process);
PAJE_PROCESS_NEW(process);
xbt_fifo_remove(simdata->host->simdata->process_list,process);
simdata->host = host;
- xbt_fifo_push(host->simdata->process_list,process);
+ xbt_fifo_unshift(host->simdata->process_list,process);
return MSG_OK;
}
{
simdata_process_t simdata = NULL;
simdata_task_t simdata_task = NULL;
- int i;
+
+ XBT_IN2("(%p(%s))", process, process->name);
xbt_assert0(((process) && (process->simdata)), "Invalid parameters");
- PAJE_PROCESS_PUSH_STATE(process,"S");
+ PAJE_PROCESS_PUSH_STATE(process,"S",NULL);
if(process!=MSG_process_self()) {
simdata = process->simdata;
simdata_task = simdata->waiting_task->simdata;
simdata->suspended = 1;
- if(simdata->blocked) return MSG_OK;
+ if(simdata->blocked) {
+ XBT_OUT;
+ return MSG_OK;
+ }
xbt_assert0(((simdata_task->compute)||(simdata_task->comm))&&
!((simdata_task->compute)&&(simdata_task->comm)),
MSG_task_destroy(dummy);
}
+ XBT_OUT;
return MSG_OK;
}
{
simdata_process_t simdata = NULL;
simdata_task_t simdata_task = NULL;
- int i;
xbt_assert0(((process != NULL) && (process->simdata)), "Invalid parameters");
CHECK_HOST();
- simdata = process->simdata;
+ XBT_IN2("(%p(%s))", process, process->name);
+ if(process == MSG_process_self()) {
+ XBT_OUT;
+ MSG_RETURN(MSG_OK);
+ }
+
+ simdata = process->simdata;
if(simdata->blocked) {
PAJE_PROCESS_POP_STATE(process);
simdata->suspended = 0; /* He'll wake up by itself */
+ XBT_OUT;
MSG_RETURN(MSG_OK);
}
if(!(simdata->waiting_task)) {
xbt_assert0(0,"Process not waiting for anything else. Weird !");
+ XBT_OUT;
return MSG_WARNING;
}
simdata_task = simdata->waiting_task->simdata;
surf_workstation_resource->common_public->resume(simdata_task->comm);
}
+ XBT_OUT;
MSG_RETURN(MSG_OK);
}
* This checks whether a process is suspended or not by inspecting the
* task on which it was waiting for the completion.
*/
-int MSG_process_isSuspended(m_process_t process)
+int MSG_process_is_suspended(m_process_t process)
{
xbt_assert0(((process != NULL) && (process->simdata)), "Invalid parameters");
return (process->simdata->suspended);
}
-MSG_error_t __MSG_process_block(void)
+static char blocked_name[512];
+
+int __MSG_process_block(double max_duration)
{
m_process_t process = MSG_process_self();
m_task_t dummy = MSG_TASK_UNINITIALIZED;
- dummy = MSG_task_create("blocked", 0.0, 0, NULL);
+ snprintf(blocked_name,512,"blocked (%s:%s)",process->name,
+ process->simdata->host->name);
+
+ XBT_IN1(": max_duration=%g",max_duration);
+
+ dummy = MSG_task_create(blocked_name, 0.0, 0, NULL);
- PAJE_PROCESS_PUSH_STATE(process,"B");
+ PAJE_PROCESS_PUSH_STATE(process,"B",NULL);
process->simdata->blocked=1;
__MSG_task_execute(process,dummy);
surf_workstation_resource->common_public->suspend(dummy->simdata->compute);
+ if(max_duration>=0)
+ surf_workstation_resource->common_public->set_max_duration(dummy->simdata->compute,
+ max_duration);
__MSG_wait_for_computation(process,dummy);
+ MSG_task_destroy(dummy);
process->simdata->blocked=0;
- if(process->simdata->suspended)
+ if(process->simdata->suspended) {
+ DEBUG0("I've been suspended in the meantime");
MSG_process_suspend(process);
-
- MSG_task_destroy(dummy);
+ DEBUG0("I've been resumed, let's keep going");
+ }
- return MSG_OK;
+ XBT_OUT;
+ return 1;
}
MSG_error_t __MSG_process_unblock(m_process_t process)
{
simdata_process_t simdata = NULL;
simdata_task_t simdata_task = NULL;
- int i;
xbt_assert0(((process != NULL) && (process->simdata)), "Invalid parameters");
CHECK_HOST();
+ XBT_IN2(": %s unblocking %s", MSG_process_self()->name,process->name);
+
simdata = process->simdata;
if(!(simdata->waiting_task)) {
xbt_assert0(0,"Process not waiting for anything else. Weird !");
+ XBT_OUT;
return MSG_WARNING;
}
simdata_task = simdata->waiting_task->simdata;
PAJE_PROCESS_POP_STATE(process);
+ XBT_OUT;
+
MSG_RETURN(MSG_OK);
}
