X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2db0630d598bd5bf5daa239297202b85e8ff0813..eefc25aa1c98cbb7458cbf5d38007470e3bef7d0:/src/surf/cpu_interface.cpp diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp index b6c3f2c812..727c60240b 100644 --- a/src/surf/cpu_interface.cpp +++ b/src/surf/cpu_interface.cpp @@ -5,7 +5,8 @@ #include "cpu_interface.hpp" #include "src/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals -#include +#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"); @@ -26,20 +27,15 @@ void CpuModel::update_actions_state_lazy(double now, double /*delta*/) CpuAction* action = static_cast(get_action_heap().pop()); XBT_CDEBUG(surf_kernel, "Something happened to action %p", action); - if (TRACE_is_enabled()) { - Cpu* cpu = static_cast(action->get_variable()->get_constraint(0)->get_id()); - TRACE_surf_host_set_utilization(cpu->getCname(), action->get_category(), action->get_variable()->get_value(), - action->get_last_update(), now - action->get_last_update()); - } - action->finish(kernel::resource::Action::State::done); + 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_running_action_set()) { + for (kernel::resource::Action const& action : *get_started_action_set()) { if (smaller < 0 || action.get_last_update() < smaller) smaller = action.get_last_update(); } @@ -51,15 +47,9 @@ void CpuModel::update_actions_state_lazy(double now, double /*delta*/) void CpuModel::update_actions_state_full(double now, double delta) { - for (auto it = std::begin(*get_running_action_set()); it != std::end(*get_running_action_set());) { + 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 - if (TRACE_is_enabled()) { - Cpu* cpu = static_cast(action.get_variable()->get_constraint(0)->get_id()); - TRACE_surf_host_set_utilization(cpu->getCname(), action.get_category(), action.get_variable()->get_value(), - now - delta, delta); - TRACE_last_timestamp_to_dump = now - delta; - } action.update_remains(action.get_variable()->get_value() * delta); @@ -68,7 +58,7 @@ void CpuModel::update_actions_state_full(double now, double delta) if (((action.get_remains_no_update() <= 0) && (action.get_variable()->get_weight() > 0)) || ((action.get_max_duration() != NO_MAX_DURATION) && (action.get_max_duration() <= 0))) { - action.finish(kernel::resource::Action::State::done); + action.finish(kernel::resource::Action::State::FINISHED); } } } @@ -83,52 +73,53 @@ Cpu::Cpu(kernel::resource::Model* model, simgrid::s4u::Host* host, std::vector* speedPerPstate, int core) - : Resource(model, host->getCname(), constraint), coresAmount_(core), host_(host) + : Resource(model, host->get_cname(), constraint), cores_count_(core), host_(host) { - xbt_assert(core > 0, "Host %s must have at least one core, not 0.", host->getCname()); + xbt_assert(core > 0, "Host %s must have at least one core, not 0.", host->get_cname()); speed_.peak = speedPerPstate->front(); speed_.scale = 1; host->pimpl_cpu = this; - xbt_assert(speed_.scale > 0, "Speed of host %s must be >0", host->getCname()); + 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); + speed_per_pstate_.push_back(value); } } Cpu::~Cpu() = default; -int Cpu::getNbPStates() +int Cpu::get_pstates_count() { - 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.", - getCname(), 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(); } -int Cpu::getPState() +int Cpu::get_pstate() { return pstate_; } double Cpu::getPstateSpeed(int pstate_index) { - 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) @@ -143,24 +134,23 @@ double Cpu::get_available_speed() } void Cpu::onSpeedChange() { - TRACE_surf_host_set_speed(surf_get_clock(), getCname(), coresAmount_ * speed_.scale * speed_.peak); - s4u::Host::onSpeedChange(*host_); + s4u::Host::on_speed_change(*host_); } -int Cpu::coreCount() +int Cpu::get_cores_count() { - return coresAmount_; + return cores_count_; } void Cpu::setStateTrace(tmgr_trace_t trace) { - xbt_assert(stateEvent_ == nullptr, "Cannot set a second state trace to Host %s", host_->getCname()); + xbt_assert(state_event_ == nullptr, "Cannot set a second state trace to Host %s", host_->get_cname()); - stateEvent_ = future_evt_set->add_trace(trace, this); + state_event_ = future_evt_set->add_trace(trace, this); } void Cpu::set_speed_trace(tmgr_trace_t trace) { - xbt_assert(speed_.event == nullptr, "Cannot set a second speed trace to Host %s", host_->getCname()); + 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); } @@ -172,7 +162,7 @@ void Cpu::set_speed_trace(tmgr_trace_t trace) void CpuAction::update_remains_lazy(double now) { - xbt_assert(get_state_set() == get_model()->get_running_action_set(), + 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."); @@ -185,8 +175,8 @@ void CpuAction::update_remains_lazy(double now) if (TRACE_is_enabled()) { Cpu* cpu = static_cast(get_variable()->get_constraint(0)->get_id()); - TRACE_surf_host_set_utilization(cpu->getCname(), get_category(), get_last_value(), get_last_update(), - now - get_last_update()); + 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()); }