X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8b853cf697928f829717bb60bd9c1cadaf2beb8e..d8cfc4c2e6eec35703dc7f3158188eaa6e2d24a5:/src/surf/cpu_interface.cpp diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp index 445243559f..0c33ed9f53 100644 --- a/src/surf/cpu_interface.cpp +++ b/src/surf/cpu_interface.cpp @@ -1,20 +1,21 @@ -/* 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(cpu, resource, "CPU resource"); -simgrid::surf::CpuModel *surf_cpu_model_pm; -simgrid::surf::CpuModel *surf_cpu_model_vm; +simgrid::kernel::resource::CpuModel* surf_cpu_model_pm; +simgrid::kernel::resource::CpuModel* surf_cpu_model_vm; namespace simgrid { -namespace surf { +namespace kernel { +namespace resource { /********* * Model * @@ -23,27 +24,26 @@ namespace surf { 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(kernel::resource::Action::State::FINISHED); + action.finish(Action::State::FINISHED); } } } @@ -51,14 +51,13 @@ void CpuModel::update_actions_state_full(double /*now*/, double delta) /************ * Resource * ************/ -Cpu::Cpu(kernel::resource::Model* model, simgrid::s4u::Host* host, const std::vector& speed_per_pstate, - int core) +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(kernel::resource::Model* model, simgrid::s4u::Host* host, kernel::lmm::Constraint* constraint, - const std::vector& speed_per_pstate, int core) +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) @@ -72,6 +71,14 @@ Cpu::Cpu(kernel::resource::Model* model, simgrid::s4u::Host* host, kernel::lmm:: xbt_assert(speed_.scale > 0, "Speed of host %s must be >0", host->get_cname()); } +void Cpu::reset_vcpu(Cpu* that) +{ + 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()); +} + int Cpu::get_pstate_count() const { return speed_per_pstate_.size(); @@ -129,7 +136,7 @@ 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()); - speed_.event = profile->schedule(&future_evt_set, this); + speed_.event = profile->schedule(&profile::future_evt_set, this); } @@ -141,23 +148,23 @@ 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(); set_last_value(get_variable()->get_value()); } -simgrid::xbt::signal CpuAction::on_state_change; +xbt::signal CpuAction::on_state_change; void CpuAction::suspend(){ Action::State previous = get_state(); @@ -187,15 +194,14 @@ 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*... - kernel::resource::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); } return retlist; } - -} -} +} // namespace resource +} // namespace kernel +} // namespace simgrid