fix memleak in battery examples and task-storm

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;

diff --git a/examples/cpp/battery-energy/s4u-battery-energy.cpp b/examples/cpp/battery-energy/s4u-battery-energy.cpp
index c50ef02..6db8812 100644 (file)
--- a/examples/cpp/battery-energy/s4u-battery-energy.cpp
+++ b/examples/cpp/battery-energy/s4u-battery-energy.cpp
@@ -21,7 +21,7 @@ static void manager()
 
   battery->schedule_handler(
       0.2, simgrid::plugins::Battery::DISCHARGE, simgrid::plugins::Battery::Handler::PERSISTANT,
-      [battery, &host1, &host2, &host3]() {
+      [&battery, &host1, &host2, &host3]() {
         XBT_INFO("Handler -> Battery low: SoC: %f SoH: %f Energy stored: %fJ Energy provided: %fJ Energy consumed %fJ",
                  battery->get_state_of_charge(), battery->get_state_of_health(), battery->get_energy_stored(),
                  battery->get_energy_provided(), battery->get_energy_consumed());

diff --git a/examples/cpp/battery-simple/s4u-battery-simple.cpp b/examples/cpp/battery-simple/s4u-battery-simple.cpp
index 04eb4f6..61a4186 100644 (file)
--- a/examples/cpp/battery-simple/s4u-battery-simple.cpp
+++ b/examples/cpp/battery-simple/s4u-battery-simple.cpp
@@ -28,7 +28,7 @@ int main(int argc, char* argv[])
   XBT_INFO("Set load to %fW", load_w);
 
   battery->schedule_handler(
-      0.2, simgrid::plugins::Battery::DISCHARGE, simgrid::plugins::Battery::Handler::PERSISTANT, [battery, &load_w]() {
+      0.2, simgrid::plugins::Battery::DISCHARGE, simgrid::plugins::Battery::Handler::PERSISTANT, [&battery, &load_w]() {
         XBT_INFO("Discharged state: SoC: %f SoH: %f Energy stored: %fJ Energy provided: %fJ Energy consumed %fJ",
                  battery->get_state_of_charge(), battery->get_state_of_health(), battery->get_energy_stored(),
                  battery->get_energy_provided(), battery->get_energy_consumed());
@@ -37,7 +37,7 @@ int main(int argc, char* argv[])
       });
 
   battery->schedule_handler(
-      0.8, simgrid::plugins::Battery::CHARGE, simgrid::plugins::Battery::Handler::PERSISTANT, [battery]() {
+      0.8, simgrid::plugins::Battery::CHARGE, simgrid::plugins::Battery::Handler::PERSISTANT, [&battery]() {
         XBT_INFO("Charged state: SoC: %f SoH: %f Energy stored: %fJ Energy provided: %fJ Energy consumed %fJ",
                  battery->get_state_of_charge(), battery->get_state_of_health(), battery->get_energy_stored(),
                  battery->get_energy_provided(), battery->get_energy_consumed());
@@ -45,5 +45,6 @@ int main(int argc, char* argv[])
       });
 
   e.run();
+
   return 0;
 }
\ No newline at end of file

diff --git a/examples/cpp/task-storm/s4u-task-storm.cpp b/examples/cpp/task-storm/s4u-task-storm.cpp
index 0a0ab71..ca0f61e 100644 (file)
--- a/examples/cpp/task-storm/s4u-task-storm.cpp
+++ b/examples/cpp/task-storm/s4u-task-storm.cpp
@@ -111,11 +111,13 @@ int main(int argc, char* argv[])
     auto data = t->get_token_from(SA_to_B1)->get_data<double>();
     t->deque_token_from(SA_to_B1);
     t->set_amount(*data * 10);
+    delete data;
   });
   B2->on_this_start_cb([&SA_to_B2](sg4::Task* t) {
     auto data = t->get_token_from(SA_to_B2)->get_data<double>();
     t->deque_token_from(SA_to_B2);
     t->set_amount(*data * 10);
+    delete data;
   });
 
   // Enqueue firings for tasks without predecessors