-/* Copyright (c) 2007-2010, 2013. 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
#include<stdio.h>
-#include "msg/msg.h"
+#include "simgrid/msg.h"
#include "xbt/sysdep.h" /* calloc */
+#include "simgrid/plugins.h"
/* Create a log channel to have nice outputs. */
#include "xbt/log.h"
MSG_process_sleep(sleep_task);
task_time = MSG_get_clock() - task_time;
- XBT_INFO("Process %s executed task sleep cpu=%lf, duration = %lf",
+ XBT_INFO("Process %s executed task sleep cpu=%f, duration = %f",
MSG_process_get_name(MSG_process_self()), 0.0, task_time);
XBT_INFO("==================================================");
}
MSG_task_destroy(task1);
task_time = MSG_get_clock() - task_time;
- XBT_INFO("Process %s executed task cpu=%lf, duration = %lf",
+ XBT_INFO("Process %s executed task cpu=%f, duration = %f",
MSG_process_get_name(MSG_process_self()), cpu_task, task_time);
XBT_INFO("==================================================");
return 0;
double task_time = 0;
host = MSG_host_self();
- double current_peak = MSG_get_host_current_power_peak(host);
+ double current_peak = MSG_host_get_current_power_peak(host);
- XBT_INFO("Current power peak=%lf", current_peak);
- double consumed_energy = MSG_get_host_consumed_energy(host);
- XBT_INFO("Total energy (Joules): %lf", consumed_energy);
+ XBT_INFO("Current power peak=%f", current_peak);
+ double consumed_energy = MSG_host_get_consumed_energy(host);
+ XBT_INFO("Total energy (Joules): %f", consumed_energy);
// Process 1 - long CPU task
int argc1 = 1;
MSG_process_sleep(8);
task_time = MSG_get_clock() - task_time;
- XBT_INFO("Task simulation time: %le", task_time);
- consumed_energy = MSG_get_host_consumed_energy(host);
- XBT_INFO("Total energy (Joules): %lf", consumed_energy);
+ XBT_INFO("Task simulation time: %e", task_time);
+ consumed_energy = MSG_host_get_consumed_energy(host);
+ XBT_INFO("Total energy (Joules): %f", consumed_energy);
return 0;
}
int main(int argc, char *argv[])
{
msg_error_t res = MSG_OK;
-
+ sg_energy_plugin_init();
MSG_init(&argc, argv);
if (argc != 3) {
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;