moving include/surf to src/include/surf (continued)

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

diff --git a/src/msg/m_process.c b/src/msg/m_process.c
index fc9d302..2062073 100644 (file)
--- a/src/msg/m_process.c
+++ b/src/msg/m_process.c
@@ -12,6 +12,30 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(m_process, msg,
                                "Logging specific to MSG (process)");
 
 /******************************** 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).
+ * \sa MSG_process_create_with_arguments
+ */
+m_process_t MSG_process_create(const char *name,
+                              m_process_code_t code, void *data,
+                              m_host_t host)
+{
+  return MSG_process_create_with_arguments(name, code, data, host, -1, NULL);
+}
+
+static void MSG_process_cleanup(void *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);
+}
+
 /** \ingroup m_process_management
  * \brief Creates and runs a new #m_process_t.
 
@@ -31,27 +55,11 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(m_process, msg,
    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.
+ * \param argc first argument passed to \a code
+ * \param argv second argument passed to \a code
  * \see m_process_t
  * \return The new corresponding object.
  */
-m_process_t MSG_process_create(const char *name,
-                              m_process_code_t code, void *data,
-                              m_host_t host)
-{
-  return MSG_process_create_with_arguments(name, code, data, host, -1, NULL);
-}
-
-static void MSG_process_cleanup(void *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);
-}
-
-
 m_process_t MSG_process_create_with_arguments(const char *name,
                                              m_process_code_t code, void *data,
                                              m_host_t host, int argc, char **argv)
@@ -99,6 +107,18 @@ m_process_t MSG_process_create_with_arguments(const char *name,
   return process;
 }
 
+/** \ingroup m_process_management
+ * \param process poor victim
+ *
+ * This function simply kills a \a process... scarry isn't it ? :)
+ */
+void MSG_process_kill(m_process_t process)
+{
+  xbt_fifo_remove(msg_global->process_list,process);
+  xbt_context_free(process->simdata->context);
+  MSG_process_cleanup(process);
+}
+
 /** \ingroup m_process_management
  * \brief Migrates an agent to another location.
  *
@@ -197,7 +217,6 @@ int MSG_process_get_PID(m_process_t process)
   return (((simdata_process_t) process->simdata)->PID);
 }
 
-
 /** \ingroup m_process_management
  * \brief Returns the process ID of the parent of \a process.
  *
@@ -285,9 +304,9 @@ MSG_error_t MSG_process_suspend(m_process_t process)
                "Got a problem in deciding which action to choose !");
     simdata->suspended = 1;
     if(simdata_task->compute) 
-      surf_workstation_resource->extension_public->suspend(simdata_task->compute);
+      surf_workstation_resource->common_public->suspend(simdata_task->compute);
     else
-      surf_workstation_resource->extension_public->suspend(simdata_task->comm);
+      surf_workstation_resource->common_public->suspend(simdata_task->comm);
   } else {
     m_task_t dummy = MSG_TASK_UNINITIALIZED;
     dummy = MSG_task_create("suspended", 0.0, 0, NULL);
@@ -295,7 +314,7 @@ MSG_error_t MSG_process_suspend(m_process_t process)
     simdata = process->simdata;
     simdata->suspended = 1;
     __MSG_task_execute(process,dummy);
-    surf_workstation_resource->extension_public->suspend(dummy->simdata->compute);
+    surf_workstation_resource->common_public->suspend(dummy->simdata->compute);
     __MSG_wait_for_computation(process,dummy);
     simdata->suspended = 0;
 
@@ -334,9 +353,9 @@ MSG_error_t MSG_process_resume(m_process_t process)
 
 
   if(simdata_task->compute) 
-    surf_workstation_resource->extension_public->resume(simdata_task->compute);
+    surf_workstation_resource->common_public->resume(simdata_task->compute);
   else 
-    surf_workstation_resource->extension_public->resume(simdata_task->comm);
+    surf_workstation_resource->common_public->resume(simdata_task->comm);
 
   MSG_RETURN(MSG_OK);
 }
@@ -354,10 +373,6 @@ int MSG_process_isSuspended(m_process_t process)
   return (process->simdata->suspended);
 }
 
-
-
-
-
 MSG_error_t __MSG_process_block(void)
 {
   m_process_t process = MSG_process_self();
@@ -367,7 +382,7 @@ MSG_error_t __MSG_process_block(void)
   
   process->simdata->blocked=1;
   __MSG_task_execute(process,dummy);
-  surf_workstation_resource->extension_public->suspend(dummy->simdata->compute);
+  surf_workstation_resource->common_public->suspend(dummy->simdata->compute);
   __MSG_wait_for_computation(process,dummy);
   process->simdata->blocked=0;
 
@@ -397,7 +412,7 @@ MSG_error_t __MSG_process_unblock(m_process_t process)
 
   xbt_assert0(simdata->blocked,"Process not blocked");
 
-  surf_workstation_resource->extension_public->resume(simdata_task->compute);
+  surf_workstation_resource->common_public->resume(simdata_task->compute);
 
   MSG_RETURN(MSG_OK);
 }