X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/504b4d20dd2db9ea1eaa9c4b390b2a412d7c9779..798f93fb78cd01e4a0bc50b22bf09abd58f48992:/src/msg/m_process.c

diff --git a/src/msg/m_process.c b/src/msg/m_process.c
index 6bd53d04ff..d36c64ab44 100644
--- a/src/msg/m_process.c
+++ b/src/msg/m_process.c
@@ -29,21 +29,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_process, msg,
  */
 
 /******************************** 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, \a start_time, \a kill_time).
- * \sa MSG_process_create_with_arguments
- */
-m_process_t MSG_process_create(const char *name,
-			       xbt_main_func_t code, void *data,
-			       m_host_t host)
-{
-  return MSG_process_create_with_arguments(name, code, data, host, -1,
-					   NULL);
-}
-
 void __MSG_process_cleanup(void *arg)
 {
   /* arg is a pointer to a simix process, we can get the msg process with the field data */
@@ -59,26 +44,30 @@ void __MSG_process_cleanup(void *arg)
   return;
 }
 
-/* This function creates a MSG process. It has the prototype by SIMIX_function_register_process_create */
+/* This function creates a MSG process. It has the prototype enforced by SIMIX_function_register_process_create */
 void *_MSG_process_create_from_SIMIX(const char *name,
-				     xbt_main_func_t code, void *data,
-				     char *hostname, int argc, char **argv)
-{
-  m_host_t host = MSG_get_host_by_name(hostname);
-  return (void *) MSG_process_create_with_arguments(name, code, data, host,
-						    argc, argv);
-}
-
-/* This function creates a MSG process with properties. It has the prototype by SIMIX_function_register_process_create */
-void *_MSG_process_create_with_env_from_SIMIX(const char *name,
 				     xbt_main_func_t code, void *data,
 				     char *hostname, int argc, char **argv, xbt_dict_t properties)
 {
   m_host_t host = MSG_get_host_by_name(hostname);
   return (void *) MSG_process_create_with_environment(name, code, data, host,
-						    argc, argv,properties);
+						      argc, argv,properties);
 }
 
+/** \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, \a start_time, \a kill_time).
+ * \sa MSG_process_create_with_arguments
+ */
+m_process_t MSG_process_create(const char *name,
+			       xbt_main_func_t code, void *data,
+			       m_host_t host)
+{
+  return MSG_process_create_with_environment(name, code, data, host, -1,
+					     NULL,NULL);
+}
 
 /** \ingroup m_process_management
  * \brief Creates and runs a new #m_process_t.
@@ -110,36 +99,8 @@ m_process_t MSG_process_create_with_arguments(const char *name,
 					      void *data, m_host_t host,
 					      int argc, char **argv)
 {
-  simdata_process_t simdata = xbt_new0(s_simdata_process_t, 1);
-  m_process_t process = xbt_new0(s_m_process_t, 1);
-  xbt_assert0(((code != NULL) && (host != NULL)), "Invalid parameters");
-
-  /* Simulator Data */
-  simdata->PID = msg_global->PID++;
-  simdata->waiting_task = NULL;
-  simdata->m_host = host;
-  simdata->argc = argc;
-  simdata->argv = argv;
-  simdata->s_process = SIMIX_process_create(name, code,
-					    (void *) process, host->name,
-					    argc, argv, NULL);
-
-  if (SIMIX_process_self()) {
-    simdata->PPID = MSG_process_get_PID(SIMIX_process_self()->data);
-  } else {
-    simdata->PPID = -1;
-  }
-  simdata->last_errno = MSG_OK;
-
-
-  /* Process structure */
-  process->name = xbt_strdup(name);
-  process->simdata = simdata;
-  process->data = data ;
-
-  xbt_fifo_unshift(msg_global->process_list, process);
-
-  return process;
+  return MSG_process_create_with_environment(name, code, data, host, 
+					     argc,argv,NULL);
 }
 
 /** \ingroup m_process_management
@@ -197,7 +158,7 @@ m_process_t MSG_process_create_with_environment(const char *name,
   /* Process structure */
   process->name = xbt_strdup(name);
   process->simdata = simdata;
-  process->data = data ;
+  process->data = data;
 
   xbt_fifo_unshift(msg_global->process_list, process);
 
@@ -360,13 +321,13 @@ const char *MSG_process_get_name(m_process_t process)
 }
 
 /** \ingroup m_process_management
- * \brief Returns the value of a certain process property
+ * \brief Returns the value of a given process property
  *
  * \param process a process
  * \param name a property name
- * \return value of a property
+ * \return value of a property (or NULL if the property is not set)
  */
-const char* MSG_process_get_property_value(m_process_t process, char* name)
+const char* MSG_process_get_property_value(m_process_t process, const char* name)
 {
   return xbt_dict_get_or_null(MSG_process_get_properties(process), name);
 }