start snake_casing s4u::Engine

[simgrid.git] / src / simix / smx_deployment.cpp

diff --git a/src/simix/smx_deployment.cpp b/src/simix/smx_deployment.cpp
index 18bf778..8e11f4a 100644 (file)
--- 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. */
@@ -117,36 +117,36 @@ simgrid::simix::ActorCodeFactory& SIMIX_get_actor_code_factory(const char *name)
 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;
+  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 = process_host;
-  process.args.push_back(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.args.push_back(arg);
+    actor.args.push_back(arg);
   }
 
   // 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);
 }