-/* Copyright (c) 2009-2021. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-2022. 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 "simgrid/kernel/routing/NetZoneImpl.hpp"
-#include "simgrid/s4u/Engine.hpp"
+#include <simgrid/kernel/routing/NetZoneImpl.hpp>
+#include <simgrid/s4u/Engine.hpp>
#include "simgrid/sg_config.hpp"
#include "src/kernel/EngineImpl.hpp"
#include "src/surf/cpu_cas01.hpp"
#include "src/surf/cpu_ti.hpp"
#include "src/surf/surf_interface.hpp"
-#include "surf/surf.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(cpu_cas, res_cpu, "CPU resource, CAS01 model (used by default)");
"Cannot change the optimization algorithm after the initialization");
});
+static simgrid::config::Flag<std::string> cfg_cpu_solver("cpu/solver", "Set linear equations solver used by CPU model",
+ "maxmin", &simgrid::kernel::lmm::System::validate_solver);
+
/*********
* Model *
*********/
}
auto cpu_model_pm = std::make_shared<simgrid::kernel::resource::CpuCas01Model>("Cpu_Cas01");
- simgrid::kernel::EngineImpl::get_instance()->add_model(cpu_model_pm);
- simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_cpu_pm_model(cpu_model_pm);
+ auto* engine = simgrid::kernel::EngineImpl::get_instance();
+ engine->add_model(cpu_model_pm);
+ engine->get_netzone_root()->set_cpu_pm_model(cpu_model_pm);
}
-namespace simgrid {
-namespace kernel {
-namespace resource {
+namespace simgrid::kernel::resource {
CpuCas01Model::CpuCas01Model(const std::string& name) : CpuModel(name)
{
select = true;
}
- set_maxmin_system(new lmm::System(select));
+ set_maxmin_system(lmm::System::build(cfg_cpu_solver, select));
}
CpuImpl* CpuCas01Model::create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate)
/************
* Resource *
************/
-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()
{
get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(),
get_core_count() * speed_.scale * speed_.peak);
+
while (const auto* var = get_constraint()->get_variable(&elem)) {
const auto* action = static_cast<CpuCas01Action*>(var->get_id());
+ double bound = action->requested_core() * speed_.scale * speed_.peak;
+ if (action->get_user_bound() > 0) {
+ bound = std::min(bound, action->get_user_bound());
+ }
- 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(), bound);
}
CpuImpl::on_speed_change();
void CpuCas01::apply_event(profile::Event* event, double value)
{
if (event == speed_.event) {
- /* TODO (Hypervisor): do the same thing for constraint_core[i] */
- xbt_assert(get_core_count() == 1, "FIXME: add speed scaling code also for constraint_core[i]");
-
speed_.scale = value;
on_speed_change();
tmgr_trace_event_unref(&speed_.event);
- } else if (event == state_event_) {
- /* TODO (Hypervisor): do the same thing for constraint_core[i] */
- xbt_assert(get_core_count() == 1, "FIXME: add state change code also for constraint_core[i]");
-
+ } else if (event == get_state_event()) {
if (value > 0) {
if (not is_on()) {
XBT_VERB("Restart actors on host %s", get_iface()->get_cname());
}
} else {
const lmm::Element* elem = nullptr;
- double date = surf_get_clock();
+ double date = EngineImpl::get_clock();
get_iface()->turn_off();
}
}
}
- tmgr_trace_event_unref(&state_event_);
+ unref_state_event();
} else {
xbt_die("Unknown event!\n");
}
/** @brief Start a new execution on this CPU lasting @param size flops and using one core */
-CpuAction* CpuCas01::execution_start(double size)
+CpuAction* CpuCas01::execution_start(double size, double user_bound)
{
- return new CpuCas01Action(get_model(), size, not is_on(), speed_.scale * speed_.peak, get_constraint());
+ return execution_start(size, 1, user_bound);
}
-CpuAction* CpuCas01::execution_start(double size, int requested_cores)
+CpuAction* CpuCas01::execution_start(double size, int requested_cores, double user_bound)
{
- return new CpuCas01Action(get_model(), size, not is_on(), speed_.scale * speed_.peak, get_constraint(),
- requested_cores);
+ auto* action =
+ new CpuCas01Action(get_model(), size, not is_on(), speed_.scale * speed_.peak, get_constraint(), requested_cores);
+ action->set_user_bound(user_bound);
+ if (user_bound > 0 && user_bound < action->get_bound()) {
+ get_model()->get_maxmin_system()->update_variable_bound(action->get_variable(), user_bound);
+ }
+ if (factor_cb_) {
+ action->set_rate_factor(factor_cb_(size));
+ }
+
+ return action;
}
CpuAction* CpuCas01::sleep(double duration)
if (duration > 0)
duration = std::max(duration, sg_surf_precision);
- XBT_IN("(%s,%g)", get_cname(), duration);
- auto* action = new CpuCas01Action(get_model(), 1.0, not is_on(), speed_.scale * speed_.peak, get_constraint());
+ XBT_IN("(%s, %g)", get_cname(), duration);
+ auto* action = new CpuCas01Action(get_model(), 1.0, not is_on(), speed_.scale * speed_.peak, get_constraint(), 1);
// FIXME: sleep variables should not consume 1.0 in System::expand()
action->set_max_duration(duration);
return action;
}
+void CpuCas01::set_factor_cb(const std::function<s4u::Host::CpuFactorCb>& cb)
+{
+ xbt_assert(not is_sealed(), "Cannot set CPU factor callback in an already sealed CPU(%s)", get_cname());
+ factor_cb_ = cb;
+}
+
/**********
* Action *
**********/
model->get_maxmin_system()->expand(constraint, get_variable(), 1.0);
}
-int CpuCas01Action::requested_core() const
-{
- return requested_core_;
-}
-
-} // namespace resource
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel::resource
