partially fix the energy public API (massive renames ongoing)

[simgrid.git] / examples / msg / energy / e1 / e1.c

diff --git a/examples/msg/energy/e1/e1.c b/examples/msg/energy/e1/e1.c
index ae2425d..bfbb0c0 100644 (file)
--- a/examples/msg/energy/e1/e1.c
+++ b/examples/msg/energy/e1/e1.c
@@ -1,8 +1,9 @@
-/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2007-2010, 2013-2014. 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. */
+
 #include "msg/msg.h"
 #include "xbt/sysdep.h"         /* calloc */
 
@@ -37,11 +38,11 @@ int dvfs(int argc, char *argv[])
   int new_peak_index=2;
   host = MSG_host_self();; //MSG_get_host_by_name("MyHost1");
 
-  int nb = MSG_get_host_nb_pstates(host);
+  int nb = MSG_host_get_pstate_number(host);
   XBT_INFO("Number of Processor states=%d", nb);
 
-  double current_peak = MSG_get_host_current_power_peak(host);
-  XBT_INFO("Current power peak=%lf", current_peak);
+  double current_peak = MSG_host_get_current_power_peak(host);
+  XBT_INFO("Current power peak=%f", current_peak);
 
   // Run a task
   task1 = MSG_task_create ("t1", workload, 0, NULL);
@@ -49,7 +50,7 @@ int dvfs(int argc, char *argv[])
   MSG_task_destroy(task1);
 
   task_time = MSG_get_clock();
-  XBT_INFO("Task1 simulation time: %le", task_time);
+  XBT_INFO("Task1 simulation time: %e", task_time);
 
   // Change power peak
   if ((new_peak_index >= nb) || (new_peak_index < 0))
@@ -58,13 +59,13 @@ int dvfs(int argc, char *argv[])
          return 0;
          }
 
-  double peak_at = MSG_get_host_power_peak_at(host, new_peak_index);
-  XBT_INFO("Changing power peak value to %lf (at index %d)", peak_at, new_peak_index);
+  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);
 
-  MSG_set_host_power_peak_at(host, new_peak_index);
+  MSG_host_set_pstate(host, new_peak_index);
 
-  current_peak = MSG_get_host_current_power_peak(host);
-  XBT_INFO("Current power peak=%lf", current_peak);
+  current_peak = MSG_host_get_current_power_peak(host);
+  XBT_INFO("Current power peak=%f", current_peak);
 
   // Run a second task
   task1 = MSG_task_create ("t1", workload, 0, NULL);
@@ -72,16 +73,16 @@ int dvfs(int argc, char *argv[])
   MSG_task_destroy(task1);
 
   task_time = MSG_get_clock() - task_time;
-  XBT_INFO("Task2 simulation time: %le", task_time);
+  XBT_INFO("Task2 simulation time: %e", task_time);
 
 
   // Verify the default pstate is set to 0
   host = MSG_get_host_by_name("MyHost2");
-  int nb2 = MSG_get_host_nb_pstates(host);
+  int nb2 = MSG_host_get_pstate_number(host);
   XBT_INFO("Number of Processor states=%d", nb2);
 
-  double current_peak2 = MSG_get_host_current_power_peak(host);
-  XBT_INFO("Current power peak=%lf", current_peak2);
+  double current_peak2 = MSG_host_get_current_power_peak(host);
+  XBT_INFO("Current power peak=%f", current_peak2);
   return 0;
 }
 
@@ -109,7 +110,7 @@ int main(int argc, char *argv[])
 
   res = MSG_main();
 
-  XBT_INFO("Total simulation time: %le", MSG_get_clock());
+  XBT_INFO("Total simulation time: %e", MSG_get_clock());
 
   if (res == MSG_OK)
     return 0;