X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/138e6f86566611611b1115c957cae0a1c6a85a4b..f06cff482686f7949ed7ea981cbceac138ce15c1:/src/simix/smx_deployment.cpp

diff --git a/src/simix/smx_deployment.cpp b/src/simix/smx_deployment.cpp
index 44ccbb8956..b34c5bb805 100644
--- a/src/simix/smx_deployment.cpp
+++ b/src/simix/smx_deployment.cpp
@@ -1,21 +1,24 @@
-/* Copyright (c) 2007, 2009-2015. The SimGrid Team.
+/* Copyright (c) 2007, 2009-2016. 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 <string>
+#include <vector>
+
 #include "smx_private.h"
+#include <xbt/ex.hpp>
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 #include "xbt/dict.h"
 #include "src/surf/xml/platf_private.hpp" // FIXME: KILLME. There must be a better way than mimicking XML here
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_deployment, simix,
-                                "Logging specific to SIMIX (deployment)");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_deployment, simix, "Logging specific to SIMIX (deployment)");
 
 extern int surf_parse_lineno;
 
-void SIMIX_init_application(void)
+void SIMIX_init_application()
 {
   sg_platf_exit();
   sg_platf_init();
@@ -38,8 +41,7 @@ void SIMIX_init_application(void)
 void SIMIX_launch_application(const char *file)
 {
   XBT_ATTRIB_UNUSED int parse_status;
-  xbt_assert(simix_global,
-              "SIMIX_global_init has to be called before SIMIX_launch_application.");
+  xbt_assert(simix_global, "SIMIX_global_init has to be called before SIMIX_launch_application.");
 
   SIMIX_init_application();
 
@@ -56,6 +58,14 @@ void SIMIX_launch_application(const char *file)
   }
 }
 
+// Wrap a main() function into a ActorCodeFactory:
+static simgrid::simix::ActorCodeFactory toActorCodeFactory(xbt_main_func_t code)
+{
+  return [code](std::vector<std::string> args) {
+    return simgrid::xbt::wrapMain(code, std::move(args));
+  };
+}
+
 /**
  * \brief Registers a #xbt_main_func_t code in a global table.
  *
@@ -66,11 +76,11 @@ void SIMIX_launch_application(const char *file)
  */
 void SIMIX_function_register(const char *name, xbt_main_func_t code)
 {
-  xbt_assert(simix_global, "SIMIX_global_init has to be called before SIMIX_function_register.");
-  xbt_dict_set(simix_global->registered_functions, name, (void*) code, nullptr);
+  xbt_assert(simix_global,
+    "SIMIX_global_init has to be called before SIMIX_function_register.");
+  simix_global->registered_functions[name] = toActorCodeFactory(code);
 }
 
-static xbt_main_func_t default_function = nullptr;
 /**
  * \brief Registers a #xbt_main_func_t code as default value.
  *
@@ -80,29 +90,29 @@ static xbt_main_func_t default_function = nullptr;
 void SIMIX_function_register_default(xbt_main_func_t code)
 {
   xbt_assert(simix_global, "SIMIX_global_init has to be called before SIMIX_function_register.");
-
-  default_function = code;
+  simix_global->default_function = toActorCodeFactory(code);
 }
 
 /**
- * \brief Gets a #smx_process_t code from the global table.
+ * \brief Gets a #smx_actor_t code from the global table.
  *
  * Gets a code function from the global table. Returns nullptr if there are no function registered with the name.
  * This table is then used by #SIMIX_launch_application.
  * \param name the reference name of the function.
- * \return The #smx_process_t or nullptr.
+ * \return The #smx_actor_t or nullptr.
  */
-xbt_main_func_t SIMIX_get_registered_function(const char *name)
+simgrid::simix::ActorCodeFactory& SIMIX_get_actor_code_factory(const char *name)
 {
-  xbt_main_func_t res = nullptr;
   xbt_assert(simix_global,
-              "SIMIX_global_init has to be called before SIMIX_get_registered_function.");
+              "SIMIX_global_init has to be called before SIMIX_get_actor_code_factory.");
 
-  res = (xbt_main_func_t)xbt_dict_get_or_null(simix_global->registered_functions, name);
-  return res ? res : default_function;
+  auto i = simix_global->registered_functions.find(name);
+  if (i == simix_global->registered_functions.end())
+    return simix_global->default_function;
+  else
+    return i->second;
 }
 
-
 /**
  * \brief Bypass the parser, get arguments, and set function to each process
  */
@@ -132,14 +142,25 @@ void SIMIX_process_set_function(const char *process_host,
   }
   process.argv[process.argc] = nullptr;
 
-  xbt_main_func_t parse_code = SIMIX_get_registered_function(process_function);
+  // 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.function = process_function;
   process.host = process_host;
   process.kill_time = process_kill_time;
   process.start_time = process_start_time;
   process.on_failure = SURF_PROCESS_ON_FAILURE_DIE;
-
   sg_platf_new_process(&process);
 }
+
+namespace simgrid {
+namespace simix {
+
+void registerFunction(const char* name, ActorCodeFactory factory)
+{
+  simix_global->registered_functions[name] = std::move(factory);
+}
+
+}
+}