[simix] Remove SIMIX_process_create_from_wrapper()

[simgrid.git] / src / surf / sg_platf.cpp

diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index 1f6a856..bd51662 100644 (file)
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@ -543,8 +543,6 @@ void sg_platf_new_bypassRoute(sg_platf_route_cbarg_t bypassRoute)
 
 void sg_platf_new_process(sg_platf_process_cbarg_t process)
 {
-  xbt_assert(simix_global,"Cannot create process without SIMIX.");
-
   sg_host_t host = sg_host_by_name(process->host);
   if (!host) {
     // The requested host does not exist. Do a nice message to the user
@@ -577,7 +575,7 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process)
   smx_process_arg_t arg = NULL;
   smx_process_t process_created = NULL;
 
-  arg = xbt_new0(s_smx_process_arg_t, 1);
+  arg = new s_smx_process_arg_t();
   arg->code = parse_code;
   arg->data = NULL;
   arg->hostname = sg_host_get_name(host);
@@ -589,13 +587,13 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process)
   arg->name = xbt_strdup(arg->argv[0]);
   arg->kill_time = kill_time;
   arg->properties = current_property_set;
-  if (!sg_host_simix(host)->boot_processes) {
+  if (!sg_host_simix(host)->boot_processes)
     sg_host_simix(host)->boot_processes = xbt_dynar_new(sizeof(smx_process_arg_t), _SIMIX_host_free_process_arg);
-  }
+
   xbt_dynar_push_as(sg_host_simix(host)->boot_processes,smx_process_arg_t,arg);
 
   if (start_time > SIMIX_get_clock()) {
-    arg = xbt_new0(s_smx_process_arg_t, 1);
+    arg = new s_smx_process_arg_t();
     arg->name = (char*)(process->argv)[0];
     arg->code = parse_code;
     arg->data = NULL;
@@ -605,10 +603,21 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process)
     arg->kill_time = kill_time;
     arg->properties = current_property_set;
 
-    XBT_DEBUG("Process %s(%s) will be started at time %f", arg->name,
-           arg->hostname, start_time);
-    SIMIX_timer_set(start_time, [](void* arg) {
-      SIMIX_process_create_from_wrapper((smx_process_arg_t) arg);
+    XBT_DEBUG("Process %s(%s) will be started at time %f", arg->name, arg->hostname, start_time);
+    SIMIX_timer_set(start_time, [](void* p) {
+      smx_process_arg_t arg = static_cast<smx_process_arg_t>(p);
+      simix_global->create_process_function(
+                                            arg->name,
+                                            arg->code,
+                                            arg->data,
+                                            arg->hostname,
+                                            arg->kill_time,
+                                            arg->argc,
+                                            arg->argv,
+                                            arg->properties,
+                                            arg->auto_restart,
+                                            NULL);
+      delete arg;
     }, arg);
   } else {                      // start_time <= SIMIX_get_clock()
     XBT_DEBUG("Starting Process %s(%s) right now", arg->name, sg_host_get_name(host));
@@ -794,8 +803,7 @@ static void surf_config_models_setup()
  * Once this function was called, the configuration concerning the used
  * models cannot be changed anymore.
  *
- * @param AS_id name of this autonomous system. Must be unique in the platform
- * @param wanted_routing_type one of Full, Floyd, Dijkstra or similar. Full list in the variable routing_models, in src/surf/surf_routing.c
+ * @param AS the parameters defining the AS to build.
  */
 simgrid::s4u::As * sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS)
 {