X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/00e649212cc6ca64c4cb8103e4c5bb4b98d2ff3f..ac0bf6a9396efa37d528695f248e568ab5a2eb98:/src/surf/cpu_interface.cpp diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp index 4e42b2199e..faa4ab5ddc 100644 --- a/src/surf/cpu_interface.cpp +++ b/src/surf/cpu_interface.cpp @@ -1,12 +1,12 @@ -/* Copyright (c) 2013-2015. The SimGrid Team. +/* Copyright (c) 2013-2017. 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 XBT_LOG_EXTERNAL_CATEGORY(surf_kernel); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu, surf, "Logging specific to the SURF cpu module"); @@ -30,16 +30,16 @@ void CpuModel::updateActionsStateLazy(double now, double /*delta*/) 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()); + TRACE_surf_host_set_utilization(cpu->getCname(), action->getCategory(), + lmm_variable_getvalue(action->getVariable()), action->getLastUpdate(), + now - action->getLastUpdate()); } - action->finish(); + action->finish(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 @@ -64,32 +64,27 @@ void CpuModel::updateActionsStateFull(double now, double delta) CpuAction *action = nullptr; ActionList *running_actions = getRunningActionSet(); ActionList::iterator it(running_actions->begin()); - ActionList::iterator itend(running_actions->end()) for (; it != itend; ++it) - { + 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)) ); - TRACE_surf_host_set_utilization(cpu->cname(), action->getCategory(), lmm_variable_getvalue(action->getVariable()), - now - delta, delta); + TRACE_surf_host_set_utilization(cpu->getCname(), 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); - if (action->getMaxDuration() != NO_MAX_DURATION) action->updateMaxDuration(delta); - - if ((action->getRemainsNoUpdate() <= 0) && - (lmm_get_variable_weight(action->getVariable()) > 0)) { - action->finish(); - action->setState(Action::State::done); - } else if ((action->getMaxDuration() != NO_MAX_DURATION) && - (action->getMaxDuration() <= 0)) { - action->finish(); - action->setState(Action::State::done); + if (((action->getRemainsNoUpdate() <= 0) && (lmm_get_variable_weight(action->getVariable()) > 0)) || + ((action->getMaxDuration() != NO_MAX_DURATION) && (action->getMaxDuration() <= 0))) { + action->finish(Action::State::done); } } } @@ -104,31 +99,23 @@ Cpu::Cpu(Model *model, simgrid::s4u::Host *host, std::vector *speedPerPs Cpu::Cpu(Model* model, simgrid::s4u::Host* host, lmm_constraint_t constraint, std::vector* speedPerPstate, int core) - : Resource(model, host->cname(), constraint), coresAmount_(core), host_(host) + : Resource(model, host->getCname(), constraint), coresAmount_(core), host_(host) { - xbt_assert(core > 0, "Host %s must have at least one core, not 0.", host->cname()); + xbt_assert(core > 0, "Host %s must have at least one core, not 0.", host->getCname()); speed_.peak = speedPerPstate->front(); speed_.scale = 1; host->pimpl_cpu = this; - xbt_assert(speed_.scale > 0, "Speed of host %s must be >0", host->cname()); + xbt_assert(speed_.scale > 0, "Speed of host %s must be >0", host->getCname()); // Copy the power peak array: - for (double value : *speedPerPstate) { + for (double const& value : *speedPerPstate) { speedPerPstate_.push_back(value); } - - xbt_assert(model == surf_cpu_model_pm || core==1, "Currently, VM cannot be multicore"); } Cpu::~Cpu() = default; -/** @brief The amount of flop per second that this CPU can compute at its current DVFS level */ -double Cpu::getPstateSpeedCurrent() -{ - return speed_.peak; -} - int Cpu::getNbPStates() { return speedPerPstate_.size(); @@ -137,7 +124,7 @@ 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, + "Invalid parameters for CPU %s (pstate %d > length of pstates %d)", getCname(), pstate_index, static_cast(speedPerPstate_.size())); double new_peak_speed = speedPerPstate_[pstate_index]; @@ -171,7 +158,7 @@ double Cpu::getAvailableSpeed() } void Cpu::onSpeedChange() { - TRACE_surf_host_set_speed(surf_get_clock(), cname(), coresAmount_ * speed_.scale * speed_.peak); + TRACE_surf_host_set_speed(surf_get_clock(), getCname(), coresAmount_ * speed_.scale * speed_.peak); s4u::Host::onSpeedChange(*host_); } @@ -182,15 +169,15 @@ int Cpu::coreCount() void Cpu::setStateTrace(tmgr_trace_t trace) { - xbt_assert(stateEvent_ == nullptr, "Cannot set a second state trace to Host %s", host_->cname()); + xbt_assert(stateEvent_ == nullptr, "Cannot set a second state trace to Host %s", host_->getCname()); - stateEvent_ = future_evt_set->add_trace(trace, 0.0, this); + stateEvent_ = future_evt_set->add_trace(trace, this); } void Cpu::setSpeedTrace(tmgr_trace_t trace) { - xbt_assert(speed_.event == nullptr, "Cannot set a second speed trace to Host %s", host_->cname()); + xbt_assert(speed_.event == nullptr, "Cannot set a second speed trace to Host %s", host_->getCname()); - speed_.event = future_evt_set->add_trace(trace, 0.0, this); + speed_.event = future_evt_set->add_trace(trace, this); } @@ -211,7 +198,7 @@ void CpuAction::updateRemainingLazy(double now) 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_); + TRACE_surf_host_set_utilization(cpu->getCname(), getCategory(), lastValue_, lastUpdate_, now - lastUpdate_); } XBT_CDEBUG(surf_kernel, "Updating action(%p): remains is now %f", this, remains_); } @@ -222,6 +209,18 @@ void CpuAction::updateRemainingLazy(double now) simgrid::xbt::signal CpuAction::onStateChange; +void CpuAction::suspend(){ + Action::State previous = getState(); + onStateChange(this, previous); + Action::suspend(); +} + +void CpuAction::resume(){ + Action::State previous = getState(); + onStateChange(this, previous); + Action::resume(); +} + void CpuAction::setState(Action::State state){ Action::State previous = getState(); Action::setState(state);