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
clang asks for override here ...
[simgrid.git]
/
src
/
surf
/
cpu_interface.hpp
diff --git
a/src/surf/cpu_interface.hpp
b/src/surf/cpu_interface.hpp
index
5e9e7a0
..
82763d4
100644
(file)
--- a/
src/surf/cpu_interface.hpp
+++ b/
src/surf/cpu_interface.hpp
@@
-20,16
+20,7
@@
namespace surf {
class CpuModel;
class Cpu;
class CpuAction;
class CpuModel;
class Cpu;
class CpuAction;
-class CpuPlugin;
-
-/*************
- * Callbacks *
- *************/
-XBT_PUBLIC(std::list<Cpu*>) getActionCpus(CpuAction *action);
-
-/*********
- * Model *
- *********/
+class CpuPlugin;// FIXME:DEADCODE
/** @ingroup SURF_cpu_interface
* @brief SURF cpu model interface class
/** @ingroup SURF_cpu_interface
* @brief SURF cpu model interface class
@@
-157,9
+148,9
@@
XBT_PUBLIC_CLASS CpuAction : public simgrid::surf::Action {
friend XBT_PUBLIC(Cpu*) getActionCpu(CpuAction *action);
public:
/** @brief Callbacks handler which emit the callbacks after CpuAction State changed *
friend XBT_PUBLIC(Cpu*) getActionCpu(CpuAction *action);
public:
/** @brief Callbacks handler which emit the callbacks after CpuAction State changed *
- * @details Callback functions have the following signature: `void(CpuAction *action,
e_surf_action_state_t
previous)`
+ * @details Callback functions have the following signature: `void(CpuAction *action,
simgrid::surf::Action::State
previous)`
*/
*/
- static simgrid::xbt::signal<void(simgrid::surf::CpuAction*,
e_surf_action_state_t
)> onStateChange;
+ static simgrid::xbt::signal<void(simgrid::surf::CpuAction*,
simgrid::surf::Action::State
)> onStateChange;
CpuAction(simgrid::surf::Model *model, double cost, bool failed)
: Action(model, cost, failed) {} //FIXME:DEADCODE?
CpuAction(simgrid::surf::Model *model, double cost, bool failed)
: Action(model, cost, failed) {} //FIXME:DEADCODE?
@@
-169,9
+160,10
@@
public:
/** @brief Set the affinity of the current CpuAction */
virtual void setAffinity(Cpu *cpu, unsigned long mask);
/** @brief Set the affinity of the current CpuAction */
virtual void setAffinity(Cpu *cpu, unsigned long mask);
- void setState(
e_surf_action_state_t state)
;
+ void setState(
simgrid::surf::Action::State state) override
;
- void updateRemainingLazy(double now);
+ void updateRemainingLazy(double now) override;
+ std::list<Cpu*> cpus();
};
}
};
}