X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b3b356352e87ae00a20f737c48e19b0c8413455a..b5b953be4c43bad172a39f8917200ed84b534ec5:/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 8f928aeba3..5e1bd00f34 100644
--- a/examples/msg/energy/consumption/energy_consumption.c
+++ b/examples/msg/energy/consumption/energy_consumption.c
@@ -4,87 +4,66 @@
 /* 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 "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"
-#include "xbt/asserts.h"
+XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example");
 
-XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
-                             "Messages specific for this msg example");
-
-int dvfs(int argc, char *argv[]);
-
-
-int dvfs(int argc, char *argv[])
+static int dvfs(int argc, char *argv[])
 {
-  msg_host_t host = NULL;
-  msg_task_t task1 = NULL;
-  host = MSG_host_by_name("MyHost1");
+  msg_host_t host = MSG_host_by_name("MyHost1");
 
-
-  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));
+  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),
+           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,
-		  MSG_host_get_current_power_peak(host), MSG_host_get_consumed_energy(host));
+  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), sg_host_get_consumed_energy(host));
 
   // Run a task
   start = MSG_get_clock();
-  XBT_INFO("Run a task for 100E6 flops");
-  task1 = MSG_task_create ("t1", 100E6, 0, NULL);
+  msg_task_t 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_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));
+  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), 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);
-  XBT_INFO("========= Requesting pstate %d (speed should be of %.2f flop/s and is of %.2f flop/s)",
-		  pstate,
-		  MSG_host_get_power_peak_at(host, pstate),
-		  MSG_host_get_current_power_peak(host));
+  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();
-  XBT_INFO("Run a task for 100E6 flops");
   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_host_get_current_power_peak(host), MSG_host_get_consumed_energy(host));
+      MSG_get_clock()-start, 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,
-		  MSG_host_get_current_power_peak(host), MSG_host_get_consumed_energy(host));
+      MSG_get_clock()-start, 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.",
-		  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_get_current_power_peak(host), MSG_host_get_consumed_energy(host));
+      MSG_get_clock()-start, MSG_host_get_current_power_peak(host), sg_host_get_consumed_energy(host));
   return 0;
 }
 
@@ -94,18 +73,10 @@ int main(int argc, char *argv[])
   sg_energy_plugin_init();
   MSG_init(&argc, argv);
 
-  if (argc != 3) {
-    XBT_CRITICAL("Usage: %s platform_file deployment_file\n",
-              argv[0]);
-    XBT_CRITICAL
-        ("example: %s msg_platform.xml msg_deployment.xml\n",
-         argv[0]);
-    exit(1);
-  }
+  xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n"
+            "\tExample: %s msg_platform.xml msg_deployment.xml\n", argv[0], argv[0]);
 
   MSG_create_environment(argv[1]);
-
-  /*   Application deployment */
   MSG_function_register("dvfs_test", dvfs);
 
   MSG_launch_application(argv[2]);
@@ -114,9 +85,5 @@ int main(int argc, char *argv[])
 
   XBT_INFO("Total simulation time: %.2f", MSG_get_clock());
 
-  if (res == MSG_OK)
-    return 0;
-  else
-    return 1;
+  return res != MSG_OK;
 }
-