From 8a4b0cdb27204b7759b1aeb1d70fbef1fab6aef7 Mon Sep 17 00:00:00 2001 From: SUTER Frederic Date: Tue, 21 Sep 2021 09:06:32 +0200 Subject: [PATCH] plug last leaks --- .../context-defaults/context-defaults.cpp | 3 ++- teshsuite/surf/surf_usage/surf_usage.cpp | 13 +++++++------ teshsuite/surf/surf_usage2/surf_usage2.cpp | 19 ++++++++++--------- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/teshsuite/kernel/context-defaults/context-defaults.cpp b/teshsuite/kernel/context-defaults/context-defaults.cpp index 01443c94a4..af1722ea67 100644 --- a/teshsuite/kernel/context-defaults/context-defaults.cpp +++ b/teshsuite/kernel/context-defaults/context-defaults.cpp @@ -13,6 +13,7 @@ int main(int argc, char* argv[]) { xbt_log_control_set("root.fmt:[%c/%p]%e%m%n"); xbt_log_control_set("simix_context.threshold:verbose"); - simgrid::s4u::Engine::get_instance(&argc, argv); + simgrid::s4u::Engine e(&argc, argv); + e.get_clock(); // just to use the engine once. return 0; } diff --git a/teshsuite/surf/surf_usage/surf_usage.cpp b/teshsuite/surf/surf_usage/surf_usage.cpp index 5135d178fb..ac00e2a5ba 100644 --- a/teshsuite/surf/surf_usage/surf_usage.cpp +++ b/teshsuite/surf/surf_usage/surf_usage.cpp @@ -7,6 +7,7 @@ #include "simgrid/host.h" #include "simgrid/kernel/routing/NetZoneImpl.hpp" // full type for NetZoneImpl object +#include "simgrid/s4u/Engine.hpp" #include "simgrid/zone.h" #include "src/surf/cpu_interface.hpp" #include "src/surf/network_interface.hpp" @@ -35,14 +36,14 @@ static const char* string_action(simgrid::kernel::resource::Action::State state) int main(int argc, char** argv) { - surf_init(&argc, argv); /* Initialize some common structures */ - simgrid::config::set_parse("cpu/model:Cas01"); - simgrid::config::set_parse("network/model:CM02"); + simgrid::s4u::Engine e(&argc, argv); + e.set_config("cpu/model:Cas01"); + e.set_config("network/model:CM02"); xbt_assert(argc > 1, "Usage: %s platform.xml\n", argv[0]); - parse_platform_file(argv[1]); + e.load_platform(argv[1]); - const_sg_netzone_t as_zone = sg_zone_get_by_name("AS0"); + const_sg_netzone_t as_zone = e.netzone_by_name_or_null("AS0"); auto net_model = as_zone->get_impl()->get_network_model(); auto cpu_model_pm = as_zone->get_impl()->get_cpu_pm_model(); @@ -70,7 +71,7 @@ int main(int argc, char** argv) surf_solve(-1.0); do { - XBT_INFO("Next Event : %g", surf_get_clock()); + XBT_INFO("Next Event : %g", e.get_clock()); XBT_DEBUG("\t CPU actions"); simgrid::kernel::resource::Action::StateSet* action_list = cpu_model_pm->get_failed_action_set(); diff --git a/teshsuite/surf/surf_usage2/surf_usage2.cpp b/teshsuite/surf/surf_usage2/surf_usage2.cpp index f62da2ba30..e850b20402 100644 --- a/teshsuite/surf/surf_usage2/surf_usage2.cpp +++ b/teshsuite/surf/surf_usage2/surf_usage2.cpp @@ -7,6 +7,7 @@ #include "simgrid/host.h" #include "simgrid/kernel/routing/NetZoneImpl.hpp" // full type for NetZoneImpl object +#include "simgrid/s4u/Engine.hpp" #include "simgrid/zone.h" #include "src/kernel/EngineImpl.hpp" #include "src/surf/cpu_interface.hpp" @@ -21,24 +22,24 @@ int main(int argc, char** argv) { int running; - surf_init(&argc, argv); /* Initialize some common structures */ + simgrid::s4u::Engine e(&argc, argv); - simgrid::config::set_parse("network/model:CM02"); - simgrid::config::set_parse("cpu/model:Cas01"); + e.set_config("network/model:CM02"); + e.set_config("cpu/model:Cas01"); xbt_assert(argc > 1, "Usage: %s platform.xml\n", argv[0]); - parse_platform_file(argv[1]); + e.load_platform(argv[1]); /*********************** HOST ***********************************/ - simgrid::s4u::Host* hostA = sg_host_by_name("Cpu A"); - simgrid::s4u::Host* hostB = sg_host_by_name("Cpu B"); + simgrid::s4u::Host* hostA = e.host_by_name("Cpu A"); + simgrid::s4u::Host* hostB = e.host_by_name("Cpu B"); /* Let's do something on it */ hostA->get_cpu()->execution_start(1000.0, -1); hostB->get_cpu()->execution_start(1000.0, -1); hostB->get_cpu()->sleep(7.32); - const_sg_netzone_t as_zone = sg_zone_get_by_name("AS0"); + const_sg_netzone_t as_zone = e.netzone_by_name_or_null("AS0"); auto net_model = as_zone->get_impl()->get_network_model(); net_model->communicate(hostA, hostB, 150.0, -1.0); @@ -47,10 +48,10 @@ int main(int argc, char** argv) simgrid::kernel::resource::Action* action = nullptr; running = 0; - double now = surf_get_clock(); + double now = e.get_clock(); XBT_INFO("Next Event : %g", now); - for (auto const& model : simgrid::kernel::EngineImpl::get_instance()->get_all_models()) { + for (auto const& model : e.get_all_models()) { if (not model->get_started_action_set()->empty()) { XBT_DEBUG("\t Running that model"); running = 1; -- 2.20.1