X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1847d1441271d076b3de449c8853031ea208ce8f..d5e80f361a8e20f8080faabf65bb2021c46f6656:/src/surf/cpu_interface.cpp diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp index e8282cbba4..e18c775b77 100644 --- a/src/surf/cpu_interface.cpp +++ b/src/surf/cpu_interface.cpp @@ -1,12 +1,12 @@ -/* Copyright (c) 2013-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2013-2018. 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 #include "cpu_interface.hpp" -#include "src/instr/instr_private.h" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals +#include "src/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals +#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"); @@ -21,37 +21,23 @@ namespace surf { * Model * *********/ -void CpuModel::updateActionsStateLazy(double now, double /*delta*/) +void CpuModel::update_actions_state_lazy(double now, double /*delta*/) { - while ((xbt_heap_size(getActionHeap()) > 0) - && (double_equals(xbt_heap_maxkey(getActionHeap()), now, sg_surf_precision))) { + while (not get_action_heap().empty() && double_equals(get_action_heap().top_date(), now, sg_surf_precision)) { - CpuAction *action = static_cast(xbt_heap_pop(getActionHeap())); + 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(lmm_constraint_id(lmm_get_cnst_from_var(getMaxminSystem(), action->getVariable(), 0))); - TRACE_surf_host_set_utilization(cpu->cname(), action->getCategory(), lmm_variable_getvalue(action->getVariable()), - action->getLastUpdate(), now - action->getLastUpdate()); - } - action->finish(); + action->finish(kernel::resource::Action::State::done); XBT_CDEBUG(surf_kernel, "Action %p finished", action); - - /* set the remains to 0 due to precision problems when updating the remaining amount */ - action->setRemains(0); - action->setState(Action::State::done); } 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; - ActionList *actionSet = getRunningActionSet(); - ActionList::iterator it(actionSet->begin()); - ActionList::iterator itend(actionSet->end()); - for (; it != itend; ++it) { - CpuAction *action = static_cast(&*it); - if (smaller < 0 || action->getLastUpdate() < smaller) - smaller = action->getLastUpdate(); + for (kernel::resource::Action const& action : *get_running_action_set()) { + if (smaller < 0 || action.get_last_update() < smaller) + smaller = action.get_last_update(); } if (smaller > 0) { TRACE_last_timestamp_to_dump = smaller; @@ -59,33 +45,20 @@ void CpuModel::updateActionsStateLazy(double now, double /*delta*/) } } -void CpuModel::updateActionsStateFull(double now, double delta) +void CpuModel::update_actions_state_full(double now, double delta) { - CpuAction *action = nullptr; - ActionList *running_actions = getRunningActionSet(); - ActionList::iterator it(running_actions->begin()); - ActionList::iterator itNext = it; - ActionList::iterator itend(running_actions->end()); - for (; it != itend; it = itNext) { - ++itNext; - action = static_cast(&*it); - if (TRACE_is_enabled()) { - Cpu *cpu = static_cast (lmm_constraint_id(lmm_get_cnst_from_var(getMaxminSystem(), action->getVariable(), 0)) ); + for (auto it = std::begin(*get_running_action_set()); it != std::end(*get_running_action_set());) { + CpuAction& action = static_cast(*it); + ++it; // increment iterator here since the following calls to action.finish() may invalidate it - TRACE_surf_host_set_utilization(cpu->cname(), action->getCategory(), lmm_variable_getvalue(action->getVariable()), - now - delta, delta); - TRACE_last_timestamp_to_dump = now - delta; - } - - action->updateRemains(lmm_variable_getvalue(action->getVariable()) * delta); + action.update_remains(action.get_variable()->get_value() * delta); - if (action->getMaxDuration() != NO_MAX_DURATION) - action->updateMaxDuration(delta); + if (action.get_max_duration() != NO_MAX_DURATION) + action.update_max_duration(delta); - if (((action->getRemainsNoUpdate() <= 0) && (lmm_get_variable_weight(action->getVariable()) > 0)) || - ((action->getMaxDuration() != NO_MAX_DURATION) && (action->getMaxDuration() <= 0))) { - action->finish(); - action->setState(Action::State::done); + 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); } } } @@ -93,21 +66,21 @@ void CpuModel::updateActionsStateFull(double now, double delta) /************ * Resource * ************/ -Cpu::Cpu(Model *model, simgrid::s4u::Host *host, std::vector *speedPerPstate, int core) - : Cpu(model, host, nullptr/*constraint*/, speedPerPstate, core) +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, simgrid::s4u::Host* host, lmm_constraint_t constraint, std::vector* speedPerPstate, - int core) - : Resource(model, host->getCname(), constraint), coresAmount_(core), host_(host) +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) { - 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) { @@ -125,8 +98,9 @@ int Cpu::getNbPStates() void Cpu::setPState(int pstate_index) { xbt_assert(pstate_index <= static_cast(speedPerPstate_.size()), - "Invalid parameters for CPU %s (pstate %d > length of pstates %d)", cname(), pstate_index, - static_cast(speedPerPstate_.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())); double new_peak_speed = speedPerPstate_[pstate_index]; pstate_ = pstate_index; @@ -152,14 +126,13 @@ double Cpu::getSpeed(double load) return load * speed_.peak; } -double Cpu::getAvailableSpeed() +double Cpu::get_available_speed() { /* number between 0 and 1 */ return speed_.scale; } void Cpu::onSpeedChange() { - TRACE_surf_host_set_speed(surf_get_clock(), cname(), coresAmount_ * speed_.scale * speed_.peak); s4u::Host::onSpeedChange(*host_); } @@ -170,13 +143,13 @@ int Cpu::coreCount() void Cpu::setStateTrace(tmgr_trace_t trace) { - xbt_assert(stateEvent_ == nullptr, "Cannot set a second state trace to Host %s", host_->getCname()); + 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::setSpeedTrace(tmgr_trace_t trace) +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); } @@ -186,57 +159,61 @@ void Cpu::setSpeedTrace(tmgr_trace_t trace) * Action * **********/ -void CpuAction::updateRemainingLazy(double now) +void CpuAction::update_remains_lazy(double now) { - xbt_assert(getStateSet() == getModel()->getRunningActionSet(), "You're updating an action that is not running."); - xbt_assert(getPriority() > 0, "You're updating an action that seems suspended."); + xbt_assert(get_state_set() == get_model()->get_running_action_set(), + "You're updating an action that is not running."); + xbt_assert(get_priority() > 0, "You're updating an action that seems suspended."); - double delta = now - lastUpdate_; + double delta = now - get_last_update(); - if (remains_ > 0) { - XBT_CDEBUG(surf_kernel, "Updating action(%p): remains was %f, last_update was: %f", this, remains_, lastUpdate_); - double_update(&(remains_), lastValue_ * delta, sg_maxmin_precision*sg_surf_precision); + 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()); + update_remains(get_last_value() * delta); if (TRACE_is_enabled()) { - Cpu *cpu = static_cast(lmm_constraint_id(lmm_get_cnst_from_var(getModel()->getMaxminSystem(), getVariable(), 0))); - TRACE_surf_host_set_utilization(cpu->cname(), getCategory(), lastValue_, lastUpdate_, now - lastUpdate_); + 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, remains_); + XBT_CDEBUG(surf_kernel, "Updating action(%p): remains is now %f", this, get_remains_no_update()); } - lastUpdate_ = now; - lastValue_ = lmm_variable_getvalue(getVariable()); + set_last_update(); + set_last_value(get_variable()->get_value()); } -simgrid::xbt::signal CpuAction::onStateChange; +simgrid::xbt::signal CpuAction::onStateChange; void CpuAction::suspend(){ - Action::State previous = getState(); + Action::State previous = get_state(); onStateChange(this, previous); Action::suspend(); } void CpuAction::resume(){ - Action::State previous = getState(); + Action::State previous = get_state(); onStateChange(this, previous); Action::resume(); } -void CpuAction::setState(Action::State state){ - Action::State previous = getState(); - Action::setState(state); +void CpuAction::set_state(Action::State state) +{ + Action::State previous = get_state(); + Action::set_state(state); onStateChange(this, previous); } /** @brief returns a list of all CPUs that this action is using */ std::list CpuAction::cpus() { std::list retlist; - lmm_system_t sys = getModel()->getMaxminSystem(); - int llen = lmm_get_number_of_cnst_from_var(sys, getVariable()); + 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*... - Resource* resource = static_cast(lmm_constraint_id(lmm_get_cnst_from_var(sys, getVariable(), i))); + kernel::resource::Resource* resource = + static_cast(get_variable()->get_constraint(i)->get_id()); Cpu* cpu = dynamic_cast(resource); if (cpu != nullptr) retlist.push_back(cpu);