-/* Copyright (c) 2016-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2016-2020. 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 "src/simix/smx_private.hpp"
#include "src/surf/StorageImpl.hpp"
#include "src/surf/network_interface.hpp"
-#include "src/surf/xml/platf_private.hpp" // FIXME: KILLME. There must be a better way than mimicking XML here
-
-extern int surf_parse_lineno;
+#include "src/surf/xml/platf.hpp" // FIXME: KILLME. There must be a better way than mimicking XML here
namespace simgrid {
namespace kernel {
sg_platf_init();
surf_parse_open(file);
- try {
- int parse_status = surf_parse();
- surf_parse_close();
- xbt_assert(not parse_status, "Parse error at %s:%d", file.c_str(), surf_parse_lineno);
- } catch (const Exception&) {
- xbt_die(
- "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 EngineImpl::register_function(const std::string& name, xbt_main_func_t code)
-{
- simix_global->registered_functions[name] = [code](std::vector<std::string> args) {
- return simgrid::xbt::wrap_main(code, std::move(args));
- };
+ surf_parse();
+ surf_parse_close();
}
-void EngineImpl::register_function(const std::string& name, void (*code)(std::vector<std::string>))
+void EngineImpl::register_function(const std::string& name, const actor::ActorCodeFactory& code)
{
- simix_global->registered_functions[name] = [code](std::vector<std::string> args) {
- return std::bind(std::move(code), std::move(args));
- };
+ registered_functions[name] = code;
}
-
-void EngineImpl::register_default(xbt_main_func_t code)
+void EngineImpl::register_default(const actor::ActorCodeFactory& code)
{
- simix_global->default_function = [code](std::vector<std::string> args) {
- return simgrid::xbt::wrap_main(code, std::move(args));
- };
+ default_function = code;
}
} // namespace kernel