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
rename a test in order to easily select it
[simgrid.git]
/
src
/
surf
/
workstation_interface.hpp
diff --git
a/src/surf/workstation_interface.hpp
b/src/surf/workstation_interface.hpp
index
967f2e4
..
63943e4
100644
(file)
--- a/
src/surf/workstation_interface.hpp
+++ b/
src/surf/workstation_interface.hpp
@@
-101,15
+101,15
@@
public:
*
* @param workstation_nb [description]
* @param workstation_list [description]
*
* @param workstation_nb [description]
* @param workstation_list [description]
- * @param
computation
_amount [description]
- * @param
communication
_amount [description]
+ * @param
flops
_amount [description]
+ * @param
bytes
_amount [description]
* @param rate [description]
* @return [description]
*/
virtual ActionPtr executeParallelTask(int workstation_nb,
void **workstation_list,
* @param rate [description]
* @return [description]
*/
virtual ActionPtr executeParallelTask(int workstation_nb,
void **workstation_list,
- double *
computation
_amount,
- double *
communication
_amount,
+ double *
flops
_amount,
+ double *
bytes
_amount,
double rate)=0;
/**
double rate)=0;
/**
@@
-137,7
+137,7
@@
public:
class Workstation : public Resource {
public:
/**
class Workstation : public Resource {
public:
/**
- * @brief Workstation cons
rt
uctor
+ * @brief Workstation cons
tr
uctor
*/
Workstation();
*/
Workstation();
@@
-186,11
+186,11
@@
public:
/**
* @brief Execute some quantity of computation
*
/**
* @brief Execute some quantity of computation
*
- * @param
size
The value of the processing amount (in flop) needed to process
+ * @param
flops_amount
The value of the processing amount (in flop) needed to process
* @return The CpuAction corresponding to the processing
* @see Cpu
*/
* @return The CpuAction corresponding to the processing
* @see Cpu
*/
- virtual ActionPtr execute(double
size
)=0;
+ virtual ActionPtr execute(double
flops_amount
)=0;
/**
* @brief Make a process sleep for duration seconds
/**
* @brief Make a process sleep for duration seconds
@@
-237,7
+237,8
@@
public:
virtual double getPowerPeakAt(int pstate_index);
virtual int getNbPstates();
virtual double getPowerPeakAt(int pstate_index);
virtual int getNbPstates();
- virtual void setPowerPeakAt(int pstate_index);
+ virtual void setPstate(int pstate_index);
+ virtual int getPstate();
/**
* @brief Return the storage of corresponding mount point
/**
* @brief Return the storage of corresponding mount point