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 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
include
/
surf
/
surf.h
diff --git
a/src/include/surf/surf.h
b/src/include/surf/surf.h
index
0ddc491
..
fd80b13
100644
(file)
--- a/
src/include/surf/surf.h
+++ b/
src/include/surf/surf.h
@@
-622,6
+622,8
@@
XBT_PUBLIC(int) surf_workstation_get_nb_pstates(surf_resource_t host);
XBT_PUBLIC(void) surf_workstation_set_pstate(surf_resource_t host, int pstate_index);
XBT_PUBLIC(int) surf_workstation_get_pstate(surf_resource_t host);
XBT_PUBLIC(void) surf_workstation_set_pstate(surf_resource_t host, int pstate_index);
XBT_PUBLIC(int) surf_workstation_get_pstate(surf_resource_t host);
+XBT_PUBLIC(double) surf_workstation_get_wattmin_at(surf_resource_t resource, int pstate);
+XBT_PUBLIC(double) surf_workstation_get_wattmax_at(surf_resource_t resource, int pstate);
/**
* @brief Get the consumed energy (in joules) of a workstation
/**
* @brief Get the consumed energy (in joules) of a workstation
@@
-1227,7
+1229,7
@@
XBT_PUBLIC_DATA(xbt_dynar_t) host_that_restart;
/** \ingroup SURF_simulation
* \brief List of hosts for which one want to be notified if they ever restart.
*/
/** \ingroup SURF_simulation
* \brief List of hosts for which one want to be notified if they ever restart.
*/
-XBT_PUBLIC(xbt_dict_t) watched_hosts_lib;
+XBT_PUBLIC
_DATA
(xbt_dict_t) watched_hosts_lib;
/*******************************************/
/*** SURF Platform *************************/
/*******************************************/
/*** SURF Platform *************************/