X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a73e3b31f63b6da6b5f520f258f96d8aeca337be..c1194401ce4a41ff54a7591f4cf33c9ce2756978:/src/simix/smx_deployment.cpp diff --git a/src/simix/smx_deployment.cpp b/src/simix/smx_deployment.cpp index f380ffe0c9..f79f6c3653 100644 --- a/src/simix/smx_deployment.cpp +++ b/src/simix/smx_deployment.cpp @@ -1,15 +1,16 @@ -/* Copyright (c) 2007-2017. 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 -#include - +#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 +#include + +#include +#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_deployment, simix, "Logging specific to SIMIX (deployment)"); @@ -22,20 +23,20 @@ void SIMIX_init_application() } /** - * \brief An application deployer. + * @brief An application deployer. * - * Creates the process described in \a file. - * \param file a filename of a xml description of the application. This file + * Creates the process described in @a file. + * @param file a filename of a xml description of the application. This file * follows this DTD : * - * \include surfxml.dtd + * @include surfxml.dtd * * Here is a small example of such a platform * - * \include small_deployment.xml + * @include small_deployment.xml * */ -void SIMIX_launch_application(const char *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."); @@ -46,43 +47,59 @@ void SIMIX_launch_application(const char *file) try { parse_status = surf_parse(); surf_parse_close(); - xbt_assert(not parse_status, "Parse error at %s:%d", file, surf_parse_lineno); + xbt_assert(not parse_status, "Parse error at %s:%d", file.c_str(), surf_parse_lineno); } 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.c_str(), surf_parse_lineno); throw; } } +void SIMIX_launch_application(const char* file) // deprecated +{ + simgrid_load_deployment(file); +} + // 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)); - }; + return [code](std::vector args) { return simgrid::xbt::wrap_main(code, std::move(args)); }; +} +static simgrid::simix::ActorCodeFactory toActorCodeFactory(void (*code)(std::vector)) +{ + return [code](std::vector args) { return std::bind(std::move(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. * * 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 + * @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 std::string& name, xbt_main_func_t code) { - xbt_assert(simix_global, - "SIMIX_global_init has to be called before SIMIX_function_register."); simix_global->registered_functions[name] = toActorCodeFactory(code); } +void SIMIX_function_register(const std::string& name, void (*code)(std::vector)) +{ + simix_global->registered_functions[name] = toActorCodeFactory(code); +} + +void SIMIX_function_register(const char* name, xbt_main_func_t code) // deprecated +{ + simgrid_register_function(name, code); +} /** - * \brief Registers a #xbt_main_func_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 + * 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) { @@ -91,14 +108,14 @@ void SIMIX_function_register_default(xbt_main_func_t code) } /** - * \brief Gets a #smx_actor_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_actor_t or nullptr. + * @param name the reference name of the function. + * @return The #smx_actor_t or nullptr. */ -simgrid::simix::ActorCodeFactory& SIMIX_get_actor_code_factory(const char *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."); @@ -110,49 +127,43 @@ simgrid::simix::ActorCodeFactory& SIMIX_get_actor_code_factory(const char *name) 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) { - 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.argc = 1 + xbt_dynar_length(arguments); - process.argv = static_cast(xbt_new(const char*, process.argc + 1)); - process.argv[0] = xbt_strdup(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.argv[i + 1] = xbt_strdup(arg); + actor.args.push_back(arg); } - process.argv[process.argc] = nullptr; // 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 std::string& name, const ActorCodeFactory& factory) { - simix_global->registered_functions[name] = std::move(factory); + simix_global->registered_functions[name] = factory; } }