-/* Copyright (c) 2009-2020. 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/kernel/routing/NetZoneImpl.hpp"
+#include "simgrid/s4u/Engine.hpp"
#include "simgrid/sg_config.hpp"
+#include "src/kernel/EngineImpl.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)."},
*********/
void surf_cpu_model_init_Cas01()
{
- xbt_assert(surf_cpu_model_pm == nullptr, "CPU model already initialized. This should not happen.");
- xbt_assert(surf_cpu_model_vm == nullptr, "CPU model already initialized. This should not happen.");
-
if (cpu_optim_opt == "TI") {
- simgrid::kernel::resource::CpuTiModel::create_pm_vm_models();
+ simgrid::kernel::resource::CpuTiModel::create_pm_models();
return;
}
- simgrid::kernel::resource::Model::UpdateAlgo algo;
- if (cpu_optim_opt == "Lazy")
- algo = simgrid::kernel::resource::Model::UpdateAlgo::LAZY;
- else
- algo = simgrid::kernel::resource::Model::UpdateAlgo::FULL;
-
- surf_cpu_model_pm = new simgrid::kernel::resource::CpuCas01Model(algo);
- surf_cpu_model_vm = new simgrid::kernel::resource::CpuCas01Model(algo);
+ auto cpu_model_pm = std::make_shared<simgrid::kernel::resource::CpuCas01Model>();
+ simgrid::kernel::EngineImpl::get_instance()->add_model(simgrid::kernel::resource::Model::Type::CPU_PM, cpu_model_pm,
+ true);
+ simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_cpu_pm_model(cpu_model_pm);
}
namespace simgrid {
namespace kernel {
namespace resource {
-CpuCas01Model::CpuCas01Model(Model::UpdateAlgo algo) : CpuModel(algo)
+CpuCas01Model::CpuCas01Model()
{
- all_existing_models.push_back(this);
+ if (config::get_value<std::string>("cpu/optim") == "Lazy")
+ set_update_algorithm(Model::UpdateAlgo::LAZY);
bool select = config::get_value<bool>("cpu/maxmin-selective-update");
set_maxmin_system(new lmm::System(select));
}
-CpuCas01Model::~CpuCas01Model()
+Cpu* CpuCas01Model::create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate)
{
- surf_cpu_model_pm = nullptr;
-}
-
-Cpu* CpuCas01Model::create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate, int core)
-{
- 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()
{
- 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))) {
- auto* action = static_cast<CpuCas01Action*>(var->get_id());
+ while (const auto* var = get_constraint()->get_variable(&elem)) {
+ const auto* 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 {
- 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))) {
- auto* action = static_cast<Action*>(var->get_id());
+ while (const auto* var = get_constraint()->get_variable(&elem)) {
+ Action* action = var->get_id();
if (action->get_state() == Action::State::INITED || action->get_state() == Action::State::STARTED ||
action->get_state() == Action::State::IGNORED) {
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;
-
} // namespace resource
} // namespace kernel
} // namespace simgrid
