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;
void Engine::register_function(const std::string& name, int (*code)(int, char**)) // deprecated
{
- register_function(name, [code](std::vector<std::string> args) { return xbt::wrap_main(code, std::move(args)); });
+ 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
{
}
/** 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)(int, char**))
+void Engine::register_function(const std::string& name, const std::function<void(int, char**)>& code)
{
- register_function(name, [code](std::vector<std::string> args) { return xbt::wrap_main(code, std::move(args)); });
+ 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)
{
- register_function(name,
- [code](std::vector<std::string> args) { return std::bind(std::move(code), std::move(args)); });
+ 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(void (*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)); });
}
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
{
return simgrid::s4u::Engine::get_clock();
}
-int simgrid_get_actor_count()
-{
- return simgrid::s4u::Engine::get_instance()->get_actor_count();
-}
-void simgrid_get_all_hosts(size_t* host_count, sg_host_t** hosts)
+int simgrid_get_actor_count() // XBT_ATTRIB_DEPRECATED_v330
{
- simgrid::s4u::Engine* e = simgrid::s4u::Engine::get_instance();
- *host_count = e->get_host_count();
- std::vector<simgrid::s4u::Host*> list = e->get_all_hosts();
-
- auto last = std::remove_if(begin(list), end(list), [](const simgrid::s4u::Host* host) {
- return not host || not host->get_netpoint() || not host->get_netpoint()->is_host();
- });
- std::sort(begin(list), last,
- [](const simgrid::s4u::Host* a, const simgrid::s4u::Host* b) { return a->get_name() < b->get_name(); });
-
- *hosts = static_cast<sg_host_t*>(xbt_malloc(sizeof(sg_host_t) * (*host_count)));
- for (size_t i = 0; i < *host_count; i++)
- (*hosts)[i] = list[i];
+ return simgrid::s4u::Engine::get_instance()->get_actor_count();
}