-/* Copyright (c) 2007-2018. 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 "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 <simgrid/engine.h>
-#include <xbt/ex.hpp>
#include <string>
#include <vector>
* @include small_deployment.xml
*
*/
-void SIMIX_launch_application(std::string 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.");
parse_status = surf_parse();
surf_parse_close();
xbt_assert(not parse_status, "Parse error at %s:%d", file.c_str(), surf_parse_lineno);
- }
- catch (xbt_ex& e) {
+ } catch (const simgrid::Exception&) {
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);
}
}
-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)
{
}
static simgrid::simix::ActorCodeFactory toActorCodeFactory(void (*code)(std::vector<std::string>))
{
- return [code](std::vector<std::string> args) { return simgrid::xbt::wrap_main(code, std::move(args)); };
+ return [code](std::vector<std::string> args) { return std::bind(std::move(code), std::move(args)); };
}
/**
* @param name the reference name of the function.
* @param code the function
*/
-void SIMIX_function_register(std::string name, xbt_main_func_t code)
+void SIMIX_function_register(const std::string& name, xbt_main_func_t code)
{
simix_global->registered_functions[name] = toActorCodeFactory(code);
}
-void SIMIX_function_register(std::string name, void (*code)(std::vector<std::string>))
+void SIMIX_function_register(const std::string& name, void (*code)(std::vector<std::string>))
{
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.
*
* @param name the reference name of the function.
* @return The #smx_actor_t or nullptr.
*/
-simgrid::simix::ActorCodeFactory& SIMIX_get_actor_code_factory(std::string 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.");
sg_host_t host = sg_host_by_name(process_host);
if (not host)
- THROWF(arg_error, 0, "Host '%s' unknown", process_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 */
namespace simgrid {
namespace simix {
-void register_function(std::string 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;
}
}