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
cleanups
[simgrid.git]
/
src
/
surf
/
cpu_cas01.cpp
diff --git
a/src/surf/cpu_cas01.cpp
b/src/surf/cpu_cas01.cpp
index
48ba787
..
9694417
100644
(file)
--- a/
src/surf/cpu_cas01.cpp
+++ b/
src/surf/cpu_cas01.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2009-20
19
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-20
21
. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
@@
-10,7
+10,7
@@
#include "src/surf/surf_interface.hpp"
#include "surf/surf.hpp"
#include "src/surf/surf_interface.hpp"
#include "surf/surf.hpp"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(
surf_cpu_cas, surf_cpu, "Logging specific to the SURF CPU module
");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(
cpu_cas, res_cpu, "CPU resource, CAS01 model (used by default)
");
/***********
* Options *
/***********
* Options *
@@
-19,7
+19,7
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_cas, surf_cpu, "Logging specific to the
static simgrid::config::Flag<std::string>
cpu_optim_opt("cpu/optim", "Optimization algorithm to use for CPU resources. ", "Lazy",
static simgrid::config::Flag<std::string>
cpu_optim_opt("cpu/optim", "Optimization algorithm to use for CPU resources. ", "Lazy",
- std::map<std::string, std::string>({
+ std::map<std::string, std::string
, std::less<>
>({
{"Lazy", "Lazy action management (partial invalidation in lmm + heap in action remaining)."},
{"TI", "Trace integration. Highly optimized mode when using availability traces (only available "
"for the Cas01 CPU model for now)."},
{"Lazy", "Lazy action management (partial invalidation in lmm + heap in action remaining)."},
{"TI", "Trace integration. Highly optimized mode when using availability traces (only available "
"for the Cas01 CPU model for now)."},
@@
-64,7
+64,7
@@
CpuCas01Model::CpuCas01Model(Model::UpdateAlgo algo) : CpuModel(algo)
bool select = config::get_value<bool>("cpu/maxmin-selective-update");
bool select = config::get_value<bool>("cpu/maxmin-selective-update");
- if (
algo == Model::UpdateAlgo::LAZY
) {
+ if (
is_update_lazy()
) {
xbt_assert(select || config::is_default("cpu/maxmin-selective-update"),
"You cannot disable cpu selective update when using the lazy update mechanism");
select = true;
xbt_assert(select || config::is_default("cpu/maxmin-selective-update"),
"You cannot disable cpu selective update when using the lazy update mechanism");
select = true;
@@
-87,14
+87,15
@@
Cpu* CpuCas01Model::create_cpu(s4u::Host* host, const std::vector<double>& speed
* Resource *
************/
CpuCas01::CpuCas01(CpuCas01Model* model, s4u::Host* host, const std::vector<double>& speed_per_pstate, int core)
* Resource *
************/
CpuCas01::CpuCas01(CpuCas01Model* model, s4u::Host* host, const std::vector<double>& speed_per_pstate, int core)
- : Cpu(model, host, model->get_maxmin_system()->constraint_new(this, core * speed_per_pstate.front()),
- speed_per_pstate, core)
+ : Cpu(host, speed_per_pstate)
{
{
+ this->set_core_count(core)->set_model(model)->set_constraint(
+ model->get_maxmin_system()->constraint_new(this, core * speed_per_pstate.front()));
}
CpuCas01::~CpuCas01() = default;
}
CpuCas01::~CpuCas01() = default;
-bool CpuCas01::is_used()
+bool CpuCas01::is_used()
const
{
return get_model()->get_maxmin_system()->constraint_used(get_constraint());
}
{
return get_model()->get_maxmin_system()->constraint_used(get_constraint());
}
@@
-108,7
+109,7
@@
void CpuCas01::on_speed_change()
get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(),
get_core_count() * speed_.scale * speed_.peak);
while ((var = get_constraint()->get_variable(&elem))) {
get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(),
get_core_count() * speed_.scale * speed_.peak);
while ((var = get_constraint()->get_variable(&elem))) {
-
auto
* action = static_cast<CpuCas01Action*>(var->get_id());
+
const CpuCas01Action
* action = static_cast<CpuCas01Action*>(var->get_id());
get_model()->get_maxmin_system()->update_variable_bound(action->get_variable(),
action->requested_core() * speed_.scale * speed_.peak);
get_model()->get_maxmin_system()->update_variable_bound(action->get_variable(),
action->requested_core() * speed_.scale * speed_.peak);
@@
-133,8
+134,8
@@
void CpuCas01::apply_event(profile::Event* event, double value)
if (value > 0) {
if (not is_on()) {
if (value > 0) {
if (not is_on()) {
- XBT_VERB("Restart
processes on host %s", get_host
()->get_cname());
- get_
host
()->turn_on();
+ XBT_VERB("Restart
actors on host %s", get_iface
()->get_cname());
+ get_
iface
()->turn_on();
}
} else {
const lmm::Constraint* cnst = get_constraint();
}
} else {
const lmm::Constraint* cnst = get_constraint();
@@
-142,10
+143,10
@@
void CpuCas01::apply_event(profile::Event* event, double value)
const lmm::Element* elem = nullptr;
double date = surf_get_clock();
const lmm::Element* elem = nullptr;
double date = surf_get_clock();
- get_
host
()->turn_off();
+ get_
iface
()->turn_off();
while ((var = cnst->get_variable(&elem))) {
while ((var = cnst->get_variable(&elem))) {
-
auto* action = static_cast<Action*>(var->get_id()
);
+
Action* action = var->get_id(
);
if (action->get_state() == Action::State::INITED || action->get_state() == Action::State::STARTED ||
action->get_state() == Action::State::IGNORED) {
if (action->get_state() == Action::State::INITED || action->get_state() == Action::State::STARTED ||
action->get_state() == Action::State::IGNORED) {
@@
-188,7
+189,7
@@
CpuAction* CpuCas01::sleep(double duration)
action->set_state(Action::State::IGNORED);
get_model()->get_maxmin_system()->update_variable_penalty(action->get_variable(), 0.0);
action->set_state(Action::State::IGNORED);
get_model()->get_maxmin_system()->update_variable_penalty(action->get_variable(), 0.0);
- if (get_model()->
get_update_algorithm() == Model::UpdateAlgo::LAZY
) { // remove action from the heap
+ if (get_model()->
is_update_lazy()
) { // remove action from the heap
get_model()->get_action_heap().remove(action);
// this is necessary for a variable with weight 0 since such variables are ignored in lmm and we need to set its
// max_duration correctly at the next call to share_resources
get_model()->get_action_heap().remove(action);
// this is necessary for a variable with weight 0 since such variables are ignored in lmm and we need to set its
// max_duration correctly at the next call to share_resources
@@
-208,7
+209,7
@@
CpuCas01Action::CpuCas01Action(Model* model, double cost, bool failed, double sp
model->get_maxmin_system()->variable_new(this, 1.0 / requested_core, requested_core * speed, 1))
, requested_core_(requested_core)
{
model->get_maxmin_system()->variable_new(this, 1.0 / requested_core, requested_core * speed, 1))
, requested_core_(requested_core)
{
- if (model->
get_update_algorithm() == Model::UpdateAlgo::LAZY
)
+ if (model->
is_update_lazy()
)
set_last_update();
model->get_maxmin_system()->expand(constraint, get_variable(), 1.0);
}
set_last_update();
model->get_maxmin_system()->expand(constraint, get_variable(), 1.0);
}
@@
-218,7
+219,7
@@
CpuCas01Action::CpuCas01Action(Model* model, double cost, bool failed, double sp
{
}
{
}
-int CpuCas01Action::requested_core()
+int CpuCas01Action::requested_core()
const
{
return requested_core_;
}
{
return requested_core_;
}