[simix] Encapsulate main function, argc and argv in a closure

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

diff --git a/src/msg/msg_process.c b/src/msg/msg_process.c
index bad98f6..dd02f54 100644 (file)
--- a/src/msg/msg_process.c
+++ b/src/msg/msg_process.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2014. The SimGrid Team.
+/* Copyright (c) 2004-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -7,7 +7,7 @@
 #include "msg_private.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
-#include "simix/smx_process_private.h"
+#include "src/simix/smx_process_private.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_process, msg,
                                 "Logging specific to MSG (process)");
@@ -15,11 +15,9 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_process, msg,
 /** @addtogroup m_process_management
  * \htmlonly <!-- DOXYGEN_NAVBAR_LABEL="Processes" --> \endhtmlonly
  *
- *  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 msg_process_t
+ *  Processes (#msg_process_t) are independent agents that can do stuff on their own. They are in charge of executing your code interacting with the simulated world.
+ *  A process may be defined as a <em>code</em> with some <em>private data</em>.
+ *  Processes must be located on <em>hosts</em> (#msg_host_t), and they exchange data by sending tasks (#msg_task_t) that are similar to envelops containing data.
  */
 
 /******************************** Process ************************************/
@@ -55,14 +53,14 @@ void MSG_process_cleanup_from_SIMIX(smx_process_t smx_proc)
 }
 
 /* This function creates a MSG process. It has the prototype enforced by SIMIX_function_register_process_create */
-void MSG_process_create_from_SIMIX(smx_process_t* process, const char *name,
+smx_process_t MSG_process_create_from_SIMIX(const char *name,
                                    xbt_main_func_t code, void *data,
                                    const char *hostname, double kill_time,
                                    int argc, char **argv,
                                    xbt_dict_t properties, int auto_restart,
                                    smx_process_t parent_process)
 {
-  msg_host_t host = MSG_get_host_by_name(hostname);
+  msg_host_t host = MSG_host_by_name(hostname);
   msg_process_t p = MSG_process_create_with_environment(name, code, data,
                                                       host, argc, argv,
                                                       properties);
@@ -70,7 +68,7 @@ void MSG_process_create_from_SIMIX(smx_process_t* process, const char *name,
     MSG_process_set_kill_time(p,kill_time);
     MSG_process_auto_restart_set(p,auto_restart);
   }
-  *((msg_process_t*) process) = p;
+  return p;
 }
 
 /** \ingroup m_process_management
@@ -84,7 +82,7 @@ msg_process_t MSG_process_create(const char *name,
                                xbt_main_func_t code, void *data,
                                msg_host_t host)
 {
-  return MSG_process_create_with_environment(name, code, data, host, -1,
+  return MSG_process_create_with_environment(name, code, data, host, 0,
                                              NULL, NULL);
 }
 
@@ -166,14 +164,12 @@ msg_process_t MSG_process_create_with_environment(const char *name,
   simdata->data = data;
   simdata->last_errno = MSG_OK;
 
-  int future_simix_process_pid = SIMIX_process_get_maxpid();
-  TRACE_msg_process_create(name, future_simix_process_pid, host);
-
   /* 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, sg_host_name(host), -1,
+ process = simcall_process_create(name, code, simdata, sg_host_get_name(host), -1,
                            argc, argv, properties,0);
-  xbt_assert(future_simix_process_pid == SIMIX_process_get_PID(process));
+
+  TRACE_msg_process_create(name, SIMIX_process_get_PID(process), host);
 
   if (!process) {
     /* Undo everything we have just changed */
@@ -227,7 +223,7 @@ msg_error_t MSG_process_migrate(msg_process_t process, msg_host_t host)
   simdata->m_host = host;
   msg_host_t now = simdata->m_host;
   TRACE_msg_process_change_host(process, now, host);
-  simcall_process_change_host(process, host);
+  simcall_process_set_host(process, host);
   return MSG_OK;
 }
 
@@ -243,7 +239,10 @@ void* MSG_process_get_data(msg_process_t process)
 
   /* get from SIMIX the MSG process data, and then the user data */
   simdata_process_t simdata = simcall_process_get_data(process);
-  return simdata->data;
+  if (simdata)
+    return simdata->data;
+  else
+    return NULL;
 }
 
 /** \ingroup m_process_management