please sonar

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

diff --git a/src/simix/smx_deployment.cpp b/src/simix/smx_deployment.cpp
index 4edcc9d..6fad27e 100644 (file)
--- a/src/simix/smx_deployment.cpp
+++ b/src/simix/smx_deployment.cpp
@@ -1,21 +1,21 @@
-/* Copyright (c) 2007, 2009-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2007-2017. 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. */
 
 
 /* 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 "simgrid/s4u/Host.hpp"

 #include "smx_private.h"
 #include "smx_private.h"

-#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
 #include "src/surf/xml/platf_private.hpp" // FIXME: KILLME. There must be a better way than mimicking XML here

+#include <xbt/ex.hpp>

 
 

-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;
 
 
 extern int surf_parse_lineno;
 

-void SIMIX_init_application(void)
+void SIMIX_init_application()

 {
   sg_platf_exit();
   sg_platf_init();
 {
   sg_platf_exit();
   sg_platf_init();


@@ -38,24 +38,31 @@ void SIMIX_init_application(void)
 void SIMIX_launch_application(const char *file)
 {
   XBT_ATTRIB_UNUSED int parse_status;
 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();
 
   surf_parse_open(file);
 
   SIMIX_init_application();
 
   surf_parse_open(file);

-  TRY {
+  try {

     parse_status = surf_parse();
     surf_parse_close();
     parse_status = surf_parse();
     surf_parse_close();

-    xbt_assert(!parse_status, "Parse error at %s:%d", file,surf_parse_lineno);
+    xbt_assert(not parse_status, "Parse error at %s:%d", file, surf_parse_lineno);

   }
   }

-  CATCH_ANONYMOUS {
+  catch (xbt_ex& e) {

     XBT_ERROR("Unrecoverable error at %s:%d. The full exception stack follows, in case it helps you to diagnose the problem.",
         file, surf_parse_lineno);
     XBT_ERROR("Unrecoverable error at %s:%d. The full exception stack follows, in case it helps you to diagnose the problem.",
         file, surf_parse_lineno);

-    RETHROW;
+    throw;

   }
 }
 
   }
 }
 

+// 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.
  *
 /**
  * \brief Registers a #xbt_main_func_t code in a global table.
  *


@@ -66,11 +73,11 @@ void SIMIX_launch_application(const char *file)
  */
 void SIMIX_function_register(const char *name, xbt_main_func_t code)
 {
  */
 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, NULL);
+  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 = NULL;

 /**
  * \brief Registers a #xbt_main_func_t code as default value.
  *
 /**
  * \brief Registers a #xbt_main_func_t code as default value.
  *


@@ -80,49 +87,46 @@ static xbt_main_func_t default_function = NULL;
 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.");
 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 NULL if there are no function registered with the name.
+ * 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.
  * This table is then used by #SIMIX_launch_application.
  * \param name the reference name of the function.

- * \return The #smx_process_t or NULL.
+ * \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 = NULL;

   xbt_assert(simix_global,
   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
  */
 
 /**
  * \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));
 
   sg_host_t host = sg_host_by_name(process_host);
 {
   s_sg_platf_process_cbarg_t process;
   memset(&process,0,sizeof(process));
 
   sg_host_t host = sg_host_by_name(process_host);

-  if (!host)
+  if (not host)

     THROWF(arg_error, 0, "Host '%s' unknown", process_host);
     THROWF(arg_error, 0, "Host '%s' unknown", process_host);

-  process.host = sg_host_get_name(host);
+  process.host = process_host;

 
   process.argc = 1 + xbt_dynar_length(arguments);
 
   process.argc = 1 + xbt_dynar_length(arguments);

-  process.argv = (const char**)xbt_new(char *, process.argc + 1);
+  process.argv    = static_cast<const char**>(xbt_new(const char*, process.argc + 1));

   process.argv[0] = xbt_strdup(process_function);
   /* add arguments */
   unsigned int i;
   process.argv[0] = xbt_strdup(process_function);
   /* add arguments */
   unsigned int i;


@@ -130,16 +134,27 @@ void SIMIX_process_set_function(const char *process_host,
   xbt_dynar_foreach(arguments, i, arg) {
     process.argv[i + 1] = xbt_strdup(arg);
   }
   xbt_dynar_foreach(arguments, i, arg) {
     process.argv[i + 1] = xbt_strdup(arg);
   }

-  process.argv[process.argc] = NULL;
+  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);
   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.host = process_host;
   process.kill_time = process_kill_time;
   process.start_time = process_start_time;

-  process.on_failure = SURF_PROCESS_ON_FAILURE_DIE;
-
+  process.on_failure = SURF_ACTOR_ON_FAILURE_DIE;

   sg_platf_new_process(&process);
 }
   sg_platf_new_process(&process);
 }

+
+namespace simgrid {
+namespace simix {
+
+void registerFunction(const char* name, ActorCodeFactory factory)
+{
+  simix_global->registered_functions[name] = std::move(factory);
+}
+
+}
+}