A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
turns out %le=%e and %lf=%f ... except on windows
[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
93db851
..
d0ea20b
100644
(file)
--- a/
examples/msg/energy/e2/e2.c
+++ b/
examples/msg/energy/e2/e2.c
@@
-1,3
+1,4
@@
+
/* Copyright (c) 2007-2010, 2013. The SimGrid Team.
* All rights reserved. */
/* Copyright (c) 2007-2010, 2013. The SimGrid Team.
* All rights reserved. */
@@
-28,10
+29,10
@@
int dvfs(int argc, char *argv[])
double current_peak = MSG_get_host_current_power_peak(host);
double current_peak = MSG_get_host_current_power_peak(host);
- XBT_INFO("Current power peak=%
l
f", current_peak);
+ XBT_INFO("Current power peak=%f", current_peak);
double consumed_energy = MSG_get_host_consumed_energy(host);
double consumed_energy = MSG_get_host_consumed_energy(host);
- XBT_INFO("Total energy (Joules): %
l
f", consumed_energy);
+ XBT_INFO("Total energy (Joules): %f", consumed_energy);
// Run a task
task1 = MSG_task_create ("t1", 100E6, 0, NULL);
// Run a task
task1 = MSG_task_create ("t1", 100E6, 0, NULL);
@@
-39,14
+40,14
@@
int dvfs(int argc, char *argv[])
MSG_task_destroy(task1);
task_time = MSG_get_clock();
MSG_task_destroy(task1);
task_time = MSG_get_clock();
- XBT_INFO("Task1 simulation time: %
l
e", task_time);
+ XBT_INFO("Task1 simulation time: %e", task_time);
consumed_energy = MSG_get_host_consumed_energy(host);
consumed_energy = MSG_get_host_consumed_energy(host);
- XBT_INFO("Total energy (Joules): %
l
f", consumed_energy);
+ XBT_INFO("Total energy (Joules): %f", consumed_energy);
// ========= Change power peak =========
int peak_index=2;
double peak_at = MSG_get_host_power_peak_at(host, peak_index);
// ========= Change power peak =========
int peak_index=2;
double peak_at = MSG_get_host_power_peak_at(host, peak_index);
- XBT_INFO("=========Changing power peak value to %
l
f (at index %d)", peak_at, peak_index);
+ XBT_INFO("=========Changing power peak value to %f (at index %d)", peak_at, peak_index);
MSG_set_host_power_peak_at(host, peak_index);
MSG_set_host_power_peak_at(host, peak_index);
@@
-56,18
+57,18
@@
int dvfs(int argc, char *argv[])
MSG_task_destroy(task1);
task_time = MSG_get_clock() - task_time;
MSG_task_destroy(task1);
task_time = MSG_get_clock() - task_time;
- XBT_INFO("Task2 simulation time: %
l
e", task_time);
+ XBT_INFO("Task2 simulation time: %e", task_time);
consumed_energy = MSG_get_host_consumed_energy(host);
consumed_energy = MSG_get_host_consumed_energy(host);
- XBT_INFO("Total energy (Joules): %
l
f", consumed_energy);
+ XBT_INFO("Total energy (Joules): %f", consumed_energy);
MSG_process_sleep(3);
task_time = MSG_get_clock() - task_time;
MSG_process_sleep(3);
task_time = MSG_get_clock() - task_time;
- XBT_INFO("Task3 (sleep) simulation time: %
l
e", task_time);
+ XBT_INFO("Task3 (sleep) simulation time: %e", task_time);
consumed_energy = MSG_get_host_consumed_energy(host);
consumed_energy = MSG_get_host_consumed_energy(host);
- XBT_INFO("Total energy (Joules): %
l
f", consumed_energy);
+ XBT_INFO("Total energy (Joules): %f", consumed_energy);
return 0;
return 0;
@@
-97,7
+98,7
@@
int main(int argc, char *argv[])
res = MSG_main();
res = MSG_main();
- XBT_INFO("Total simulation time: %
l
e", MSG_get_clock());
+ XBT_INFO("Total simulation time: %e", MSG_get_clock());
if (res == MSG_OK)
return 0;
if (res == MSG_OK)
return 0;