X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f9436b840852218b39dce22d6057b6f223168daa..8c416e92254512408c1d0ce729e8d3cf82ec9938:/src/simix/smx_deployment.cpp

diff --git a/src/simix/smx_deployment.cpp b/src/simix/smx_deployment.cpp
index 946f64ba2f..8e11f4aad8 100644
--- a/src/simix/smx_deployment.cpp
+++ b/src/simix/smx_deployment.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -7,7 +7,7 @@
 #include <vector>
 
 #include "simgrid/s4u/Host.hpp"
-#include "smx_private.h"
+#include "smx_private.hpp"
 #include "src/surf/xml/platf_private.hpp" // FIXME: KILLME. There must be a better way than mimicking XML here
 #include <xbt/ex.hpp>
 
@@ -114,47 +114,39 @@ simgrid::simix::ActorCodeFactory& SIMIX_get_actor_code_factory(const char *name)
  * \brief Bypass the parser, get arguments, and set function to each process
  */
 
-void SIMIX_process_set_function(const char *process_host,
-                                const char *process_function,
-                                xbt_dynar_t arguments,
-                                double process_start_time,
-                                double process_kill_time)
+void SIMIX_process_set_function(const char* process_host, const char* process_function, xbt_dynar_t arguments,
+                                double process_start_time, double process_kill_time)
 {
-  s_sg_platf_process_cbarg_t process;
-  memset(&process,0,sizeof(process));
+  simgrid::kernel::routing::ActorCreationArgs actor;
 
   sg_host_t host = sg_host_by_name(process_host);
   if (not host)
     THROWF(arg_error, 0, "Host '%s' unknown", process_host);
-  process.host = host->cname();
-
-  process.argc = 1 + xbt_dynar_length(arguments);
-  process.argv = (const char**)xbt_new(char *, process.argc + 1);
-  process.argv[0] = xbt_strdup(process_function);
+  actor.host = process_host;
+  actor.args.push_back(process_function);
   /* add arguments */
   unsigned int i;
   char *arg;
   xbt_dynar_foreach(arguments, i, arg) {
-    process.argv[i + 1] = xbt_strdup(arg);
+    actor.args.push_back(arg);
   }
-  process.argv[process.argc] = nullptr;
 
   // Check we know how to handle this function name:
   simgrid::simix::ActorCodeFactory& parse_code = SIMIX_get_actor_code_factory(process_function);
   xbt_assert(parse_code, "Function '%s' unknown", process_function);
 
-  process.function = process_function;
-  process.host = process_host;
-  process.kill_time = process_kill_time;
-  process.start_time = process_start_time;
-  process.on_failure = SURF_ACTOR_ON_FAILURE_DIE;
-  sg_platf_new_process(&process);
+  actor.function   = process_function;
+  actor.host       = process_host;
+  actor.kill_time  = process_kill_time;
+  actor.start_time = process_start_time;
+  actor.on_failure = simgrid::kernel::routing::ActorOnFailure::DIE;
+  sg_platf_new_actor(&actor);
 }
 
 namespace simgrid {
 namespace simix {
 
-void registerFunction(const char* name, ActorCodeFactory factory)
+void register_function(const char* name, ActorCodeFactory factory)
 {
   simix_global->registered_functions[name] = std::move(factory);
 }