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
[CR] Minor improvement.
[simgrid.git]
/
src
/
surf
/
cpu_cas01.hpp
diff --git
a/src/surf/cpu_cas01.hpp
b/src/surf/cpu_cas01.hpp
index
7ef6cec
..
b5279e4
100644
(file)
--- a/
src/surf/cpu_cas01.hpp
+++ b/
src/surf/cpu_cas01.hpp
@@
-6,17
+6,17
@@
#ifndef SIMGRID_SURF_CPUCAS01_HPP
#define SIMGRID_SURF_CPUCAS01_HPP
#ifndef SIMGRID_SURF_CPUCAS01_HPP
#define SIMGRID_SURF_CPUCAS01_HPP
-#include "
cpu_interface
.hpp"
+#include "
src/kernel/resource/CpuImpl
.hpp"
#include "xbt/base.h"
#include "xbt/base.h"
-/***********
- * Classes *
- ***********/
-
namespace simgrid {
namespace kernel {
namespace resource {
namespace simgrid {
namespace kernel {
namespace resource {
+/***********
+ * Classes *
+ ***********/
+
class XBT_PRIVATE CpuCas01Model;
class XBT_PRIVATE CpuCas01;
class XBT_PRIVATE CpuCas01Action;
class XBT_PRIVATE CpuCas01Model;
class XBT_PRIVATE CpuCas01;
class XBT_PRIVATE CpuCas01Action;
@@
-27,29
+27,29
@@
class XBT_PRIVATE CpuCas01Action;
class CpuCas01Model : public CpuModel {
public:
class CpuCas01Model : public CpuModel {
public:
- explicit CpuCas01Model(
Model::UpdateAlgo algo
);
+ explicit CpuCas01Model(
const std::string& name
);
CpuCas01Model(const CpuCas01Model&) = delete;
CpuCas01Model& operator=(const CpuCas01Model&) = delete;
CpuCas01Model(const CpuCas01Model&) = delete;
CpuCas01Model& operator=(const CpuCas01Model&) = delete;
- ~CpuCas01Model() override;
- Cpu* create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate) override;
+ Cpu
Impl
* create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate) override;
};
/************
* Resource *
************/
};
/************
* Resource *
************/
-class CpuCas01 : public Cpu {
+class CpuCas01 : public CpuImpl {
+ std::function<s4u::Host::CpuFactorCb> factor_cb_ = {};
+
public:
public:
- CpuCas01(s4u::Host* host, const std::vector<double>& speed_per_pstate) : Cpu(host, speed_per_pstate) {}
+ using CpuImpl::CpuImpl;
CpuCas01(const CpuCas01&) = delete;
CpuCas01& operator=(const CpuCas01&) = delete;
void apply_event(profile::Event* event, double value) override;
CpuCas01(const CpuCas01&) = delete;
CpuCas01& operator=(const CpuCas01&) = delete;
void apply_event(profile::Event* event, double value) override;
- CpuAction* execution_start(double size) override;
- CpuAction* execution_start(double size, int requested_cores) override;
+ CpuAction* execution_start(double size
, double user_bound
) override;
+ CpuAction* execution_start(double size, int requested_cores
, double user_bound
) override;
CpuAction* sleep(double duration) override;
CpuAction* sleep(double duration) override;
-
- bool is_used() const override;
+ void set_factor_cb(const std::function<s4u::Host::CpuFactorCb>& cb) override;
protected:
void on_speed_change() override;
protected:
void on_speed_change() override;
@@
-59,19
+59,13
@@
protected:
* Action *
**********/
class CpuCas01Action : public CpuAction {
* Action *
**********/
class CpuCas01Action : public CpuAction {
- friend CpuAction* CpuCas01::execution_start(double size);
- friend CpuAction* CpuCas01::sleep(double duration);
+ int requested_core_ = 1;
public:
public:
- CpuCas01Action(Model* model, double cost, bool failed, double speed, lmm::Constraint* constraint,
- int requested_core = 1);
+ CpuCas01Action(Model* model, double cost, bool failed, double speed, lmm::Constraint* constraint, int requested_core);
CpuCas01Action(const CpuCas01Action&) = delete;
CpuCas01Action& operator=(const CpuCas01Action&) = delete;
CpuCas01Action(const CpuCas01Action&) = delete;
CpuCas01Action& operator=(const CpuCas01Action&) = delete;
- ~CpuCas01Action() override;
- int requested_core() const;
-
-private:
- int requested_core_ = 1;
+ int requested_core() const { return requested_core_; }
};
} // namespace resource
};
} // namespace resource