X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c0f3756528127131a1947179f56871657a084259..58801abf7076bc6bd09c971104f6dbd3ff236fc6:/src/surf/cpu_interface.cpp diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp index 7cd104de73..768299562f 100644 --- a/src/surf/cpu_interface.cpp +++ b/src/surf/cpu_interface.cpp @@ -1,21 +1,22 @@ -/* Copyright (c) 2013-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2013-2019. 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/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals +#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::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 * @@ -31,34 +32,20 @@ void CpuModel::update_actions_state_lazy(double now, double /*delta*/) action->finish(kernel::resource::Action::State::FINISHED); XBT_CDEBUG(surf_kernel, "Action %p finished", action); } - if (TRACE_is_enabled()) { - //defining the last timestamp that we can safely dump to trace file - //without losing the event ascending order (considering all CPU's) - double smaller = -1; - for (kernel::resource::Action const& action : *get_started_action_set()) { - if (smaller < 0 || action.get_last_update() < smaller) - smaller = action.get_last_update(); - } - if (smaller > 0) { - TRACE_last_timestamp_to_dump = smaller; - } - } } -void CpuModel::update_actions_state_full(double now, double delta) +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); ++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_max_duration() != NO_MAX_DURATION) - 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); } } } @@ -66,92 +53,84 @@ void CpuModel::update_actions_state_full(double now, double delta) /************ * Resource * ************/ -Cpu::Cpu(kernel::resource::Model* model, simgrid::s4u::Host* host, std::vector* speedPerPstate, int core) - : Cpu(model, host, nullptr /*constraint*/, speedPerPstate, 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, - std::vector* speedPerPstate, int core) - : Resource(model, host->get_cname(), constraint), coresAmount_(core), host_(host) +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 = speedPerPstate->front(); + speed_.peak = speed_per_pstate_.front(); speed_.scale = 1; host->pimpl_cpu = this; xbt_assert(speed_.scale > 0, "Speed of host %s must be >0", host->get_cname()); - - // Copy the power peak array: - for (double const& value : *speedPerPstate) { - speedPerPstate_.push_back(value); - } } -Cpu::~Cpu() = default; - -int Cpu::getNbPStates() +int Cpu::get_pstate_count() const { - return speedPerPstate_.size(); + return speed_per_pstate_.size(); } -void Cpu::setPState(int pstate_index) +void Cpu::set_pstate(int pstate_index) { - xbt_assert(pstate_index <= static_cast(speedPerPstate_.size()), + xbt_assert(pstate_index <= static_cast(speed_per_pstate_.size()), "Invalid parameters for CPU %s (pstate %d > length of pstates %d). Please fix your platform file, or your " "call to change the pstate.", - get_cname(), pstate_index, static_cast(speedPerPstate_.size())); + get_cname(), pstate_index, static_cast(speed_per_pstate_.size())); - double new_peak_speed = speedPerPstate_[pstate_index]; + double new_peak_speed = speed_per_pstate_[pstate_index]; pstate_ = pstate_index; speed_.peak = new_peak_speed; - onSpeedChange(); + on_speed_change(); } -int Cpu::getPState() +int Cpu::get_pstate() const { return pstate_; } -double Cpu::getPstateSpeed(int pstate_index) +double Cpu::get_pstate_peak_speed(int pstate_index) const { - xbt_assert((pstate_index <= static_cast(speedPerPstate_.size())), "Invalid parameters (pstate index out of bounds)"); + xbt_assert((pstate_index <= static_cast(speed_per_pstate_.size())), + "Invalid parameters (pstate index out of bounds)"); - return speedPerPstate_[pstate_index]; + return speed_per_pstate_[pstate_index]; } -double Cpu::getSpeed(double load) +double Cpu::get_speed(double load) const { return load * speed_.peak; } -double Cpu::get_available_speed() +double Cpu::get_speed_ratio() { /* number between 0 and 1 */ return speed_.scale; } -void Cpu::onSpeedChange() { +void Cpu::on_speed_change() +{ s4u::Host::on_speed_change(*host_); } -int Cpu::coreCount() +int Cpu::get_core_count() { - return coresAmount_; + return core_count_; } -void Cpu::setStateTrace(tmgr_trace_t trace) -{ - xbt_assert(stateEvent_ == nullptr, "Cannot set a second state trace to Host %s", host_->get_cname()); - - stateEvent_ = future_evt_set->add_trace(trace, this); -} -void Cpu::set_speed_trace(tmgr_trace_t trace) +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 = future_evt_set->add_trace(trace, this); + speed_.event = profile->schedule(&profile::future_evt_set, this); } @@ -163,7 +142,7 @@ 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(); @@ -172,11 +151,6 @@ void CpuAction::update_remains_lazy(double now) get_last_update()); update_remains(get_last_value() * delta); - if (TRACE_is_enabled()) { - Cpu* cpu = static_cast(get_variable()->get_constraint(0)->get_id()); - TRACE_surf_resource_set_utilization("HOST", "power_used", cpu->get_cname(), get_category(), get_last_value(), - get_last_update(), now - get_last_update()); - } XBT_CDEBUG(surf_kernel, "Updating action(%p): remains is now %f", this, get_remains_no_update()); } @@ -184,17 +158,17 @@ void CpuAction::update_remains_lazy(double now) set_last_value(get_variable()->get_value()); } -simgrid::xbt::signal CpuAction::onStateChange; +xbt::signal CpuAction::on_state_change; void CpuAction::suspend(){ Action::State previous = get_state(); - onStateChange(this, previous); + on_state_change(*this, previous); Action::suspend(); } void CpuAction::resume(){ Action::State previous = get_state(); - onStateChange(this, previous); + on_state_change(*this, previous); Action::resume(); } @@ -202,18 +176,19 @@ void CpuAction::set_state(Action::State state) { Action::State previous = get_state(); Action::set_state(state); - onStateChange(this, previous); + on_state_change(*this, previous); } + /** @brief returns a list of all CPUs that this action is using */ -std::list CpuAction::cpus() { +std::list CpuAction::cpus() const +{ std::list retlist; int llen = get_variable()->get_number_of_constraint(); 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()); + Resource* resource = get_variable()->get_constraint(i)->get_id(); Cpu* cpu = dynamic_cast(resource); if (cpu != nullptr) retlist.push_back(cpu); @@ -221,6 +196,6 @@ std::list CpuAction::cpus() { return retlist; } - -} -} +} // namespace resource +} // namespace kernel +} // namespace simgrid