Fix #include

[simgrid.git] / examples / msg / energy / consumption / energy_consumption.c

diff --git a/examples/msg/energy/consumption/energy_consumption.c b/examples/msg/energy/consumption/energy_consumption.c
index 45027a8..4203820 100644 (file)
--- a/examples/msg/energy/consumption/energy_consumption.c
+++ b/examples/msg/energy/consumption/energy_consumption.c
@@ -1,14 +1,14 @@
-/* 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. */
 
  * 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<stdio.h>
+#include <stdio.h>

 
 #include "simgrid/msg.h"
 #include "xbt/sysdep.h"         /* calloc */
 
 #include "simgrid/msg.h"
 #include "xbt/sysdep.h"         /* calloc */

-#include "simgrid/plugins.h"
+#include "simgrid/plugins/energy.h"

 
 /* Create a log channel to have nice outputs. */
 #include "xbt/log.h"
 
 /* Create a log channel to have nice outputs. */
 #include "xbt/log.h"


@@ -30,61 +30,61 @@ int dvfs(int argc, char *argv[])
   XBT_INFO("Energetic profile: %s",
                  MSG_host_get_property_value(host,"watt_per_state"));
   XBT_INFO("Initial peak speed=%.0E flop/s; Energy dissipated =%.0E J",
   XBT_INFO("Energetic profile: %s",
                  MSG_host_get_property_value(host,"watt_per_state"));
   XBT_INFO("Initial peak speed=%.0E flop/s; Energy dissipated =%.0E J",

-                 MSG_host_get_current_power_peak(host), MSG_host_get_consumed_energy(host));
+                 MSG_host_get_current_power_peak(host), sg_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 peak speed=%.0E; Energy dissipated=%.2f J",
                  MSG_get_clock()-start,
 
   double start = MSG_get_clock();
   XBT_INFO("Sleep for 10 seconds");
   MSG_process_sleep(10);
   XBT_INFO("Done sleeping (duration: %.2f s). Current peak speed=%.0E; Energy dissipated=%.2f J",
                  MSG_get_clock()-start,

-                 MSG_host_get_current_power_peak(host), MSG_host_get_consumed_energy(host));
+                 MSG_host_get_current_power_peak(host), sg_host_get_consumed_energy(host));

 
   // Run a task
   start = MSG_get_clock();
 
   // Run a task
   start = MSG_get_clock();

-  XBT_INFO("Run a task for 100E6 flops");

   task1 = MSG_task_create ("t1", 100E6, 0, NULL);
   task1 = MSG_task_create ("t1", 100E6, 0, NULL);

+  XBT_INFO("Run a task of %.0E flops",MSG_task_get_flops_amount(task1));

   MSG_task_execute (task1);
   MSG_task_destroy(task1);
   XBT_INFO("Task done (duration: %.2f s). Current peak speed=%.0E flop/s; Current consumption: from %.0fW to %.0fW depending on load; Energy dissipated=%.0f J",
                  MSG_get_clock()-start,
   MSG_task_execute (task1);
   MSG_task_destroy(task1);
   XBT_INFO("Task done (duration: %.2f s). Current peak speed=%.0E flop/s; Current consumption: from %.0fW to %.0fW depending on load; Energy dissipated=%.0f J",
                  MSG_get_clock()-start,

-                 MSG_host_get_current_power_peak(host), MSG_host_get_wattmin_at(host,MSG_host_get_pstate(host)),
-                 MSG_host_get_wattmax_at(host,MSG_host_get_pstate(host)),
-                 MSG_host_get_consumed_energy(host));
+                 MSG_host_get_current_power_peak(host), sg_host_get_wattmin_at(host,MSG_host_get_pstate(host)),
+                 sg_host_get_wattmax_at(host,MSG_host_get_pstate(host)),
+                 sg_host_get_consumed_energy(host));

 
   // ========= Change power peak =========
   int pstate=2;
   MSG_host_set_pstate(host, pstate);
 
   // ========= Change power peak =========
   int pstate=2;
   MSG_host_set_pstate(host, pstate);

-  XBT_INFO("========= Requesting pstate %d (speed should be of %.2f flop/s and is of %.2f flop/s)",
+  XBT_INFO("========= Requesting pstate %d (speed should be of %.0E flop/s and is of %.0E flop/s)",

                  pstate,
                  MSG_host_get_power_peak_at(host, pstate),
                  MSG_host_get_current_power_peak(host));
 
   // Run a second task
   start = MSG_get_clock();
                  pstate,
                  MSG_host_get_power_peak_at(host, pstate),
                  MSG_host_get_current_power_peak(host));
 
   // Run a second task
   start = MSG_get_clock();

-  XBT_INFO("Run a task for 100E6 flops");

   task1 = MSG_task_create ("t2", 100E6, 0, NULL);
   task1 = MSG_task_create ("t2", 100E6, 0, NULL);

+  XBT_INFO("Run a task of %.0E flops",MSG_task_get_flops_amount(task1));

   MSG_task_execute (task1);
   MSG_task_destroy(task1);
   XBT_INFO("Task done (duration: %.2f s). Current peak speed=%.0E flop/s; Energy dissipated=%.0f J",
                  MSG_get_clock()-start,
   MSG_task_execute (task1);
   MSG_task_destroy(task1);
   XBT_INFO("Task done (duration: %.2f s). Current peak speed=%.0E flop/s; Energy dissipated=%.0f J",
                  MSG_get_clock()-start,

-                 MSG_host_get_current_power_peak(host), MSG_host_get_consumed_energy(host));
+                 MSG_host_get_current_power_peak(host), sg_host_get_consumed_energy(host));

 
   start = MSG_get_clock();
   XBT_INFO("Sleep for 4 seconds");
   MSG_process_sleep(4);
   XBT_INFO("Done sleeping (duration: %.2f s). Current peak speed=%.0E flop/s; Energy dissipated=%.0f J",
                  MSG_get_clock()-start,
 
   start = MSG_get_clock();
   XBT_INFO("Sleep for 4 seconds");
   MSG_process_sleep(4);
   XBT_INFO("Done sleeping (duration: %.2f s). Current peak speed=%.0E flop/s; Energy dissipated=%.0f J",
                  MSG_get_clock()-start,

-                 MSG_host_get_current_power_peak(host), MSG_host_get_consumed_energy(host));
+                 MSG_host_get_current_power_peak(host), sg_host_get_consumed_energy(host));

 
   // =========== Turn the other host off ==========
   XBT_INFO("Turning MyHost2 off, and sleeping another 10 seconds. MyHost2 dissipated %.0f J so far.",
 
   // =========== Turn the other host off ==========
   XBT_INFO("Turning MyHost2 off, and sleeping another 10 seconds. MyHost2 dissipated %.0f J so far.",

-                 MSG_host_get_consumed_energy(MSG_host_by_name("MyHost2")) );
+                 sg_host_get_consumed_energy(MSG_host_by_name("MyHost2")) );

   MSG_host_off(MSG_host_by_name("MyHost2"));
   start = MSG_get_clock();
   MSG_process_sleep(10);
   XBT_INFO("Done sleeping (duration: %.2f s). Current peak speed=%.0E flop/s; Energy dissipated=%.0f J",
                  MSG_get_clock()-start,
   MSG_host_off(MSG_host_by_name("MyHost2"));
   start = MSG_get_clock();
   MSG_process_sleep(10);
   XBT_INFO("Done sleeping (duration: %.2f s). Current peak speed=%.0E flop/s; Energy dissipated=%.0f J",
                  MSG_get_clock()-start,

-                 MSG_host_get_current_power_peak(host), MSG_host_get_consumed_energy(host));
+                 MSG_host_get_current_power_peak(host), sg_host_get_consumed_energy(host));

   return 0;
 }
 
   return 0;
 }