X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2995193b7e30d03c04917852c4c0b26d26646273..803db5b144024a4e2fd78b35744ebc1dba549a21:/src/msg/m_process.c
diff --git a/src/msg/m_process.c b/src/msg/m_process.c
index 3c603a0e43..06f85c3810 100644
--- a/src/msg/m_process.c
+++ b/src/msg/m_process.c
@@ -5,16 +5,17 @@
/* 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 \endhtmlonly
+ *
* We need to simulate many independent scheduling decisions, so
* the concept of process is at the heart of the
* simulator. A process may be defined as a code, with
@@ -27,7 +28,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(m_process, msg,
* \brief Creates and runs a new #m_process_t.
*
* Does exactly the same as #MSG_process_create_with_arguments but without
- providing standard arguments (\a argc, \a argv).
+ providing standard arguments (\a argc, \a argv, \a start_time, \a kill_time).
* \sa MSG_process_create_with_arguments
*/
m_process_t MSG_process_create(const char *name,
@@ -50,7 +51,9 @@ static void MSG_process_cleanup(void *arg)
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);
}
@@ -69,7 +72,7 @@ static void MSG_process_cleanup(void *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.
@@ -111,15 +114,17 @@ m_process_t MSG_process_create_with_arguments(const char *name,
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 !!! ////////////// */
+ /* *************** 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);
@@ -136,9 +141,11 @@ void MSG_process_kill(m_process_t process)
int i;
simdata_process_t p_simdata = process->simdata;
simdata_host_t h_simdata= p_simdata->host->simdata;
+ int _cursor;
+ m_process_t proc = NULL;
-/* fprintf(stderr,"Killing %s(%d) on %s.\n",process->name, */
-/* p_simdata->PID,p_simdata->host->name); */
+ DEBUG3("Killing %s(%d) on %s",process->name, p_simdata->PID,
+ p_simdata->host->name);
for (i=0; imax_channel; i++) {
if (h_simdata->sleeping[i] == process) {
@@ -146,23 +153,38 @@ void MSG_process_kill(m_process_t process)
break;
}
}
- if (i==msg_global->max_channel) {
- if(p_simdata->waiting_task) {
- if(p_simdata->waiting_task->simdata->compute)
- surf_workstation_resource->common_public->
- action_free(p_simdata->waiting_task->simdata->compute);
- else if (p_simdata->waiting_task->simdata->comm)
- surf_workstation_resource->common_public->
- action_change_state(p_simdata->waiting_task->simdata->comm,SURF_ACTION_FAILED);
- else
- fprintf(stderr,"UNKNOWN STATUS. Please report this bug.\n");
- } else { /* Must be trying to put a task somewhere */
- fprintf(stderr,"UNKNOWN STATUS. Please report this bug.\n");
+
+ if(p_simdata->waiting_task) {
+ xbt_dynar_foreach(p_simdata->waiting_task->simdata->sleeping,_cursor,proc) {
+ if(proc==process)
+ xbt_dynar_remove_at(p_simdata->waiting_task->simdata->sleeping,_cursor,&proc);
+ }
+ if(p_simdata->waiting_task->simdata->compute)
+ surf_workstation_resource->common_public->
+ action_free(p_simdata->waiting_task->simdata->compute);
+ else if (p_simdata->waiting_task->simdata->comm) {
+ surf_workstation_resource->common_public->
+ action_change_state(p_simdata->waiting_task->simdata->comm,SURF_ACTION_FAILED);
+ surf_workstation_resource->common_public->
+ action_free(p_simdata->waiting_task->simdata->comm);
+ } else {
+ xbt_die("UNKNOWN STATUS. Please report this bug.");
}
}
+ if ((i==msg_global->max_channel) && (process!=MSG_process_self()) &&
+ (!p_simdata->waiting_task)) {
+ xbt_die("UNKNOWN STATUS. Please report this bug.");
+ }
+
+ xbt_fifo_remove(msg_global->process_to_run,process);
xbt_fifo_remove(msg_global->process_list,process);
xbt_context_free(process->simdata->context);
+
+ if(process==MSG_process_self()) {
+ /* I just killed myself */
+ xbt_context_yield();
+ }
}
/** \ingroup m_process_management
@@ -183,7 +205,7 @@ MSG_error_t MSG_process_change_host(m_process_t process, m_host_t host)
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;
}
@@ -318,7 +340,7 @@ int MSG_process_self_PPID(void)
*/
m_process_t MSG_process_self(void)
{
- return msg_global->current_process;
+ return msg_global ? msg_global->current_process : NULL;
}
/** \ingroup m_process_management
@@ -331,11 +353,12 @@ MSG_error_t MSG_process_suspend(m_process_t process)
{
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;
@@ -345,7 +368,10 @@ MSG_error_t MSG_process_suspend(m_process_t process)
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)),
@@ -368,6 +394,7 @@ MSG_error_t MSG_process_suspend(m_process_t process)
MSG_task_destroy(dummy);
}
+ XBT_OUT;
return MSG_OK;
}
@@ -381,23 +408,30 @@ MSG_error_t MSG_process_resume(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();
- 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;
@@ -412,6 +446,7 @@ MSG_error_t MSG_process_resume(m_process_t process)
surf_workstation_resource->common_public->resume(simdata_task->comm);
}
+ XBT_OUT;
MSG_RETURN(MSG_OK);
}
@@ -421,48 +456,61 @@ MSG_error_t MSG_process_resume(m_process_t process)
* 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)
+int __MSG_process_block(double max_duration, const char *info)
{
m_process_t process = MSG_process_self();
-
m_task_t dummy = MSG_TASK_UNINITIALIZED;
- dummy = MSG_task_create("blocked", 0.0, 0, NULL);
+ char blocked_name[512];
+ snprintf(blocked_name,512,"blocked [%s] (%s:%s)",
+ info, 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;
@@ -473,6 +521,8 @@ MSG_error_t __MSG_process_unblock(m_process_t process)
PAJE_PROCESS_POP_STATE(process);
+ XBT_OUT;
+
MSG_RETURN(MSG_OK);
}