X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ecd5f7562caf1d443bf22788fa5f4fac408776ec..6157f90cc9d3cce63b341338c15e91af8ccd6347:/examples/s4u/plugin-hostload/s4u-plugin-hostload.cpp

diff --git a/examples/s4u/plugin-hostload/s4u-plugin-hostload.cpp b/examples/s4u/plugin-hostload/s4u-plugin-hostload.cpp
index 5ddec37fdd..7a5087a8dd 100644
--- a/examples/s4u/plugin-hostload/s4u-plugin-hostload.cpp
+++ b/examples/s4u/plugin-hostload/s4u-plugin-hostload.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -12,43 +12,46 @@ static void execute_load_test()
 {
   s4u_Host* host = simgrid::s4u::Host::by_name("MyHost1");
 
-  XBT_INFO("Initial peak speed: %.0E flop/s; number of flops computed so far: %.0E (should be 0)", host->getSpeed(),
-           sg_host_get_computed_flops(host));
+  XBT_INFO("Initial peak speed: %.0E flop/s; number of flops computed so far: %.0E (should be 0) and current average load: %.5f (should be 0)", host->getSpeed(),
+           sg_host_get_computed_flops(host), sg_host_get_avg_load(host));
 
   double start = simgrid::s4u::Engine::getClock();
   XBT_INFO("Sleep for 10 seconds");
   simgrid::s4u::this_actor::sleep_for(10);
 
+  double speed = host->getSpeed();
   XBT_INFO("Done sleeping %.2fs; peak speed: %.0E flop/s; number of flops computed so far: %.0E (nothing should have "
            "changed)",
            simgrid::s4u::Engine::getClock() - start, host->getSpeed(), sg_host_get_computed_flops(host));
 
   // Run a task
   start = simgrid::s4u::Engine::getClock();
-  XBT_INFO("Run a task of %.0E flops", 100E6);
-  simgrid::s4u::this_actor::execute(100E6);
+  XBT_INFO("Run a task of %.0E flops at current speed of %.0E flop/s", 200E6, host->getSpeed());
+  simgrid::s4u::this_actor::execute(200E6);
 
-  XBT_INFO("Done working on my task; this took %.2fs; current peak speed: %.0E flop/s; number of flops computed so "
-           "far: %.0E",
-           simgrid::s4u::Engine::getClock() - start, host->getSpeed(), sg_host_get_computed_flops(host));
+  XBT_INFO("Done working on my task; this took %.2fs; current peak speed: %.0E flop/s (when I started the computation, the speed was set to %.0E flop/s); number of flops computed so "
+           "far: %.2E, average load as reported by the HostLoad plugin: %.5f (should be %.5f)",
+           simgrid::s4u::Engine::getClock() - start, host->getSpeed(), speed, sg_host_get_computed_flops(host), sg_host_get_avg_load(host),
+           static_cast<double>(200E6)/(10.5*speed*host->getCoreCount()+(simgrid::s4u::Engine::getClock()-start-0.5)*host->getSpeed()*host->getCoreCount()));
 
   // ========= Change power peak =========
-  int pstate = 2;
+  int pstate = 1;
   host->setPstate(pstate);
-  XBT_INFO("========= Requesting pstate %d (speed should be of %.0E flop/s and is of %.0E flop/s)", pstate,
-           host->getPstateSpeed(pstate), host->getSpeed());
+  XBT_INFO("========= Requesting pstate %d (speed should be of %.0E flop/s and is of %.0E flop/s, average load is %.5f)", pstate,
+           host->getPstateSpeed(pstate), host->getSpeed(), sg_host_get_avg_load(host));
 
   // Run a second task
   start = simgrid::s4u::Engine::getClock();
   XBT_INFO("Run a task of %.0E flops", 100E6);
   simgrid::s4u::this_actor::execute(100E6);
   XBT_INFO("Done working on my task; this took %.2fs; current peak speed: %.0E flop/s; number of flops computed so "
-           "far: %.0E",
+           "far: %.2E",
            simgrid::s4u::Engine::getClock() - start, host->getSpeed(), sg_host_get_computed_flops(host));
 
   start = simgrid::s4u::Engine::getClock();
-  XBT_INFO("========= Requesting a reset of the computation counter");
+  XBT_INFO("========= Requesting a reset of the computation and load counters");
   sg_host_load_reset(host);
+  XBT_INFO("After reset: %.0E flops computed; load is %.5f", sg_host_get_computed_flops(host), sg_host_get_avg_load(host));
   XBT_INFO("Sleep for 4 seconds");
   simgrid::s4u::this_actor::sleep_for(4);
   XBT_INFO("Done sleeping %.2f s; peak speed: %.0E flop/s; number of flops computed so far: %.0E",
@@ -56,8 +59,8 @@ static void execute_load_test()
 
   // =========== Turn the other host off ==========
   s4u_Host* host2 = simgrid::s4u::Host::by_name("MyHost2");
-  XBT_INFO("Turning MyHost2 off, and sleeping another 10 seconds. MyHost2 computed %.0f flops so far.",
-           sg_host_get_computed_flops(host2));
+  XBT_INFO("Turning MyHost2 off, and sleeping another 10 seconds. MyHost2 computed %.0f flops so far and has an average load of %.5f.",
+           sg_host_get_computed_flops(host2), sg_host_get_avg_load(host2));
   host2->turnOff();
   start = simgrid::s4u::Engine::getClock();
   simgrid::s4u::this_actor::sleep_for(10);
@@ -65,6 +68,15 @@ static void execute_load_test()
            simgrid::s4u::Engine::getClock() - start, host->getSpeed(), sg_host_get_computed_flops(host));
 }
 
+static void change_speed()
+{
+  s4u_Host* host = simgrid::s4u::Host::by_name("MyHost1");
+  simgrid::s4u::this_actor::sleep_for(10.5);
+  XBT_INFO("I slept until now, but now I'll change the speed of this host "
+      "while the other process is still computing! This should slow the computation down.");
+  host->setPstate(2);
+}
+
 int main(int argc, char* argv[])
 {
   sg_host_load_plugin_init();
@@ -73,7 +85,8 @@ int main(int argc, char* argv[])
   xbt_assert(argc == 2, "Usage: %s platform_file\n\tExample: %s msg_platform.xml\n", argv[0], argv[0]);
   e.loadPlatform(argv[1]);
 
-  simgrid::s4u::Actor::createActor("load_test", simgrid::s4u::Host::by_name("MyHost1"), execute_load_test);
+  simgrid::s4u::Actor::create("load_test", simgrid::s4u::Host::by_name("MyHost1"), execute_load_test);
+  simgrid::s4u::Actor::create("change_speed", simgrid::s4u::Host::by_name("MyHost1"), change_speed);
 
   e.run();