-/* Copyright (c) 2013-2020. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2013-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_interface.hpp"
+#include "cpu_ti.hpp"
#include "src/kernel/resource/profile/Profile.hpp"
#include "src/surf/surf_interface.hpp"
#include "surf/surf.hpp"
-XBT_LOG_EXTERNAL_CATEGORY(surf_kernel);
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu, surf, "Logging specific to the SURF cpu module");
-
-simgrid::kernel::resource::CpuModel* surf_cpu_model_pm;
-simgrid::kernel::resource::CpuModel* surf_cpu_model_vm;
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(res_cpu, ker_resource, "CPU resource, fueling execution activites");
namespace simgrid {
namespace kernel {
{
while (not get_action_heap().empty() && double_equals(get_action_heap().top_date(), now, sg_surf_precision)) {
auto* action = static_cast<CpuAction*>(get_action_heap().pop());
- XBT_CDEBUG(surf_kernel, "Something happened to action %p", action);
+ XBT_DEBUG("Something happened to action %p", action);
action->finish(kernel::resource::Action::State::FINISHED);
- XBT_CDEBUG(surf_kernel, "Action %p finished", action);
+ XBT_DEBUG("Action %p finished", action);
}
}
/************
* Resource *
************/
-Cpu::Cpu(Model* model, s4u::Host* host, const std::vector<double>& speed_per_pstate, int core)
- : Cpu(model, host, nullptr /*constraint*/, speed_per_pstate, core)
+Cpu::Cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate)
+ : Resource_T(host->get_cname()), piface_(host), speed_per_pstate_(speed_per_pstate)
{
-}
-
-Cpu::Cpu(Model* model, s4u::Host* host, lmm::Constraint* constraint, const std::vector<double>& speed_per_pstate,
- int core)
- : Resource(model, host->get_cname(), constraint)
- , core_count_(core)
- , host_(host)
- , speed_per_pstate_(speed_per_pstate)
-{
- xbt_assert(core > 0, "Host %s must have at least one core, not 0.", host->get_cname());
-
- speed_.peak = speed_per_pstate_.front();
speed_.scale = 1;
+ speed_.peak = speed_per_pstate_.front();
host->pimpl_cpu = this;
- xbt_assert(speed_.scale > 0, "Speed of host %s must be >0", host->get_cname());
}
void Cpu::reset_vcpu(Cpu* that)
this->speed_per_pstate_.assign(that->speed_per_pstate_.begin(), that->speed_per_pstate_.end());
}
-int Cpu::get_pstate_count() const
-{
- return speed_per_pstate_.size();
-}
-
void Cpu::set_pstate(int pstate_index)
{
xbt_assert(pstate_index <= static_cast<int>(speed_per_pstate_.size()),
on_speed_change();
}
-int Cpu::get_pstate() const
-{
- return pstate_;
-}
-
double Cpu::get_pstate_peak_speed(int pstate_index) const
{
xbt_assert((pstate_index <= static_cast<int>(speed_per_pstate_.size())),
return speed_per_pstate_[pstate_index];
}
-double Cpu::get_speed(double load) const
+void Cpu::on_speed_change()
{
- return load * speed_.peak;
+ s4u::Host::on_speed_change(*piface_);
}
-double Cpu::get_speed_ratio()
+Cpu* Cpu::set_core_count(int core_count)
{
-/* number between 0 and 1 */
- return speed_.scale;
-}
+ xbt_assert(not is_sealed(), "Core count cannot be changed once CPU has been sealed");
+ xbt_assert(core_count > 0, "Host %s must have at least one core, not 0.", piface_->get_cname());
+ if (dynamic_cast<CpuTiModel*>(get_model()) != nullptr)
+ xbt_assert(core_count == 1, "Multi-core not handled by this model yet");
-void Cpu::on_speed_change()
-{
- s4u::Host::on_speed_change(*host_);
+ core_count_ = core_count;
+ return this;
}
int Cpu::get_core_count()
void Cpu::set_speed_profile(kernel::profile::Profile* profile)
{
- xbt_assert(speed_.event == nullptr, "Cannot set a second speed trace to Host %s", host_->get_cname());
+ xbt_assert(speed_.event == nullptr, "Cannot set a second speed trace to Host %s", piface_->get_cname());
speed_.event = profile->schedule(&profile::future_evt_set, this);
}
+void Cpu::seal()
+{
+ lmm::System* lmm = get_model()->get_maxmin_system();
+ if (dynamic_cast<CpuTiModel*>(get_model()) == nullptr)
+ this->set_constraint(lmm->constraint_new(this, core_count_ * speed_per_pstate_.front()));
+ Resource::seal();
+}
/**********
* Action *
double delta = now - get_last_update();
if (get_remains_no_update() > 0) {
- XBT_CDEBUG(surf_kernel, "Updating action(%p): remains was %f, last_update was: %f", this, get_remains_no_update(),
- get_last_update());
+ XBT_DEBUG("Updating action(%p): remains was %f, last_update was: %f", this, get_remains_no_update(),
+ get_last_update());
update_remains(get_last_value() * delta);
- XBT_CDEBUG(surf_kernel, "Updating action(%p): remains is now %f", this, get_remains_no_update());
+ XBT_DEBUG("Updating action(%p): remains is now %f", this, get_remains_no_update());
}
set_last_update();