X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/25f00868d318a0c49b4965ea9dea9a78bc349365..9c1bc911d15a70898c862abf50907806010609a2:/src/simix/smx_deployment.cpp diff --git a/src/simix/smx_deployment.cpp b/src/simix/smx_deployment.cpp index 08a8727cbf..d4825df8e1 100644 --- a/src/simix/smx_deployment.cpp +++ b/src/simix/smx_deployment.cpp @@ -1,144 +1,100 @@ -/* Copyright (c) 2007, 2009-2015. 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 "smx_private.h" -#include "xbt/sysdep.h" -#include "xbt/log.h" -#include "xbt/dict.h" +#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 -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_deployment, simix, - "Logging specific to SIMIX (deployment)"); +#include +#include -extern int surf_parse_lineno; +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_deployment, simix, "Logging specific to SIMIX (deployment)"); -void SIMIX_init_application(void) +void SIMIX_init_application() // XBT_DEPRECATED_v329 { sg_platf_exit(); sg_platf_init(); } -/** - * \brief An application deployer. - * - * 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 - * - * Here is a small example of such a platform - * - * \include small_deployment.xml - * - */ -void SIMIX_launch_application(const char *file) +void SIMIX_launch_application(const std::string& file) // XBT_DEPRECATED_v329 { - XBT_ATTRIB_UNUSED int parse_status; - xbt_assert(simix_global, - "SIMIX_global_init has to be called before SIMIX_launch_application."); - - SIMIX_init_application(); - - surf_parse_open(file); - TRY { - parse_status = surf_parse(); - surf_parse_close(); - xbt_assert(!parse_status, "Parse error at %s:%d", file,surf_parse_lineno); - } - CATCH_ANONYMOUS { - 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; - } + simgrid_load_deployment(file.c_str()); } - -/** - * \brief Registers a #smx_process_code_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 std::string& name, xbt_main_func_t code) // XBT_DEPRECATED_v329 { - 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); + simgrid::s4u::Engine::get_instance()->register_function(name, code); } - -static xbt_main_func_t default_function = NULL; -/** - * \brief Registers a #smx_process_code_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) +void SIMIX_function_register(const std::string& name, void (*code)(std::vector)) // XBT_DEPRECATED_v329 { - xbt_assert(simix_global, - "SIMIX_global_init has to be called before SIMIX_function_register."); - - default_function = code; + simgrid::s4u::Engine::get_instance()->register_function(name, code); +} +void SIMIX_function_register_default(xbt_main_func_t code) // XBT_DEPRECATED_v329 +{ + simgrid::s4u::Engine::get_instance()->register_default(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. + * @param name the reference name of the function. + * @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 std::string& 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 */ -/** - * \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) // XBT_ATTRIB_DEPRECATED_v329 { - s_sg_platf_process_cbarg_t process = SG_PLATF_PROCESS_INITIALIZER; - - sg_host_t host = sg_host_by_name(process_host); - if (!host) - THROWF(arg_error, 0, "Host '%s' unknown", process_host); - process.host = sg_host_get_name(host); + simgrid::kernel::routing::ActorCreationArgs actor; - process.argc = 1 + xbt_dynar_length(arguments); - process.argv = (const char**)xbt_new(char *, process.argc + 1); - process.argv[0] = xbt_strdup(process_function); + const simgrid::s4u::Host* host = sg_host_by_name(process_host); + if (not host) + throw std::invalid_argument(simgrid::xbt::string_printf("Host '%s' unknown", process_host)); + 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] = NULL; - xbt_main_func_t parse_code = SIMIX_get_registered_function(process_function); + // Check we know how to handle this function name: + const 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; + actor.function = process_function; + actor.host = process_host; + actor.kill_time = process_kill_time; + actor.start_time = process_start_time; + actor.restart_on_failure = false; + sg_platf_new_actor(&actor); +} + +namespace simgrid { +namespace simix { - sg_platf_new_process(&process); +void register_function(const std::string& name, const ActorCodeFactory& factory) +{ + simix_global->registered_functions[name] = factory; +} + +} }