X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3913458ae82f2f5e35f19faa879420b09f4bfa49..c9309ca5ce7b71208ec162d803972feabe4e42da:/src/surf/cpu_interface.cpp diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp index 260f49cdd6..6708124afe 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"); @@ -23,39 +23,29 @@ namespace surf { void CpuModel::updateActionsStateLazy(double now, double /*delta*/) { - while ((xbt_heap_size(getActionHeap()) > 0) - && (double_equals(xbt_heap_maxkey(getActionHeap()), now, sg_surf_precision))) { + while (not actionHeapIsEmpty() && double_equals(actionHeapTopDate(), now, sg_surf_precision)) { - CpuAction *action = static_cast(xbt_heap_pop(getActionHeap())); + CpuAction* action = static_cast(actionHeapPop()); 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()), + Cpu* cpu = static_cast(action->getVariable()->get_constraint(0)->get_id()); + TRACE_surf_host_set_utilization(cpu->getCname(), action->getCategory(), action->getVariable()->get_value(), 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 //without losing the event ascending order (considering all CPU's) double smaller = -1; - ActionList *actionSet = getRunningActionSet(); - for(ActionList::iterator it(actionSet->begin()), itend(actionSet->end()) - ; it != itend ; ++it) { - CpuAction *action = static_cast(&*it); - if (smaller < 0) { - smaller = action->getLastUpdate(); - continue; - } - if (action->getLastUpdate() < smaller) { - smaller = action->getLastUpdate(); - } + for (Action const& action : *getRunningActionSet()) { + if (smaller < 0 || action.getLastUpdate() < smaller) + smaller = action.getLastUpdate(); } if (smaller > 0) { TRACE_last_timestamp_to_dump = smaller; @@ -65,36 +55,24 @@ void CpuModel::updateActionsStateLazy(double now, double /*delta*/) void CpuModel::updateActionsStateFull(double now, double delta) { - CpuAction *action = nullptr; - ActionList *running_actions = getRunningActionSet(); - - for(ActionList::iterator it(running_actions->begin()), itNext=it, itend(running_actions->end()) - ; it != itend ; it=itNext) { - ++itNext; - action = static_cast(&*it); + for (auto it = std::begin(*getRunningActionSet()); it != std::end(*getRunningActionSet());) { + 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 (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()), + Cpu* cpu = static_cast(action.getVariable()->get_constraint(0)->get_id()); + TRACE_surf_host_set_utilization(cpu->getCname(), action.getCategory(), action.getVariable()->get_value(), now - delta, delta); TRACE_last_timestamp_to_dump = now - delta; } - action->updateRemains(lmm_variable_getvalue(action->getVariable()) * delta); - + action.updateRemains(action.getVariable()->get_value() * delta); - if (action->getMaxDuration() != NO_MAX_DURATION) - action->updateMaxDuration(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) && (action.getVariable()->get_weight() > 0)) || + ((action.getMaxDuration() != NO_MAX_DURATION) && (action.getMaxDuration() <= 0))) { + action.finish(Action::State::done); } } } @@ -109,31 +87,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(); @@ -142,8 +112,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.", + getCname(), pstate_index, static_cast(speedPerPstate_.size())); double new_peak_speed = speedPerPstate_[pstate_index]; pstate_ = pstate_index; @@ -176,7 +147,8 @@ 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_); } int Cpu::coreCount() @@ -186,15 +158,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); } @@ -207,25 +179,39 @@ void CpuAction::updateRemainingLazy(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."); - double delta = now - lastUpdate_; + double delta = now - getLastUpdate(); - 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 (getRemainsNoUpdate() > 0) { + XBT_CDEBUG(surf_kernel, "Updating action(%p): remains was %f, last_update was: %f", this, getRemainsNoUpdate(), + getLastUpdate()); + updateRemains(getLastValue() * 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(getVariable()->get_constraint(0)->get_id()); + TRACE_surf_host_set_utilization(cpu->getCname(), getCategory(), getLastValue(), getLastUpdate(), + now - getLastUpdate()); } - 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, getRemainsNoUpdate()); } - lastUpdate_ = now; - lastValue_ = lmm_variable_getvalue(getVariable()); + refreshLastUpdate(); + setLastValue(getVariable()->get_value()); } 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); @@ -234,13 +220,12 @@ void CpuAction::setState(Action::State state){ /** @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 = getVariable()->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))); + Resource* resource = static_cast(getVariable()->get_constraint(i)->get_id()); Cpu* cpu = dynamic_cast(resource); if (cpu != nullptr) retlist.push_back(cpu);