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
Merge branch 'surf++'
[simgrid.git]
/
include
/
smpi
/
smpi.h
diff --git
a/include/smpi/smpi.h
b/include/smpi/smpi.h
index
be167eb
..
3901734
100644
(file)
--- a/
include/smpi/smpi.h
+++ b/
include/smpi/smpi.h
@@
-685,15
+685,11
@@
XBT_PUBLIC(void) smpi_exit(int);
XBT_PUBLIC(void) smpi_execute_flops(double flops);
XBT_PUBLIC(void) smpi_execute(double duration);
XBT_PUBLIC(void) smpi_execute_flops(double flops);
XBT_PUBLIC(void) smpi_execute(double duration);
-XBT_PUBLIC(double) smpi_get_host_current_power_peak_(void);
-XBT_PUBLIC(int) smpi_get_host_nb_pstates_(void);
-XBT_PUBLIC(double) smpi_get_host_consumed_energy_(void);
-
XBT_PUBLIC(double) smpi_get_host_power_peak_at(int pstate_index);
XBT_PUBLIC(double) smpi_get_host_power_peak_at(int pstate_index);
-#define smpi_get_host_current_power_peak() smpi_get_host_current_power_peak_()
-#define smpi_get_host_nb_pstates() smpi_get_host_nb_pstates_()
+XBT_PUBLIC(double) smpi_get_host_current_power_peak(void);
+XBT_PUBLIC(int) smpi_get_host_nb_pstates(void);
XBT_PUBLIC(void) smpi_set_host_power_peak_at(int pstate_index);
XBT_PUBLIC(void) smpi_set_host_power_peak_at(int pstate_index);
-#define smpi_get_host_consumed_energy() smpi_get_host_consumed_energy_()
+XBT_PUBLIC(double) smpi_get_host_consumed_energy(void);
XBT_PUBLIC(unsigned int) smpi_sleep(unsigned int secs);
XBT_PUBLIC(int) smpi_gettimeofday(struct timeval *tv);
XBT_PUBLIC(unsigned int) smpi_sleep(unsigned int secs);
XBT_PUBLIC(int) smpi_gettimeofday(struct timeval *tv);