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
nothing to see here.
[simgrid.git]
/
src
/
smpi
/
smpi_dvfs.cpp
diff --git
a/src/smpi/smpi_dvfs.cpp
b/src/smpi/smpi_dvfs.cpp
index
efd24c3
..
c5910cb
100644
(file)
--- a/
src/smpi/smpi_dvfs.cpp
+++ b/
src/smpi/smpi_dvfs.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2013-201
5
. The SimGrid Team.
+/* Copyright (c) 2013-201
7
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-35,7
+35,7
@@
double smpi_get_host_power_peak_at(int pstate_index)
*/
double smpi_get_host_current_power_peak()
{
*/
double smpi_get_host_current_power_peak()
{
- return SIMIX_host_self()->
getPstateSpeedCurrent
();
+ return SIMIX_host_self()->
speed
();
}
/**
}
/**
@@
-73,10
+73,8
@@
double smpi_get_host_consumed_energy() {
#if defined(__alpha__) || defined(__sparc64__) || defined(__x86_64__) || defined(__ia64__)
typedef int integer;
#if defined(__alpha__) || defined(__sparc64__) || defined(__x86_64__) || defined(__ia64__)
typedef int integer;
-typedef unsigned int uinteger;
#else
typedef long int integer;
#else
typedef long int integer;
-typedef unsigned long int uinteger;
#endif
typedef char *address;
typedef short int shortint;
#endif
typedef char *address;
typedef short int shortint;