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
make k:r:Cpu::speed_per_pstate_ private as it should
[simgrid.git]
/
src
/
surf
/
cpu_cas01.cpp
diff --git
a/src/surf/cpu_cas01.cpp
b/src/surf/cpu_cas01.cpp
index
926ff85
..
7f5c672
100644
(file)
--- a/
src/surf/cpu_cas01.cpp
+++ b/
src/surf/cpu_cas01.cpp
@@
-90,15
+90,7
@@
CpuCas01::CpuCas01(CpuCas01Model* model, simgrid::s4u::Host* host, std::vector<d
{
}
-CpuCas01::~CpuCas01()
-{
- if (get_model() == surf_cpu_model_pm)
- speedPerPstate_.clear();
-}
-
-std::vector<double> * CpuCas01::getSpeedPeakList(){
- return &speedPerPstate_;
-}
+CpuCas01::~CpuCas01() = default;
bool CpuCas01::is_used()
{
@@
-111,7
+103,7
@@
void CpuCas01::onSpeedChange() {
const kernel::lmm::Element* elem = nullptr;
get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(),
-
coresAmount_
* speed_.scale * speed_.peak);
+
get_cores_count()
* speed_.scale * speed_.peak);
while ((var = get_constraint()->get_variable(&elem))) {
CpuCas01Action* action = static_cast<CpuCas01Action*>(var->get_id());
@@
-126,19
+118,19
@@
void CpuCas01::apply_event(tmgr_trace_event_t event, double value)
{
if (event == speed_.event) {
/* TODO (Hypervisor): do the same thing for constraint_core[i] */
- xbt_assert(
coresAmount_
== 1, "FIXME: add speed scaling code also for constraint_core[i]");
+ xbt_assert(
get_cores_count()
== 1, "FIXME: add speed scaling code also for constraint_core[i]");
speed_.scale = value;
onSpeedChange();
tmgr_trace_event_unref(&speed_.event);
- } else if (event == state
E
vent_) {
+ } else if (event == state
_e
vent_) {
/* TODO (Hypervisor): do the same thing for constraint_core[i] */
- xbt_assert(
coresAmount_
== 1, "FIXME: add state change code also for constraint_core[i]");
+ xbt_assert(
get_cores_count()
== 1, "FIXME: add state change code also for constraint_core[i]");
if (value > 0) {
if (is_off())
- host_that_restart.push_back(get
H
ost());
+ host_that_restart.push_back(get
_h
ost());
turn_on();
} else {
kernel::lmm::Constraint* cnst = get_constraint();
@@
-159,7
+151,7
@@
void CpuCas01::apply_event(tmgr_trace_event_t event, double value)
}
}
}
- tmgr_trace_event_unref(&state
E
vent_);
+ tmgr_trace_event_unref(&state
_e
vent_);
} else {
xbt_die("Unknown event!\n");
@@
-188,12
+180,8
@@
CpuAction *CpuCas01::sleep(double duration)
// FIXME: sleep variables should not consume 1.0 in System::expand()
action->set_max_duration(duration);
action->suspended_ = kernel::resource::Action::SuspendStates::sleeping;
- if (duration < 0) { // NO_MAX_DURATION
- /* Move to the *end* of the corresponding action set. This convention is used to speed up update_resource_state */
- simgrid::xbt::intrusive_erase(*action->get_state_set(), *action);
- action->state_set_ = &static_cast<CpuCas01Model*>(get_model())->cpuRunningActionSetThatDoesNotNeedBeingChecked_;
- action->get_state_set()->push_back(*action);
- }
+ if (duration < 0) // NO_MAX_DURATION
+ action->set_state(simgrid::kernel::resource::Action::State::IGNORED);
get_model()->get_maxmin_system()->update_variable_weight(action->get_variable(), 0.0);
if (get_model()->get_update_algorithm() == kernel::resource::Model::UpdateAlgo::Lazy) { // remove action from the heap