Solaris segfaults when asked to print NULL

[simgrid.git] / src / msg / m_process.c

diff --git a/src/msg/m_process.c b/src/msg/m_process.c
index d049c4a..f47ed40 100644 (file)
--- a/src/msg/m_process.c
+++ b/src/msg/m_process.c
@@ -11,6 +11,17 @@
 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.
@@ -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
@@ -303,7 +318,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 +335,7 @@ 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()) {
     simdata = process->simdata;
@@ -373,8 +388,9 @@ MSG_error_t MSG_process_resume(m_process_t process)
 
   simdata = process->simdata;
 
+
   if(simdata->blocked) {
-    PAJE_PROCESS_STATE(process,"B");
+    PAJE_PROCESS_POP_STATE(process);
 
     simdata->suspended = 0; /* He'll wake up by itself */
     MSG_RETURN(MSG_OK);
@@ -389,10 +405,10 @@ 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_STATE(process,"E");
+    PAJE_PROCESS_POP_STATE(process);
   }
   else {
-    PAJE_PROCESS_STATE(process,"C");
+    PAJE_PROCESS_POP_STATE(process);
     surf_workstation_resource->common_public->resume(simdata_task->comm);
   }
 
@@ -419,7 +435,7 @@ 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;
   __MSG_task_execute(process,dummy);
@@ -455,6 +471,8 @@ MSG_error_t __MSG_process_unblock(m_process_t process)
 
   surf_workstation_resource->common_public->resume(simdata_task->compute);
 
+  PAJE_PROCESS_POP_STATE(process);
+
   MSG_RETURN(MSG_OK);
 }
 
@@ -464,3 +482,15 @@ int __MSG_process_isBlocked(m_process_t process)
 
   return (process->simdata->blocked);
 }
+
+
+const char* xbt_procname(void) {
+  const char res = NULL;
+  m_process_t process = MSG_process_self();
+  if ((process != NULL) && (process->simdata))
+    res = MSG_process_get_name(process);
+  if (res) 
+    return res;
+  else
+    return "";
+}