#include "surf/surf.hpp" // routing_platf. FIXME:KILLME. SOON
#include <simgrid/Exception.hpp>
+#include <algorithm>
#include <string>
XBT_LOG_NEW_CATEGORY(s4u, "Log channels of the S4U (Simgrid for you) interface");
Engine::Engine(int* argc, char** argv) : pimpl(new kernel::EngineImpl())
{
xbt_assert(Engine::instance_ == nullptr, "It is currently forbidden to create more than one instance of s4u::Engine");
- TRACE_global_init();
+ instr::init();
SIMIX_global_init(argc, argv);
Engine::instance_ = this;
XBT_DEBUG("PARSE TIME: %g", (end - start));
}
+void Engine::register_function(const std::string& name, int (*code)(int, char**)) // deprecated
+{
+ kernel::actor::ActorCodeFactory code_factory = [code](std::vector<std::string> args) {
+ return xbt::wrap_main(code, std::move(args));
+ };
+ register_function(name, std::move(code_factory));
+}
+void Engine::register_default(int (*code)(int, char**)) // deprecated
+{
+ register_default([code](std::vector<std::string> args) { return xbt::wrap_main(code, std::move(args)); });
+}
+
/** Registers the main function of an actor that will be launched from the deployment file */
-void Engine::register_function(const std::string& name, int (*code)(int, char**))
+void Engine::register_function(const std::string& name, const std::function<void(int, char**)>& code)
{
- pimpl->register_function(name, code);
+ kernel::actor::ActorCodeFactory code_factory = [code](std::vector<std::string> args) {
+ return xbt::wrap_main(code, std::move(args));
+ };
+ register_function(name, std::move(code_factory));
}
/** Registers the main function of an actor that will be launched from the deployment file */
-void Engine::register_function(const std::string& name, void (*code)(std::vector<std::string>))
+void Engine::register_function(const std::string& name, const std::function<void(std::vector<std::string>)>& code)
{
- pimpl->register_function(name, code);
+ kernel::actor::ActorCodeFactory code_factory = [code](std::vector<std::string> args) {
+ return std::bind(std::move(code), std::move(args));
+ };
+ register_function(name, std::move(code_factory));
}
/** Registers a function as the default main function of actors
*
* It will be used as fallback when the function requested from the deployment file was not registered.
* It is used for trace-based simulations (see examples/s4u/replay-comms and similar).
*/
-void Engine::register_default(int (*code)(int, char**))
+void Engine::register_default(const std::function<void(int, char**)>& code)
+{
+ register_default([code](std::vector<std::string> args) { return xbt::wrap_main(code, std::move(args)); });
+}
+void Engine::register_default(const kernel::actor::ActorCodeFactory& code)
+{
+ simgrid::kernel::actor::simcall([this, &code]() { pimpl->register_default(code); });
+}
+
+void Engine::register_function(const std::string& name, const kernel::actor::ActorCodeFactory& code)
{
- pimpl->register_default(code);
+ simgrid::kernel::actor::simcall([this, name, &code]() { pimpl->register_function(name, code); });
}
/** Load a deployment file and launch the actors that it contains
std::vector<ActorPtr> Engine::get_all_actors()
{
std::vector<ActorPtr> actor_list;
- actor_list.push_back(simgrid::s4u::Actor::self());
for (auto const& kv : simix_global->process_list) {
actor_list.push_back(kv.second->iface());
}
{
config::set_parse(str);
}
+void Engine::set_config(const std::string& name, int value)
+{
+ config::set_value(name.c_str(), value);
+}
+void Engine::set_config(const std::string& name, double value)
+{
+ config::set_value(name.c_str(), value);
+}
+void Engine::set_config(const std::string& name, bool value)
+{
+ config::set_value(name.c_str(), value);
+}
+void Engine::set_config(const std::string& name, const std::string& value)
+{
+ config::set_value(name.c_str(), value);
+}
+
} // namespace s4u
} // namespace simgrid
{
simgrid::s4u::Engine::get_instance()->run();
}
-void simgrid_register_function(const char* name, int (*code)(int, char**))
+void simgrid_register_function(const char* name, void (*code)(int, char**))
{
simgrid::s4u::Engine::get_instance()->register_function(name, code);
}
-void simgrid_register_default(int (*code)(int, char**))
+void simgrid_register_default(void (*code)(int, char**))
{
simgrid::s4u::Engine::get_instance()->register_default(code);
}
{
return simgrid::s4u::Engine::get_clock();
}
-int simgrid_get_actor_count()
+
+int simgrid_get_actor_count() // XBT_ATTRIB_DEPRECATED_v330
{
return simgrid::s4u::Engine::get_instance()->get_actor_count();
}