From f119efea1c24d44adf55f31ca2ba7e15c6c15d84 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Thu, 2 Jul 2020 15:17:04 +0200 Subject: [PATCH] Make Engine::set_config(...) static functions. --- docs/source/Configuring_SimGrid.rst | 2 +- examples/s4u/actor-stacksize/s4u-actor-stacksize.cpp | 4 ++-- .../s4u/energy-exec-ptask/s4u-energy-exec-ptask.cpp | 2 +- include/simgrid/s4u/Engine.hpp | 12 ++++++------ 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/source/Configuring_SimGrid.rst b/docs/source/Configuring_SimGrid.rst index a419959303..e7a968578b 100644 --- a/docs/source/Configuring_SimGrid.rst +++ b/docs/source/Configuring_SimGrid.rst @@ -67,7 +67,7 @@ with :cpp:func:`simgrid::s4u::Engine::set_config` or :cpp:func:`MSG_config`. int main(int argc, char *argv[]) { simgrid::s4u::Engine e(&argc, argv); - e.set_config("Item:Value"); + simgrid::s4u::Engine::set_config("Item:Value"); // Rest of your code } diff --git a/examples/s4u/actor-stacksize/s4u-actor-stacksize.cpp b/examples/s4u/actor-stacksize/s4u-actor-stacksize.cpp index 3d9a77e5e5..e38cb2b172 100644 --- a/examples/s4u/actor-stacksize/s4u-actor-stacksize.cpp +++ b/examples/s4u/actor-stacksize/s4u-actor-stacksize.cpp @@ -24,12 +24,12 @@ int main(int argc, char* argv[]) // You can use set_config(string) to pass a size that will be parsed. That value will be used for any subsequent // actors - e.set_config("contexts/stack-size:16384"); + simgrid::s4u::Engine::set_config("contexts/stack-size:16384"); simgrid::s4u::Actor::create("actor", simgrid::s4u::Host::by_name("Tremblay"), actor); simgrid::s4u::Actor::create("actor", simgrid::s4u::Host::by_name("Tremblay"), actor); // You can use set_config(key, value) for the same effect. - e.set_config("contexts/stack-size", 32 * 1024); + simgrid::s4u::Engine::set_config("contexts/stack-size", 32 * 1024); simgrid::s4u::Actor::create("actor", simgrid::s4u::Host::by_name("Tremblay"), actor); simgrid::s4u::Actor::create("actor", simgrid::s4u::Host::by_name("Tremblay"), actor); diff --git a/examples/s4u/energy-exec-ptask/s4u-energy-exec-ptask.cpp b/examples/s4u/energy-exec-ptask/s4u-energy-exec-ptask.cpp index db14d380fc..1fe84f2919 100644 --- a/examples/s4u/energy-exec-ptask/s4u-energy-exec-ptask.cpp +++ b/examples/s4u/energy-exec-ptask/s4u-energy-exec-ptask.cpp @@ -134,7 +134,7 @@ int main(int argc, char* argv[]) { sg_host_energy_plugin_init(); simgrid::s4u::Engine e(&argc, argv); - e.set_config("host/model:ptask_L07"); + simgrid::s4u::Engine::set_config("host/model:ptask_L07"); xbt_assert(argc == 2, "Usage: %s platform_file\n\tExample: %s ../platforms/energy_platform.xml\n", argv[0], argv[0]); diff --git a/include/simgrid/s4u/Engine.hpp b/include/simgrid/s4u/Engine.hpp index 58e0e8f3a7..8903b10b20 100644 --- a/include/simgrid/s4u/Engine.hpp +++ b/include/simgrid/s4u/Engine.hpp @@ -159,13 +159,13 @@ public: * @endrst * * Example: - * e->set_config("host/model:ptask_L07"); + * simgrid::s4u::Engine::set_config("host/model:ptask_L07"); */ - void set_config(const std::string& str); - void set_config(const std::string& name, int value); - void set_config(const std::string& name, bool value); - void set_config(const std::string& name, double value); - void set_config(const std::string& name, const std::string& value); + static void set_config(const std::string& str); + static void set_config(const std::string& name, int value); + static void set_config(const std::string& name, bool value); + static void set_config(const std::string& name, double value); + static void set_config(const std::string& name, const std::string& value); /** Callback fired when the platform is created (ie, the xml file parsed), * right before the actual simulation starts. */ -- 2.20.1