X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fe304706848f0a64477d4687b3ea97d5b9a0c35c..cf454dfcf7c27e86e15af1a45c58dbb7a76e43c8:/src/surf/cpu_interface.cpp diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp index 8325194bbe..a15bc1faab 100644 --- a/src/surf/cpu_interface.cpp +++ b/src/surf/cpu_interface.cpp @@ -1,14 +1,14 @@ -/* Copyright (c) 2013-2019. 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 "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"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(res_cpu, ker_resource, "CPU resource, fueling execution activites"); simgrid::kernel::resource::CpuModel* surf_cpu_model_pm; simgrid::kernel::resource::CpuModel* surf_cpu_model_vm; @@ -24,25 +24,24 @@ namespace resource { void CpuModel::update_actions_state_lazy(double now, double /*delta*/) { while (not get_action_heap().empty() && double_equals(get_action_heap().top_date(), now, sg_surf_precision)) { - - CpuAction* action = static_cast(get_action_heap().pop()); - XBT_CDEBUG(surf_kernel, "Something happened to action %p", action); + auto* action = static_cast(get_action_heap().pop()); + 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); } } void CpuModel::update_actions_state_full(double /*now*/, double delta) { for (auto it = std::begin(*get_started_action_set()); it != std::end(*get_started_action_set());) { - CpuAction& action = static_cast(*it); + auto& action = static_cast(*it); ++it; // increment iterator here since the following calls to action.finish() may invalidate it action.update_remains(action.get_variable()->get_value() * delta); action.update_max_duration(delta); - if (((action.get_remains_no_update() <= 0) && (action.get_variable()->get_weight() > 0)) || + if (((action.get_remains_no_update() <= 0) && (action.get_variable()->get_penalty() > 0)) || ((action.get_max_duration() != NO_MAX_DURATION) && (action.get_max_duration() <= 0))) { action.finish(Action::State::FINISHED); } @@ -52,29 +51,20 @@ void CpuModel::update_actions_state_full(double /*now*/, double delta) /************ * Resource * ************/ -Cpu::Cpu(Model* model, s4u::Host* host, const std::vector& speed_per_pstate, int core) - : Cpu(model, host, nullptr /*constraint*/, speed_per_pstate, core) +Cpu::Cpu(s4u::Host* host, const std::vector& 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& 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()); } -int Cpu::get_pstate_count() const +void Cpu::reset_vcpu(Cpu* that) { - return speed_per_pstate_.size(); + this->pstate_ = that->pstate_; + this->speed_ = that->speed_; + this->speed_per_pstate_.clear(); + this->speed_per_pstate_.assign(that->speed_per_pstate_.begin(), that->speed_per_pstate_.end()); } void Cpu::set_pstate(int pstate_index) @@ -91,11 +81,6 @@ void Cpu::set_pstate(int pstate_index) 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(speed_per_pstate_.size())), @@ -104,20 +89,17 @@ double Cpu::get_pstate_peak_speed(int pstate_index) const return speed_per_pstate_[pstate_index]; } -double Cpu::get_speed(double load) const -{ - return load * speed_.peak; -} - -double Cpu::get_speed_ratio() +void Cpu::on_speed_change() { -/* number between 0 and 1 */ - return speed_.scale; + s4u::Host::on_speed_change(*piface_); } -void Cpu::on_speed_change() +Cpu* Cpu::set_core_count(int core_count) { - s4u::Host::on_speed_change(*host_); + 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()); + core_count_ = core_count; + return this; } int Cpu::get_core_count() @@ -127,11 +109,15 @@ 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(&future_evt_set, this); + speed_.event = profile->schedule(&profile::future_evt_set, this); } +void Cpu::seal() +{ + Resource::seal(); +} /********** * Action * @@ -141,16 +127,16 @@ void CpuAction::update_remains_lazy(double now) { xbt_assert(get_state_set() == get_model()->get_started_action_set(), "You're updating an action that is not running."); - xbt_assert(get_priority() > 0, "You're updating an action that seems suspended."); + xbt_assert(get_sharing_penalty() > 0, "You're updating an action that seems suspended."); 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(); @@ -187,8 +173,8 @@ std::list CpuAction::cpus() const for (int i = 0; i < llen; i++) { /* Beware of composite actions: ptasks put links and cpus together */ // extra pb: we cannot dynamic_cast from void*... - Resource* resource = static_cast(get_variable()->get_constraint(i)->get_id()); - Cpu* cpu = dynamic_cast(resource); + Resource* resource = get_variable()->get_constraint(i)->get_id(); + auto* cpu = dynamic_cast(resource); if (cpu != nullptr) retlist.push_back(cpu); }