X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0d5351be580847fc5bed5dac18aaa391871ec725..d1f1e22acb2e2342b535c3847e804b4a5fee3167:/src/surf/sg_platf.cpp

diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index 112e18527a..43f06efb85 100644
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@ -9,6 +9,7 @@
 #include "xbt/str.h"
 #include "xbt/dict.h"
 #include "xbt/RngStream.h"
+#include <xbt/functional.hpp>
 #include <xbt/signal.hpp>
 #include "src/surf/HostImpl.hpp"
 #include "surf/surf.h"
@@ -158,6 +159,7 @@ void sg_platf_new_host(sg_platf_host_cbarg_t host)
     char *key,*data;
     xbt_dict_foreach(host->properties,cursor,key,data)
       h->setProperty(key,data);
+    xbt_dict_free(&host->properties);
   }
 
   if (host->pstate != 0)
@@ -353,6 +355,7 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster)
     xbt_free(host_id);
     rankId++;
   }
+  delete radicals;
 
   // Add a router. It is magically used thanks to the way in which surf_routing_cluster is written,
   // and it's very useful to connect clusters together
@@ -541,8 +544,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
@@ -572,59 +573,60 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process)
   double kill_time  = process->kill_time;
   int auto_restart = process->on_failure == SURF_PROCESS_ON_FAILURE_DIE ? 0 : 1;
 
+  std::function<void()> code = simgrid::xbt::wrapMain(parse_code, process->argc, process->argv);
+
   smx_process_arg_t arg = NULL;
   smx_process_t process_created = NULL;
 
-  arg = xbt_new0(s_smx_process_arg_t, 1);
-  arg->code = parse_code;
+  arg = new simgrid::simix::ProcessArg();
+  arg->name = std::string(process->argv[0]);
+  arg->code = code;
   arg->data = NULL;
   arg->hostname = sg_host_get_name(host);
-  arg->argc = process->argc;
-  arg->argv = xbt_new(char *,process->argc);
-  int i;
-  for (i=0; i<process->argc; i++)
-    arg->argv[i] = xbt_strdup(process->argv[i]);
-  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->name = (char*)(process->argv)[0];
-    arg->code = parse_code;
+
+    arg = new simgrid::simix::ProcessArg();
+    arg->name = std::string(process->argv[0]);
+    arg->code = std::move(code);
     arg->data = NULL;
     arg->hostname = sg_host_get_name(host);
-    arg->argc = process->argc;
-    arg->argv = (char**)(process->argv);
     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);
-    }, arg);
+    XBT_DEBUG("Process %s(%s) will be started at time %f",
+      arg->name.c_str(), arg->hostname, start_time);
+    SIMIX_timer_set(start_time, [=]() {
+      simix_global->create_process_function(
+                                            arg->name.c_str(),
+                                            std::move(arg->code),
+                                            arg->data,
+                                            arg->hostname,
+                                            arg->kill_time,
+                                            arg->properties,
+                                            arg->auto_restart,
+                                            NULL);
+      delete arg;
+    });
   } else {                      // start_time <= SIMIX_get_clock()
-    XBT_DEBUG("Starting Process %s(%s) right now", arg->name, sg_host_get_name(host));
+    XBT_DEBUG("Starting Process %s(%s) right now",
+      arg->name.c_str(), sg_host_get_name(host));
 
     if (simix_global->create_process_function)
       process_created = simix_global->create_process_function(
-          arg->name,
-                                            parse_code,
-                                            NULL,
-                                            sg_host_get_name(host),
-                                            kill_time,
-                                            process->argc,
-                                            (char**)(process->argv),
-                                            current_property_set,
-                                            auto_restart, NULL);
+          arg->name.c_str(), std::move(code), NULL,
+          sg_host_get_name(host), kill_time,
+          current_property_set, auto_restart, NULL);
     else
-      process_created = simcall_process_create(arg->name, parse_code, NULL, sg_host_get_name(host), kill_time, process->argc,
-          (char**)process->argv, current_property_set,auto_restart);
+      process_created = simcall_process_create(
+          arg->name.c_str(), std::move(code), NULL, sg_host_get_name(host), kill_time,
+          current_property_set,auto_restart);
 
     /* verify if process has been created (won't be the case if the host is currently dead, but that's fine) */
     if (!process_created) {
@@ -792,8 +794,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)
 {