X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a8c66d7f0c38aed2cb5ff8bc017620f4ce647e2a..90c0a6fe614a646c2fa55d06ab494f40ecc94f26:/examples/cpp/chiller-simple/s4u-chiller-simple.cpp

diff --git a/examples/cpp/chiller-simple/s4u-chiller-simple.cpp b/examples/cpp/chiller-simple/s4u-chiller-simple.cpp
index 079d7c5b39..915c8a1f64 100644
--- a/examples/cpp/chiller-simple/s4u-chiller-simple.cpp
+++ b/examples/cpp/chiller-simple/s4u-chiller-simple.cpp
@@ -6,31 +6,44 @@
 #include "simgrid/plugins/chiller.hpp"
 #include "simgrid/plugins/energy.h"
 #include "simgrid/s4u.hpp"
-#include <xbt/log.h>
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(chiller_simple, "Messages specific for this s4u example");
 namespace sg4 = simgrid::s4u;
 
-static void manager(simgrid::plugins::ChillerPtr c)
+void display_chiller(simgrid::plugins::ChillerPtr c)
 {
-  XBT_INFO("Initial state: ");
-  XBT_INFO("%s: Power: %fW T_in: %f°C Energy consumed: %fJ", c->get_cname(), c->get_power(), c->get_temp_in(),
+  XBT_INFO("%s: Power: %.2fW T_in: %.2f°C Energy consumed: %.2fJ", c->get_cname(), c->get_power(), c->get_temp_in(),
            c->get_energy_consumed());
-  XBT_INFO("The machines slowly heat up the room.");
-  simgrid::s4u::this_actor::sleep_until(1000);
-  XBT_INFO("The Chiller now compensates the heat generated by the machines.");
-  simgrid::s4u::this_actor::sleep_until(1200);
+}
+
+static void manager(simgrid::plugins::ChillerPtr c)
+{
+  display_chiller(c);
+
+  simgrid::s4u::this_actor::sleep_for(c->get_time_to_goal_temp());
+  XBT_INFO("The input temperature is now equal to the goal temperature. After this point the Chiller will compensate "
+           "heat with electrical power.");
+  display_chiller(c);
+
+  simgrid::s4u::this_actor::sleep_for(1);
+  display_chiller(c);
+
   XBT_INFO("Let's compute something.");
-  sg4::this_actor::exec_async(1e10);
-  simgrid::s4u::this_actor::sleep_until(1300);
+  sg4::this_actor::execute(1e10);
   XBT_INFO("Computation done.");
-  simgrid::s4u::this_actor::sleep_until(1400);
+  display_chiller(c);
   XBT_INFO("Now let's stress the chiller by decreasing the goal temperature to 23°C.");
   c->set_goal_temp(23);
 
-  simgrid::s4u::this_actor::sleep_until(1900);
-  simgrid::s4u::this_actor::sleep_until(2000);
-  simgrid::s4u::this_actor::sleep_until(2100);
+  simgrid::s4u::this_actor::sleep_for(1);
+  display_chiller(c);
+
+  simgrid::s4u::this_actor::sleep_for(c->get_time_to_goal_temp());
+  XBT_INFO("The input temperature is back to the goal temperature.");
+  display_chiller(c);
+
+  simgrid::s4u::this_actor::sleep_for(1);
+  display_chiller(c);
 }
 
 int main(int argc, char* argv[])
@@ -43,11 +56,7 @@ int main(int argc, char* argv[])
   chiller->add_host(e.host_by_name("MyHost1"));
   chiller->add_host(e.host_by_name("MyHost2"));
   chiller->add_host(e.host_by_name("MyHost3"));
-  sg4::Actor::create("sender", e.host_by_name("MyHost1"), manager, chiller);
-  chiller->on_power_change_cb([](simgrid::plugins::Chiller* c) {
-    XBT_INFO("%s: Power: %fW T_in: %f°C Energy consumed: %fJ", c->get_cname(), c->get_power(), c->get_temp_in(),
-             c->get_energy_consumed());
-  });
+  sg4::Actor::create("manager", e.host_by_name("MyHost1"), manager, chiller);
 
   e.run();
   return 0;