Remove MSG_process_kill_from_SIMIX

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

diff --git a/src/msg/msg_process.c b/src/msg/msg_process.c
index 4ec3efa..8579928 100644 (file)
--- a/src/msg/msg_process.c
+++ b/src/msg/msg_process.c
@@ -33,35 +33,31 @@ void MSG_process_cleanup_from_SIMIX(smx_process_t smx_proc)
 
   // get the MSG process from the SIMIX process
   if (smx_proc == SIMIX_process_self()) {
-       /* avoid a SIMIX request if this function is called by the process itself */
+    /* avoid a SIMIX request if this function is called by the process itself */
     msg_proc = SIMIX_process_self_get_data(smx_proc);
-
     SIMIX_process_self_set_data(smx_proc, NULL);
   }
   else {
     msg_proc = simcall_process_get_data(smx_proc);
     simcall_process_set_data(smx_proc, NULL);
   }
+
 #ifdef HAVE_TRACING
   TRACE_msg_process_end(smx_proc);
 #endif
 
-  msg_process_data_t process_data = (msg_process_data_t)msg_proc->data;
-  //free the process data
-  if (process_data) {
-       //Remove the process from its vm
-       if (process_data->current_vm) {
-         int pos = xbt_dynar_search(process_data->current_vm->processes,&smx_proc);
-         xbt_dynar_remove_at(process_data->current_vm->processes,pos, NULL);
-       }
-       //Free the data if a function was provided
-    if (process_data->data && msg_global->process_data_cleanup) {
-      msg_global->process_data_cleanup(process_data->data);
-    }
-    xbt_free(process_data);
+  // free the data if a function was provided
+  if (msg_proc->data && msg_global->process_data_cleanup) {
+    msg_global->process_data_cleanup(msg_proc->data);
+  }
+
+  // remove the process from its virtual machine
+  if (msg_proc->vm) {
+    int pos = xbt_dynar_search(msg_proc->vm->processes,&smx_proc);
+    xbt_dynar_remove_at(msg_proc->vm->processes,pos, NULL);
   }
 
-  //free the MSG process
+  // free the MSG process
   xbt_free(msg_proc);
 }
 
@@ -175,14 +171,16 @@ m_process_t MSG_process_create_with_environment(const char *name,
 
   if (SIMIX_process_self()) {
     simdata->PPID = MSG_process_get_PID(MSG_process_self());
+    #ifdef HAVE_TRACING
+      MSG_process_on_exit((int_f_pvoid_t)TRACE_msg_process_kill,MSG_process_self());
+    #endif
   } else {
     simdata->PPID = -1;
   }
 
 #ifdef HAVE_TRACING
   TRACE_msg_process_create(name, simdata->PID, simdata->m_host);
-#endif
-
+  #endif
   /* Let's create the process: SIMIX may decide to start it right now,
    * even before returning the flow control to us */
   simcall_process_create(&process, name, code, simdata, SIMIX_host_get_name(host->smx_host), -1,
@@ -198,14 +196,6 @@ m_process_t MSG_process_create_with_environment(const char *name,
   return process;
 }
 
-void MSG_process_kill_from_SIMIX(smx_process_t p)
-{
-#ifdef HAVE_TRACING
-  TRACE_msg_process_kill(p);
-#endif
-  MSG_process_kill(p);
-}
-
 /** \ingroup m_process_management
  * \param process poor victim
  *
@@ -213,10 +203,6 @@ void MSG_process_kill_from_SIMIX(smx_process_t p)
  */
 void MSG_process_kill(m_process_t process)
 {
-#ifdef HAVE_TRACING
-  TRACE_msg_process_kill(process);
-#endif
-
 //  /* FIXME: why do we only cancel communication actions? is this useful? */
 //  simdata_process_t p_simdata = simcall_process_get_data(process);
 //  if (p_simdata->waiting_task && p_simdata->waiting_task->simdata->comm) {
@@ -258,10 +244,7 @@ void* MSG_process_get_data(m_process_t process)
 
   /* get from SIMIX the MSG process data, and then the user data */
   simdata_process_t simdata = simcall_process_get_data(process);
-  if (!simdata->data) {
-       return NULL;
-  }
-  return ((msg_process_data_t)simdata->data)->data;
+  return simdata->data;
 }
 
 /** \ingroup m_process_management
@@ -275,10 +258,8 @@ MSG_error_t MSG_process_set_data(m_process_t process, void *data)
   xbt_assert(process != NULL, "Invalid parameter");
 
   simdata_process_t simdata = simcall_process_get_data(process);
-  if (!simdata->data) {
-       simdata->data = xbt_new0(s_msg_process_data_t, 1);
-  }
-       ((msg_process_data_t)simdata->data)->data = data;
+  simdata->data = data;
+
   return MSG_OK;
 }
 
@@ -321,7 +302,7 @@ m_host_t MSG_process_get_host(m_process_t process)
  */
 m_process_t MSG_process_from_PID(int PID)
 {
-       return SIMIX_process_from_PID(PID);
+  return SIMIX_process_from_PID(PID);
 }
 
 /** @brief returns a list of all currently existing processes */
@@ -497,3 +478,12 @@ int MSG_process_is_suspended(m_process_t process)
 smx_context_t MSG_process_get_smx_ctx(m_process_t process) {
   return SIMIX_process_get_context(process);
 }
+/**
+ * \ingroup m_process_management
+ * \brief Add a function to the list of "on_exit" functions for the current process.
+ * The on_exit functions are the functions executed when your process is killed.
+ * You should use them to free the data used by your process.
+ */
+void MSG_process_on_exit(int_f_pvoid_t fun, void *data) {
+  SIMIX_process_on_exit(fun,data);
+}