-/* Copyright (c) 2009-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-2021. 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"
+#include "src/kernel/resource/profile/Event.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 *
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)."},
CpuCas01Model::CpuCas01Model(Model::UpdateAlgo algo) : CpuModel(algo)
{
all_existing_models.push_back(this);
+ models_by_type[simgrid::kernel::resource::Model::Type::CPU].push_back(this);
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;
surf_cpu_model_pm = nullptr;
}
-Cpu* CpuCas01Model::create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate, int core)
+Cpu* CpuCas01Model::create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate)
{
- return new CpuCas01(this, host, speed_per_pstate, core);
+ return (new CpuCas01(host, speed_per_pstate))->set_model(this);
}
/************
* 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)
-{
-}
-
-CpuCas01::~CpuCas01() = default;
-
-bool CpuCas01::is_used()
+bool CpuCas01::is_used() const
{
return get_model()->get_maxmin_system()->constraint_used(get_constraint());
}
/** @brief take into account changes of speed (either load or max) */
void CpuCas01::on_speed_change()
{
- lmm::Variable* var = nullptr;
+ const lmm::Variable* var;
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))) {
- 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);
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 {
- lmm::Constraint* cnst = get_constraint();
- lmm::Variable* var = nullptr;
+ const lmm::Constraint* cnst = get_constraint();
+ const lmm::Variable* var;
const lmm::Element* elem = nullptr;
double date = surf_get_clock();
- get_host()->turn_off();
+ get_iface()->turn_off();
while ((var = cnst->get_variable(&elem))) {
- Action* 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) {
duration = std::max(duration, sg_surf_precision);
XBT_IN("(%s,%g)", get_cname(), duration);
- CpuCas01Action* action =
- new CpuCas01Action(get_model(), 1.0, not is_on(), 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);
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() == 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
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);
}
-CpuCas01Action::CpuCas01Action(Model* model, double cost, bool failed, double speed, lmm::Constraint* constraint)
- : CpuCas01Action(model, cost, failed, speed, constraint, /* requested_core */ 1)
-{
-}
-
-int CpuCas01Action::requested_core()
+int CpuCas01Action::requested_core() const
{
return requested_core_;
}
-CpuCas01Action::~CpuCas01Action()=default;
+CpuCas01Action::~CpuCas01Action() = default;
} // namespace resource
} // namespace kernel
