X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7f4f03348bd07609e258eb3b545bdafc2c881847..da569645922cef374b902492c56c214e39455512:/src/simix/smx_deployment.cpp?ds=sidebyside diff --git a/src/simix/smx_deployment.cpp b/src/simix/smx_deployment.cpp index 1b7be72fb5..6fad27e09a 100644 --- a/src/simix/smx_deployment.cpp +++ b/src/simix/smx_deployment.cpp @@ -1,23 +1,24 @@ -/* 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. */ +#include +#include + +#include "simgrid/s4u/Host.hpp" #include "smx_private.h" -#include "xbt/sysdep.h" -#include "xbt/log.h" -#include "xbt/dict.h" -#include "surf/surfxml_parse.h" +#include "src/surf/xml/platf_private.hpp" // FIXME: KILLME. There must be a better way than mimicking XML here +#include -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() { - surf_parse_reset_callbacks(); + sg_platf_exit(); + sg_platf_init(); } /** @@ -37,93 +38,95 @@ 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(); surf_parse_open(file); - TRY { + try { 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); - RETHROW; + throw; } } +// Wrap a main() function into a ActorCodeFactory: +static simgrid::simix::ActorCodeFactory toActorCodeFactory(xbt_main_func_t code) +{ + return [code](std::vector args) { + return simgrid::xbt::wrapMain(code, std::move(args)); + }; +} + /** - * \brief Registers a #smx_process_code_t code in a global table. + * \brief Registers a #xbt_main_func_t code in a global table. * * Registers a code function in a global table. * This table is then used by #SIMIX_launch_application. * \param name the reference name of the function. * \param code the function */ -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); + "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 #smx_process_code_t code as default value. + * \brief Registers a #xbt_main_func_t code as default value. * * Registers a code function as being the default value. This function will get used by SIMIX_launch_application() when there is no registered function of the requested name in. * \param code the function */ 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; + xbt_assert(simix_global, "SIMIX_global_init has to be called before SIMIX_function_register."); + 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. - * \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, - "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 */ -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 = SG_PLATF_PROCESS_INITIALIZER; + 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); - process.host = sg_host_get_name(host); + process.host = process_host; process.argc = 1 + xbt_dynar_length(arguments); - process.argv = (const char**)xbt_new(char *, process.argc + 1); + process.argv = static_cast(xbt_new(const char*, process.argc + 1)); process.argv[0] = xbt_strdup(process_function); /* add arguments */ unsigned int i; @@ -131,15 +134,27 @@ void SIMIX_process_set_function(const char *process_host, 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); - 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_ACTOR_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); +} + +} +}