partially fix the energy public API (massive renames ongoing)

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

diff --git a/examples/msg/energy/e2/e2.c b/examples/msg/energy/e2/e2.c
index ee19dd8..8ba1d79 100644 (file)
--- a/examples/msg/energy/e2/e2.c
+++ b/examples/msg/energy/e2/e2.c
@@ -30,14 +30,14 @@ int dvfs(int argc, char *argv[])
   XBT_INFO("Energetic profile: %s",
                  MSG_host_get_property_value(host,"watt_per_state"));
   XBT_INFO("Initial power peak=%.0E flop/s; Consumed energy (Joules)=%.0E J",
-                 MSG_get_host_current_power_peak(host), MSG_get_host_consumed_energy(host));
+                 MSG_host_get_current_power_peak(host), MSG_host_get_consumed_energy(host));
 
   double start = MSG_get_clock();
   XBT_INFO("Sleep for 10 seconds");
   MSG_process_sleep(10);
   XBT_INFO("Done sleeping (duration: %.2f s). Current power peak=%.0E; Current consumed energy=%.2f J",
                  MSG_get_clock()-start,
-                 MSG_get_host_current_power_peak(host), MSG_get_host_consumed_energy(host));
+                 MSG_host_get_current_power_peak(host), MSG_host_get_consumed_energy(host));
 
   // Run a task
   start = MSG_get_clock();
@@ -47,15 +47,15 @@ int dvfs(int argc, char *argv[])
   MSG_task_destroy(task1);
   XBT_INFO("Task done (duration: %.2f s). Current power peak=%.0E flop/s; Current consumed energy=%.0f J",
                  MSG_get_clock()-start,
-                 MSG_get_host_current_power_peak(host), MSG_get_host_consumed_energy(host));
+                 MSG_host_get_current_power_peak(host), MSG_host_get_consumed_energy(host));
 
   // ========= Change power peak =========
   int pstate=2;
-  MSG_set_host_power_peak_at(host, pstate);
+  MSG_host_set_pstate(host, pstate);
   XBT_INFO("========= Requesting pstate %d (power should be of %.2f flop/s and is of %.2f flop/s",
                  pstate,
-                 MSG_get_host_power_peak_at(host, pstate),
-                 MSG_get_host_current_power_peak(host));
+                 MSG_host_get_power_peak_at(host, pstate),
+                 MSG_host_get_current_power_peak(host));
 
   // Run a second task
   start = MSG_get_clock();
@@ -65,14 +65,14 @@ int dvfs(int argc, char *argv[])
   MSG_task_destroy(task1);
   XBT_INFO("Task done (duration: %.2f s). Current power peak=%.0E flop/s; Current consumed energy=%.0f J",
                  MSG_get_clock()-start,
-                 MSG_get_host_current_power_peak(host), MSG_get_host_consumed_energy(host));
+                 MSG_host_get_current_power_peak(host), MSG_host_get_consumed_energy(host));
 
   start = MSG_get_clock();
   XBT_INFO("Sleep for 10 seconds");
   MSG_process_sleep(4);
   XBT_INFO("Done sleeping (duration: %.2f s). Current power peak=%.0E flop/s; Current consumed energy=%.0f J",
                  MSG_get_clock()-start,
-                 MSG_get_host_current_power_peak(host), MSG_get_host_consumed_energy(host));
+                 MSG_host_get_current_power_peak(host), MSG_host_get_consumed_energy(host));
 
   return 0;
 }