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 13b149e..4973587 100644 (file)
--- a/examples/cpp/battery-degradation/s4u-battery-degradation.cpp
+++ b/examples/cpp/battery-degradation/s4u-battery-degradation.cpp
@@ -10,14 +10,17 @@
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(battery_degradation, "Messages specific for this s4u example");
 
-static void manager()
+int main(int argc, char* argv[])
 {
+  simgrid::s4u::Engine e(&argc, argv);
+  e.load_platform(argv[1]);
+
   auto battery = simgrid::plugins::Battery::init("Battery", 0.8, -200, 200, 0.9, 0.9, 10, 100);
 
   battery->set_load("load", 100.0);
 
   auto handler1 = battery->schedule_handler(
-      0.2, simgrid::plugins::Battery::DISCHARGE, simgrid::plugins::Battery::Handler::PERSISTANT, [battery]() {
+      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.0);
@@ -26,7 +29,7 @@ static void manager()
   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]() {
+      [&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) {
@@ -35,14 +38,6 @@ static void manager()
         }
         battery->set_load("load", 100.0);
       });
-}
-
-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);
 
   e.run();
   return 0;