deprecate properly another function

[simgrid.git] / examples / msg / energy-pstate / energy-pstate.c

diff --git a/examples/msg/energy-pstate/energy-pstate.c b/examples/msg/energy-pstate/energy-pstate.c
index fc055b7..de0d0d1 100644 (file)
--- a/examples/msg/energy-pstate/energy-pstate.c
+++ b/examples/msg/energy-pstate/energy-pstate.c
@@ -8,7 +8,8 @@
 
 /** @addtogroup MSG_examples
  *
- * - <b>energy/e1/e1.c</b> Shows how a set of pstates can be defined for a host and how the current pstate can be
+ * - <b>energy-pstate/energy-pstate.c</b> Shows how a set of pstates can be defined for a host and how the current
+ * pstate can be
  *     accessed/changed with @ref MSG_get_host_current_power_peak and @ref  MSG_set_host_pstate.
  *     Make sure to read the platform XML file for details on how to declare the CPU capacity for each pstate.
  */
@@ -18,13 +19,12 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(test, "Pstate properties test");
 static int dvfs(int argc, char *argv[])
 {
   double workload = 100E6;
-  int new_peak_index=2;
   msg_host_t host = MSG_host_self();
 
   int nb = MSG_host_get_nb_pstates(host);
   XBT_INFO("Count of Processor states=%d", nb);
 
-  double current_peak = MSG_host_get_current_power_peak(host);
+  double current_peak = MSG_host_get_speed(host);
   XBT_INFO("Current power peak=%f", current_peak);
 
   // Run a task
@@ -36,17 +36,16 @@ static int dvfs(int argc, char *argv[])
   XBT_INFO("Task1 simulation time: %e", task_time);
 
   // Change power peak
-  if ((new_peak_index >= nb) || (new_peak_index < 0)){
-    XBT_INFO("Cannot set pstate %d, host supports only %d pstates", new_peak_index, nb);
-    return 0;
-  }
+  int new_pstate = 2;
+  xbt_assert(new_pstate < nb, "Cannot set the host %s at pstate %d because it only provides %d pstates.",
+             MSG_host_get_name(host), new_pstate, nb);
 
-  double peak_at = MSG_host_get_power_peak_at(host, new_peak_index);
-  XBT_INFO("Changing power peak value to %f (at index %d)", peak_at, new_peak_index);
+  double peak_at = MSG_host_get_power_peak_at(host, new_pstate);
+  XBT_INFO("Changing power peak value to %f (at index %d)", peak_at, new_pstate);
 
-  MSG_host_set_pstate(host, new_peak_index);
+  MSG_host_set_pstate(host, new_pstate);
 
-  current_peak = MSG_host_get_current_power_peak(host);
+  current_peak = MSG_host_get_speed(host);
   XBT_INFO("Current power peak=%f", current_peak);
 
   // Run a second task
@@ -62,15 +61,13 @@ static int dvfs(int argc, char *argv[])
   int nb2 = MSG_host_get_nb_pstates(host);
   XBT_INFO("Count of Processor states=%d", nb2);
 
-  double current_peak2 = MSG_host_get_current_power_peak(host);
+  double current_peak2 = MSG_host_get_speed(host);
   XBT_INFO("Current power peak=%f", current_peak2);
   return 0;
 }
 
 int main(int argc, char *argv[])
 {
-  msg_error_t res = MSG_OK;
-
   MSG_init(&argc, argv);
 
   xbt_assert(argc == 2, "Usage: %s platform_file\n\tExample: %s msg_platform.xml\n", argv[0], argv[0]);
@@ -80,7 +77,7 @@ int main(int argc, char *argv[])
   MSG_process_create("dvfs_test", dvfs, NULL, MSG_get_host_by_name("MyHost1"));
   MSG_process_create("dvfs_test", dvfs, NULL, MSG_get_host_by_name("MyHost2"));
 
-  res = MSG_main();
+  msg_error_t res = MSG_main();
 
   XBT_INFO("Total simulation time: %e", MSG_get_clock());