fix memleak in battery examples and task-storm

[simgrid.git] / examples / cpp / battery-degradation / s4u-battery-degradation.cpp

diff --git a/examples/cpp/battery-degradation/s4u-battery-degradation.cpp b/examples/cpp/battery-degradation/s4u-battery-degradation.cpp
index 829efef..4973587 100644 (file)
--- a/examples/cpp/battery-degradation/s4u-battery-degradation.cpp
+++ b/examples/cpp/battery-degradation/s4u-battery-degradation.cpp
@@ -10,42 +10,34 @@
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(battery_degradation, "Messages specific for this s4u example");
 
-static void manager()
+int main(int argc, char* argv[])
 {
-  auto battery = simgrid::plugins::Battery::init("Battery", 0.8, 0.9, 0.9, 10, 100, 0.9);
+  simgrid::s4u::Engine e(&argc, argv);
+  e.load_platform(argv[1]);
 
-  battery->set_load("load", 100);
+  auto battery = simgrid::plugins::Battery::init("Battery", 0.8, -200, 200, 0.9, 0.9, 10, 100);
 
-  auto event1 = battery->create_event(
-      0.2, simgrid::plugins::Battery::DISCHARGE,
-      [battery]() {
+  battery->set_load("load", 100.0);
+
+  auto handler1 = battery->schedule_handler(
+      0.2, simgrid::plugins::Battery::DISCHARGE, simgrid::plugins::Battery::Handler::PERSISTANT, [&battery]() {
         XBT_INFO("%f,%f,SoC", simgrid::s4u::Engine::get_clock(), battery->get_state_of_charge());
         XBT_INFO("%f,%f,SoH", simgrid::s4u::Engine::get_clock(), battery->get_state_of_health());
-        battery->set_load("load", -100);
-      },
-      true);
-
-  std::shared_ptr<simgrid::plugins::Battery::Event> event2;
-  event2 = battery->create_event(
-      0.8, simgrid::plugins::Battery::CHARGE,
-      [battery, event1, event2]() {
+        battery->set_load("load", -100.0);
+      });
+
+  std::shared_ptr<simgrid::plugins::Battery::Handler> handler2;
+  handler2 = battery->schedule_handler(
+      0.8, simgrid::plugins::Battery::CHARGE, simgrid::plugins::Battery::Handler::PERSISTANT,
+      [&battery, &handler1, &handler2]() {
         XBT_INFO("%f,%f,SoC", simgrid::s4u::Engine::get_clock(), battery->get_state_of_charge());
         XBT_INFO("%f,%f,SoH", simgrid::s4u::Engine::get_clock(), battery->get_state_of_health());
         if (battery->get_state_of_health() < 0.1) {
-          battery->delete_event(event1);
-          battery->delete_event(event2);
+          battery->delete_handler(handler1);
+          battery->delete_handler(handler2);
         }
-        battery->set_load("load", 100);
-      },
-      true);
-}
-
-int main(int argc, char* argv[])
-{
-  simgrid::s4u::Engine e(&argc, argv);
-  e.load_platform(argv[1]);
-
-  simgrid::s4u::Actor::create("manager", e.host_by_name("MyHost1"), manager);
+        battery->set_load("load", 100.0);
+      });
 
   e.run();
   return 0;