Merge branch 'master' of github.com:mquinson/simgrid

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

diff --git a/examples/msg/energy/pstate/pstate.c b/examples/msg/energy/pstate/pstate.c
index bfbb0c0..4594747 100644 (file)
--- a/examples/msg/energy/pstate/pstate.c
+++ b/examples/msg/energy/pstate/pstate.c
@@ -1,10 +1,10 @@
-/* Copyright (c) 2007-2010, 2013-2014. The SimGrid Team.
+/* Copyright (c) 2007-2010, 2013-2015. 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 "simgrid/msg.h"
 #include "xbt/sysdep.h"         /* calloc */
 
 /* Create a log channel to have nice outputs. */
@@ -17,7 +17,7 @@
  * - <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 accessed/changed
  *             with @ref MSG_get_host_current_power_peak and @ref
- *             MSG_set_host_power_peak_at.
+ *             MSG_set_host_pstate.
  *             Make sure to read the platform XML file for details on how
  *             to declare the CPU capacity for each pstate.
  *
@@ -38,8 +38,8 @@ int dvfs(int argc, char *argv[])
   int new_peak_index=2;
   host = MSG_host_self();; //MSG_get_host_by_name("MyHost1");
 
-  int nb = MSG_host_get_pstate_number(host);
-  XBT_INFO("Number of Processor states=%d", nb);
+  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);
   XBT_INFO("Current power peak=%f", current_peak);
@@ -77,9 +77,9 @@ int dvfs(int argc, char *argv[])
 
 
   // Verify the default pstate is set to 0
-  host = MSG_get_host_by_name("MyHost2");
-  int nb2 = MSG_host_get_pstate_number(host);
-  XBT_INFO("Number of Processor states=%d", nb2);
+  host = MSG_host_by_name("MyHost2");
+  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);
   XBT_INFO("Current power peak=%f", current_peak2);