Python: Add Comm.wait_any

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

diff --git a/src/simix/smx_deployment.cpp b/src/simix/smx_deployment.cpp
index 79045d9..f79f6c3 100644 (file)
--- a/src/simix/smx_deployment.cpp
+++ b/src/simix/smx_deployment.cpp
@@ -1,13 +1,13 @@
-/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2019. 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. */
 
+#include "simgrid/Exception.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "smx_private.hpp"
 #include "src/surf/xml/platf_private.hpp" // FIXME: KILLME. There must be a better way than mimicking XML here
 #include <simgrid/engine.h>
-#include <xbt/ex.hpp>
 
 #include <string>
 #include <vector>
@@ -36,7 +36,7 @@ void SIMIX_init_application()
  *     @include small_deployment.xml
  *
  */
-void SIMIX_launch_application(std::string file)
+void SIMIX_launch_application(const std::string& file)
 {
   XBT_ATTRIB_UNUSED int parse_status;
   xbt_assert(simix_global, "SIMIX_global_init has to be called before SIMIX_launch_application.");
@@ -69,7 +69,7 @@ static simgrid::simix::ActorCodeFactory toActorCodeFactory(xbt_main_func_t code)
 }
 static simgrid::simix::ActorCodeFactory toActorCodeFactory(void (*code)(std::vector<std::string>))
 {
-  return [code](std::vector<std::string> args) { return simgrid::xbt::wrap_main(code, std::move(args)); };
+  return [code](std::vector<std::string> args) { return std::bind(std::move(code), std::move(args)); };
 }
 
 /**
@@ -80,11 +80,11 @@ static simgrid::simix::ActorCodeFactory toActorCodeFactory(void (*code)(std::vec
  * @param name the reference name of the function.
  * @param code the function
  */
-void SIMIX_function_register(std::string name, xbt_main_func_t code)
+void SIMIX_function_register(const std::string& name, xbt_main_func_t code)
 {
   simix_global->registered_functions[name] = toActorCodeFactory(code);
 }
-void SIMIX_function_register(std::string name, void (*code)(std::vector<std::string>))
+void SIMIX_function_register(const std::string& name, void (*code)(std::vector<std::string>))
 {
   simix_global->registered_functions[name] = toActorCodeFactory(code);
 }
@@ -115,7 +115,7 @@ void SIMIX_function_register_default(xbt_main_func_t code)
  * @param name the reference name of the function.
  * @return The #smx_actor_t or nullptr.
  */
-simgrid::simix::ActorCodeFactory& SIMIX_get_actor_code_factory(std::string name)
+simgrid::simix::ActorCodeFactory& SIMIX_get_actor_code_factory(const std::string& name)
 {
   xbt_assert(simix_global,
               "SIMIX_global_init has to be called before SIMIX_get_actor_code_factory.");
@@ -161,9 +161,9 @@ void SIMIX_process_set_function(const char* process_host, const char* process_fu
 namespace simgrid {
 namespace simix {
 
-void register_function(std::string name, ActorCodeFactory factory)
+void register_function(const std::string& name, const ActorCodeFactory& factory)
 {
-  simix_global->registered_functions[name] = std::move(factory);
+  simix_global->registered_functions[name] = factory;
 }
 
 }