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
bb87813
..
9694417
100644
(file)
--- a/
src/surf/cpu_cas01.cpp
+++ b/
src/surf/cpu_cas01.cpp
@@
-1,15
+1,16
@@
-/* 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. */
#include "cpu_cas01.hpp"
#include "simgrid/sg_config.hpp"
/* 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. */
#include "cpu_cas01.hpp"
#include "simgrid/sg_config.hpp"
+#include "src/kernel/resource/profile/Event.hpp"
#include "src/surf/cpu_ti.hpp"
#include "src/surf/surf_interface.hpp"
#include "surf/surf.hpp"
#include "src/surf/cpu_ti.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 *
@@
-18,14
+19,14
@@
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)."},
{"Full", "Full update of remaining and variables. Slow but may be useful when debugging."},
}),
{"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)."},
{"Full", "Full update of remaining and variables. Slow but may be useful when debugging."},
}),
- [](std::string const&
val
) {
+ [](std::string const&) {
xbt_assert(_sg_cfg_init_status < 2,
"Cannot change the optimization algorithm after the initialization");
});
xbt_assert(_sg_cfg_init_status < 2,
"Cannot change the optimization algorithm after the initialization");
});
@@
-39,7
+40,7
@@
void surf_cpu_model_init_Cas01()
xbt_assert(surf_cpu_model_vm == nullptr, "CPU model already initialized. This should not happen.");
if (cpu_optim_opt == "TI") {
xbt_assert(surf_cpu_model_vm == nullptr, "CPU model already initialized. This should not happen.");
if (cpu_optim_opt == "TI") {
- simgrid::
surf
::CpuTiModel::create_pm_vm_models();
+ simgrid::
kernel::resource
::CpuTiModel::create_pm_vm_models();
return;
}
return;
}
@@
-49,26
+50,27
@@
void surf_cpu_model_init_Cas01()
else
algo = simgrid::kernel::resource::Model::UpdateAlgo::FULL;
else
algo = simgrid::kernel::resource::Model::UpdateAlgo::FULL;
- surf_cpu_model_pm = new simgrid::
surf
::CpuCas01Model(algo);
- surf_cpu_model_vm = new simgrid::
surf
::CpuCas01Model(algo);
+ surf_cpu_model_pm = new simgrid::
kernel::resource
::CpuCas01Model(algo);
+ surf_cpu_model_vm = new simgrid::
kernel::resource
::CpuCas01Model(algo);
}
namespace simgrid {
}
namespace simgrid {
-namespace surf {
+namespace kernel {
+namespace resource {
-CpuCas01Model::CpuCas01Model(
kernel::resource::Model::UpdateAlgo algo) : simgrid::surf::
CpuModel(algo)
+CpuCas01Model::CpuCas01Model(
Model::UpdateAlgo algo) :
CpuModel(algo)
{
all_existing_models.push_back(this);
{
all_existing_models.push_back(this);
- bool select =
simgrid::
config::get_value<bool>("cpu/maxmin-selective-update");
+ bool select = config::get_value<bool>("cpu/maxmin-selective-update");
- if (
algo == Model::UpdateAlgo::LAZY
) {
- xbt_assert(select ||
simgrid::
config::is_default("cpu/maxmin-selective-update"),
+ 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;
}
"You cannot disable cpu selective update when using the lazy update mechanism");
select = true;
}
- set_maxmin_system(new
simgrid::kernel::
lmm::System(select));
+ set_maxmin_system(new lmm::System(select));
}
CpuCas01Model::~CpuCas01Model()
}
CpuCas01Model::~CpuCas01Model()
@@
-76,7
+78,7
@@
CpuCas01Model::~CpuCas01Model()
surf_cpu_model_pm = nullptr;
}
surf_cpu_model_pm = nullptr;
}
-Cpu* CpuCas01Model::create_cpu(s
imgrid::s4u::Host* host, std::vector<double>*
speed_per_pstate, int core)
+Cpu* CpuCas01Model::create_cpu(s
4u::Host* host, const std::vector<double>&
speed_per_pstate, int core)
{
return new CpuCas01(this, host, speed_per_pstate, core);
}
{
return new CpuCas01(this, host, speed_per_pstate, core);
}
@@
-84,15
+86,16
@@
Cpu* CpuCas01Model::create_cpu(simgrid::s4u::Host* host, std::vector<double>* sp
/************
* Resource *
************/
/************
* Resource *
************/
-CpuCas01::CpuCas01(CpuCas01Model* model, simgrid::s4u::Host* host, std::vector<double>* speedPerPstate, int core)
- : Cpu(model, host, model->get_maxmin_system()->constraint_new(this, core * speedPerPstate->front()), speedPerPstate,
- core)
+CpuCas01::CpuCas01(CpuCas01Model* model, s4u::Host* host, const std::vector<double>& speed_per_pstate, int 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());
}
@@
-100,13
+103,13
@@
bool CpuCas01::is_used()
/** @brief take into account changes of speed (either load or max) */
void CpuCas01::on_speed_change()
{
/** @brief take into account changes of speed (either load or max) */
void CpuCas01::on_speed_change()
{
-
kernel::lmm::Variable* var = nullpt
r;
- const
kernel::
lmm::Element* elem = nullptr;
+
const lmm::Variable* va
r;
+ const lmm::Element* elem = nullptr;
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))) {
- CpuCas01Action* 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);
@@
-115,7
+118,7
@@
void CpuCas01::on_speed_change()
Cpu::on_speed_change();
}
Cpu::on_speed_change();
}
-void CpuCas01::apply_event(
tmgr_trace_event_t
event, double value)
+void CpuCas01::apply_event(
profile::Event*
event, double value)
{
if (event == speed_.event) {
/* TODO (Hypervisor): do the same thing for constraint_core[i] */
{
if (event == speed_.event) {
/* TODO (Hypervisor): do the same thing for constraint_core[i] */
@@
-130,26
+133,25
@@
void CpuCas01::apply_event(tmgr_trace_event_t event, double value)
xbt_assert(get_core_count() == 1, "FIXME: add state change code also for constraint_core[i]");
if (value > 0) {
xbt_assert(get_core_count() == 1, "FIXME: add state change code also for constraint_core[i]");
if (value > 0) {
- if (
is_off
()) {
- XBT_VERB("Restart
processes on host %s", get_host
()->get_cname());
- get_
host
()->turn_on();
+ if (
not is_on
()) {
+ XBT_VERB("Restart
actors on host %s", get_iface
()->get_cname());
+ get_
iface
()->turn_on();
}
} else {
}
} else {
-
kernel::
lmm::Constraint* cnst = get_constraint();
-
kernel::lmm::Variable* var = nullpt
r;
- const
kernel::
lmm::Element* elem = nullptr;
+
const
lmm::Constraint* cnst = get_constraint();
+
const lmm::Variable* va
r;
+ const lmm::Element* elem = nullptr;
double date = surf_get_clock();
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))) {
-
kernel::resource::Action* action = static_cast<kernel::resource::Action*>(var->get_id()
);
+
Action* action = var->get_id(
);
- if (action->get_state() == kernel::resource::Action::State::INITED ||
- action->get_state() == kernel::resource::Action::State::STARTED ||
- action->get_state() == kernel::resource::Action::State::IGNORED) {
+ if (action->get_state() == Action::State::INITED || action->get_state() == Action::State::STARTED ||
+ action->get_state() == Action::State::IGNORED) {
action->set_finish_time(date);
action->set_finish_time(date);
- action->set_state(
kernel::resource::
Action::State::FAILED);
+ action->set_state(Action::State::FAILED);
}
}
}
}
}
}
@@
-163,12
+165,13
@@
void CpuCas01::apply_event(tmgr_trace_event_t event, double value)
/** @brief Start a new execution on this CPU lasting @param size flops and using one core */
CpuAction* CpuCas01::execution_start(double size)
{
/** @brief Start a new execution on this CPU lasting @param size flops and using one core */
CpuAction* CpuCas01::execution_start(double size)
{
- return new CpuCas01Action(get_model(), size,
is_off
(), speed_.scale * speed_.peak, get_constraint());
+ return new CpuCas01Action(get_model(), size,
not is_on
(), speed_.scale * speed_.peak, get_constraint());
}
CpuAction* CpuCas01::execution_start(double size, int requested_cores)
{
}
CpuAction* CpuCas01::execution_start(double size, int requested_cores)
{
- return new CpuCas01Action(get_model(), size, is_off(), speed_.scale * speed_.peak, get_constraint(), requested_cores);
+ return new CpuCas01Action(get_model(), size, not is_on(), speed_.scale * speed_.peak, get_constraint(),
+ requested_cores);
}
CpuAction* CpuCas01::sleep(double duration)
}
CpuAction* CpuCas01::sleep(double duration)
@@
-177,16
+180,16
@@
CpuAction* CpuCas01::sleep(double duration)
duration = std::max(duration, sg_surf_precision);
XBT_IN("(%s,%g)", get_cname(), duration);
duration = std::max(duration, sg_surf_precision);
XBT_IN("(%s,%g)", get_cname(), duration);
-
CpuCas01Action* action = new CpuCas01Action(get_model(), 1.0, is_off
(), speed_.scale * speed_.peak, get_constraint());
+
auto* action = new CpuCas01Action(get_model(), 1.0, not is_on
(), speed_.scale * speed_.peak, get_constraint());
// FIXME: sleep variables should not consume 1.0 in System::expand()
action->set_max_duration(duration);
// FIXME: sleep variables should not consume 1.0 in System::expand()
action->set_max_duration(duration);
- action->s
uspended_ = kernel::resource::Action::SuspendStates::sleeping
;
- if (duration
< 0) // NO_MAX_DURATION
- action->set_state(
simgrid::kernel::resource::
Action::State::IGNORED);
+ action->s
et_suspend_state(Action::SuspendStates::SLEEPING)
;
+ if (duration
== NO_MAX_DURATION)
+ action->set_state(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
+ get_model()->get_maxmin_system()->update_variable_
penalty
(action->get_variable(), 0.0);
+ 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
@@
-200,29
+203,29
@@
CpuAction* CpuCas01::sleep(double duration)
/**********
* Action *
**********/
/**********
* Action *
**********/
-CpuCas01Action::CpuCas01Action(
kernel::resource::Model* model, double cost, bool failed, double speed
,
-
kernel::lmm::Constraint* constraint,
int requested_core)
+CpuCas01Action::CpuCas01Action(
Model* model, double cost, bool failed, double speed, lmm::Constraint* constraint
,
+ int requested_core)
: CpuAction(model, cost, failed,
model->get_maxmin_system()->variable_new(this, 1.0 / requested_core, requested_core * speed, 1))
, requested_core_(requested_core)
{
: CpuAction(model, cost, failed,
model->get_maxmin_system()->variable_new(this, 1.0 / requested_core, requested_core * speed, 1))
, requested_core_(requested_core)
{
- if (model->
get_update_algorithm() == kernel::resource::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);
}
-CpuCas01Action::CpuCas01Action(kernel::resource::Model* model, double cost, bool failed, double speed,
- kernel::lmm::Constraint* constraint)
+CpuCas01Action::CpuCas01Action(Model* model, double cost, bool failed, double speed, lmm::Constraint* constraint)
: CpuCas01Action(model, cost, failed, speed, constraint, /* requested_core */ 1)
{
}
: CpuCas01Action(model, cost, failed, speed, constraint, /* requested_core */ 1)
{
}
-int CpuCas01Action::requested_core()
+int CpuCas01Action::requested_core()
const
{
return requested_core_;
}
CpuCas01Action::~CpuCas01Action()=default;
{
return requested_core_;
}
CpuCas01Action::~CpuCas01Action()=default;
-}
-}
+} // namespace resource
+} // namespace kernel
+} // namespace simgrid