X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/64318694f830cd0dd242e4a5c8e091a56286da88..3595431d9a94c0b3833f488667f286529449b5ef:/src/msg/m_process.c

diff --git a/src/msg/m_process.c b/src/msg/m_process.c
index 5f586ccbb5..2131afab83 100644
--- a/src/msg/m_process.c
+++ b/src/msg/m_process.c
@@ -11,12 +11,23 @@
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(m_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.
+ *
+ *  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
+ *  some <em>private data</em>, executing in a <em>location</em>.
+ *  \see m_process_t
+ */
+
 /******************************** Process ************************************/
 /** \ingroup m_process_management
  * \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,
@@ -29,14 +40,18 @@ m_process_t MSG_process_create(const char *name,
 static void MSG_process_cleanup(void *arg)
 {
 
+  while(((m_process_t)arg)->simdata->paje_state) {
+    PAJE_PROCESS_POP_STATE((m_process_t)arg);
+  }
+
   PAJE_PROCESS_FREE(arg);
 
   xbt_fifo_remove(msg_global->process_list, arg);
   xbt_fifo_remove(msg_global->process_to_run, arg);
   xbt_fifo_remove(((m_process_t) arg)->simdata->host->simdata->process_list, arg);
-  xbt_free(((m_process_t) arg)->name);
-  xbt_free(((m_process_t) arg)->simdata);
-  xbt_free(arg);
+  free(((m_process_t) arg)->name);
+  free(((m_process_t) arg)->simdata);
+  free(arg);
 }
 
 /** \ingroup m_process_management
@@ -121,6 +136,8 @@ 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); */
@@ -133,6 +150,10 @@ void MSG_process_kill(m_process_t process)
   }
   if (i==msg_global->max_channel) {
     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);
@@ -140,12 +161,17 @@ void MSG_process_kill(m_process_t process)
 	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");
+	CRITICAL0("UNKNOWN STATUS. Please report this bug.");
     } else { /* Must be trying to put a task somewhere */
-      fprintf(stderr,"UNKNOWN STATUS. Please report this bug.\n");
+      if(process==MSG_process_self()) {
+	return;
+      } else {
+	CRITICAL0("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);
 }
@@ -303,7 +329,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
@@ -320,7 +346,6 @@ MSG_error_t MSG_process_suspend(m_process_t process)
 
   xbt_assert0(((process) && (process->simdata)), "Invalid parameters");
 
-  //  PAJE_PROCESS_STATE(process,"S");
   PAJE_PROCESS_PUSH_STATE(process,"S");
 
   if(process!=MSG_process_self()) {
@@ -376,7 +401,6 @@ MSG_error_t MSG_process_resume(m_process_t process)
 
 
   if(simdata->blocked) {
-    //    PAJE_PROCESS_STATE(process,"B");
     PAJE_PROCESS_POP_STATE(process);
 
     simdata->suspended = 0; /* He'll wake up by itself */
@@ -393,10 +417,8 @@ MSG_error_t MSG_process_resume(m_process_t process)
   if(simdata_task->compute) {
     surf_workstation_resource->common_public->resume(simdata_task->compute);
     PAJE_PROCESS_POP_STATE(process);
-    //    PAJE_PROCESS_STATE(process,"E");
   }
   else {
-    //    PAJE_PROCESS_STATE(process,"C");
     PAJE_PROCESS_POP_STATE(process);
     surf_workstation_resource->common_public->resume(simdata_task->comm);
   }
@@ -424,7 +446,6 @@ MSG_error_t __MSG_process_block(void)
   m_task_t dummy = MSG_TASK_UNINITIALIZED;
   dummy = MSG_task_create("blocked", 0.0, 0, NULL);
   
-  //  PAJE_PROCESS_STATE(process,"B");
   PAJE_PROCESS_PUSH_STATE(process,"B");
 
   process->simdata->blocked=1;