X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/34803ab5554b83e70a652800872a5de378e067c3..c0c7607cc0cb97760a59eb3f40481fbe9469cc0a:/examples/s4u/exec-dvfs/s4u-exec-dvfs.cpp

diff --git a/examples/s4u/exec-dvfs/s4u-exec-dvfs.cpp b/examples/s4u/exec-dvfs/s4u-exec-dvfs.cpp
index 1e7ac7922a..77fba840f0 100644
--- a/examples/s4u/exec-dvfs/s4u-exec-dvfs.cpp
+++ b/examples/s4u/exec-dvfs/s4u-exec-dvfs.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2020. 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. */
@@ -7,60 +7,59 @@
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(test, "Pstate properties test");
 
-static int dvfs(std::vector<std::string> args)
+static int dvfs()
 {
   double workload = 100E6;
-  sg_host_t host  = simgrid::s4u::this_actor::getHost();
+  simgrid::s4u::Host* host = simgrid::s4u::this_actor::get_host();
 
-  int nb = sg_host_get_nb_pstates(host);
+  int nb = host->get_pstate_count();
   XBT_INFO("Count of Processor states=%d", nb);
 
-  XBT_INFO("Current power peak=%f", host->getSpeed());
+  XBT_INFO("Current power peak=%f", host->get_speed());
 
-  // Run a task
+  // Run a Computation
   simgrid::s4u::this_actor::execute(workload);
 
-  double task_time = simgrid::s4u::Engine::getClock();
-  XBT_INFO("Task1 simulation time: %e", task_time);
+  double exec_time = simgrid::s4u::Engine::get_clock();
+  XBT_INFO("Computation1 duration: %.2f", exec_time);
 
   // Change power peak
   int new_pstate = 2;
 
-  XBT_INFO("Changing power peak value to %f (at index %d)", host->getPstateSpeed(new_pstate), new_pstate);
+  XBT_INFO("Changing power peak value to %f (at index %d)", host->get_pstate_speed(new_pstate), new_pstate);
 
-  sg_host_set_pstate(host, new_pstate);
+  host->set_pstate(new_pstate);
 
-  XBT_INFO("Current power peak=%f", host->getSpeed());
+  XBT_INFO("Current power peak=%f", host->get_speed());
 
-  // Run a second task
+  // Run a second Computation
   simgrid::s4u::this_actor::execute(workload);
 
-  task_time = simgrid::s4u::Engine::getClock() - task_time;
-  XBT_INFO("Task2 simulation time: %e", task_time);
+  exec_time = simgrid::s4u::Engine::get_clock() - exec_time;
+  XBT_INFO("Computation2 duration: %.2f", exec_time);
 
-  // Verify the default pstate is set to 0
+  // Verify that the default pstate is set to 0
   host = simgrid::s4u::Host::by_name_or_null("MyHost2");
-  XBT_INFO("Count of Processor states=%d", sg_host_get_nb_pstates(host));
+  XBT_INFO("Count of Processor states=%d", host->get_pstate_count());
 
-  XBT_INFO("Current power peak=%f", host->getSpeed());
+  XBT_INFO("Current power peak=%f", host->get_speed());
   return 0;
 }
 
 int main(int argc, char* argv[])
 {
   simgrid::s4u::Engine e(&argc, argv);
-  std::vector<std::string> args;
 
-  xbt_assert(argc == 2, "Usage: %s platform_file\n\tExample: %s msg_platform.xml\n", argv[0], argv[0]);
+  xbt_assert(argc == 2, "Usage: %s platform_file\n\tExample: %s ../platforms/energy_platform.xml\n", argv[0], argv[0]);
 
-  e.loadPlatform(argv[1]); /* - Load the platform description */
+  e.load_platform(argv[1]);
 
-  simgrid::s4u::Actor::createActor("dvfs_test", simgrid::s4u::Host::by_name("MyHost1"), dvfs, args);
-  simgrid::s4u::Actor::createActor("dvfs_test", simgrid::s4u::Host::by_name("MyHost2"), dvfs, args);
+  simgrid::s4u::Actor::create("dvfs_test", simgrid::s4u::Host::by_name("MyHost1"), dvfs);
+  simgrid::s4u::Actor::create("dvfs_test", simgrid::s4u::Host::by_name("MyHost2"), dvfs);
 
   e.run();
 
-  XBT_INFO("Total simulation time: %e", e.getClock());
+  XBT_INFO("Total simulation time: %e", e.get_clock());
 
   return 0;
 }