X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/74c1bf2b26c5a3aa0d8c29674dc12993e7c0de15..1aaf3e3fc120f9434c692f1c49d03a00b24e55a1:/src/surf/cpu_ti.cpp diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp index 5366483665..f4db720924 100644 --- a/src/surf/cpu_ti.cpp +++ b/src/surf/cpu_ti.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 "cpu_ti.hpp" -#include "xbt/heap.h" #include "src/surf/trace_mgr.hpp" +#include "xbt/utility.hpp" +#include #ifndef SURF_MODEL_CPUTI_H_ #define SURF_MODEL_CPUTI_H_ @@ -16,12 +16,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_ti, surf_cpu, "Logging specific to the namespace simgrid { namespace surf { -static inline -void cpu_ti_action_update_index_heap(void *action, int i) -{ - (static_cast(action))->updateIndexHeap(i); -} - /********* * Trace * *********/ @@ -332,22 +326,9 @@ void surf_cpu_model_init_ti() namespace simgrid { namespace surf { -CpuTiModel::CpuTiModel() : CpuModel() -{ - runningActionSetThatDoesNotNeedBeingChecked_ = new ActionList(); - - modifiedCpu_ = new CpuTiList(); - - tiActionHeap_ = xbt_heap_new(8, nullptr); - xbt_heap_set_update_callback(tiActionHeap_, cpu_ti_action_update_index_heap); -} - CpuTiModel::~CpuTiModel() { surf_cpu_model_pm = nullptr; - delete runningActionSetThatDoesNotNeedBeingChecked_; - delete modifiedCpu_; - xbt_heap_free(tiActionHeap_); } Cpu *CpuTiModel::createCpu(simgrid::s4u::Host *host, std::vector* speedPerPstate, int core) @@ -359,16 +340,16 @@ double CpuTiModel::nextOccuringEvent(double now) { double min_action_duration = -1; -/* iterates over modified cpus to update share resources */ - for(CpuTiList::iterator it(modifiedCpu_->begin()), itend(modifiedCpu_->end()) ; it != itend ;) { - CpuTi *ti = &*it; - ++it; - ti->updateActionsFinishTime(now); + /* iterates over modified cpus to update share resources */ + for (auto it = std::begin(modifiedCpu_); it != std::end(modifiedCpu_);) { + CpuTi& ti = *it; + ++it; // increment iterator here since the following call to ti.updateActionsFinishTime() may invalidate it + ti.updateActionsFinishTime(now); } -/* get the min next event if heap not empty */ - if (xbt_heap_size(tiActionHeap_) > 0) - min_action_duration = xbt_heap_maxkey(tiActionHeap_) - now; + /* get the min next event if heap not empty */ + if (not actionHeapIsEmpty()) + min_action_duration = actionHeapTopDate() - now; XBT_DEBUG("Share resources, min next event date: %f", min_action_duration); @@ -377,13 +358,10 @@ double CpuTiModel::nextOccuringEvent(double now) void CpuTiModel::updateActionsState(double now, double /*delta*/) { - while ((xbt_heap_size(tiActionHeap_) > 0) && (xbt_heap_maxkey(tiActionHeap_) <= now)) { - CpuTiAction *action = static_cast(xbt_heap_pop(tiActionHeap_)); + while (not actionHeapIsEmpty() && actionHeapTopDate() <= now) { + CpuTiAction* action = static_cast(actionHeapPop()); XBT_DEBUG("Action %p: finish", action); - action->finish(); - /* set the remains to 0 due to precision problems when updating the remaining amount */ - action->setRemains(0); - action->setState(Action::State::done); + action->finish(kernel::resource::Action::State::done); /* update remaining amount of all actions */ action->cpu_->updateRemainingAmount(surf_get_clock()); } @@ -398,8 +376,6 @@ CpuTi::CpuTi(CpuTiModel *model, simgrid::s4u::Host *host, std::vector *s xbt_assert(core==1,"Multi-core not handled by this model yet"); coresAmount_ = core; - actionSet_ = new ActionTiList(); - speed_.peak = speedPerPstate->front(); XBT_DEBUG("CPU create: peak=%f", speed_.peak); @@ -410,7 +386,6 @@ CpuTi::~CpuTi() { modified(false); delete speedIntegratedTrace_; - delete actionSet_; } void CpuTi::setSpeedTrace(tmgr_trace_t trace) { @@ -434,7 +409,7 @@ void CpuTi::apply_event(tmgr_trace_event_t event, double value) CpuTiTgmr *trace; XBT_DEBUG("Finish trace date: value %f", value); - /* update remaining of actions and put in modified cpu swag */ + /* update remaining of actions and put in modified cpu list */ updateRemainingAmount(surf_get_clock()); modified(true); @@ -461,20 +436,13 @@ void CpuTi::apply_event(tmgr_trace_event_t event, double value) double date = surf_get_clock(); /* put all action running on cpu to failed */ - for(ActionTiList::iterator it(actionSet_->begin()), itend(actionSet_->end()); it != itend ; ++it) { - - CpuTiAction *action = &*it; - if (action->getState() == Action::State::running - || action->getState() == Action::State::ready - || action->getState() == Action::State::not_in_the_system) { - action->setFinishTime(date); - action->setState(Action::State::failed); - if (action->indexHeap_ >= 0) { - CpuTiAction* heap_act = static_cast( - xbt_heap_remove(static_cast(model())->tiActionHeap_, action->indexHeap_)); - if (heap_act != action) - DIE_IMPOSSIBLE; - } + for (CpuTiAction& action : actionSet_) { + if (action.get_state() == kernel::resource::Action::State::running || + action.get_state() == kernel::resource::Action::State::ready || + action.get_state() == kernel::resource::Action::State::not_in_the_system) { + action.set_finish_time(date); + action.set_state(kernel::resource::Action::State::failed); + action.heapRemove(); } } } @@ -487,70 +455,62 @@ void CpuTi::apply_event(tmgr_trace_event_t event, double value) void CpuTi::updateActionsFinishTime(double now) { - CpuTiAction *action; double sum_priority = 0.0; double total_area; /* update remaining amount of actions */ updateRemainingAmount(now); - for(ActionTiList::iterator it(actionSet_->begin()), itend(actionSet_->end()) ; it != itend ; ++it) { - action = &*it; + for (CpuTiAction const& action : actionSet_) { /* action not running, skip it */ - if (action->getStateSet() != surf_cpu_model_pm->getRunningActionSet()) + if (action.get_state_set() != surf_cpu_model_pm->getRunningActionSet()) continue; /* bogus priority, skip it */ - if (action->getPriority() <= 0) + if (action.get_priority() <= 0) continue; /* action suspended, skip it */ - if (action->suspended_ != 0) + if (action.suspended_ != kernel::resource::Action::SuspendStates::not_suspended) continue; - sum_priority += 1.0 / action->getPriority(); + sum_priority += 1.0 / action.get_priority(); } sumPriority_ = sum_priority; - for(ActionTiList::iterator it(actionSet_->begin()), itend(actionSet_->end()) ; it != itend ; ++it) { - action = &*it; + for (CpuTiAction& action : actionSet_) { double min_finish = -1; /* action not running, skip it */ - if (action->getStateSet() != surf_cpu_model_pm->getRunningActionSet()) + if (action.get_state_set() != surf_cpu_model_pm->getRunningActionSet()) continue; /* verify if the action is really running on cpu */ - if (action->suspended_ == 0 && action->getPriority() > 0) { + if (action.suspended_ == kernel::resource::Action::SuspendStates::not_suspended && action.get_priority() > 0) { /* total area needed to finish the action. Used in trace integration */ - total_area = (action->getRemains()) * sum_priority * action->getPriority(); + total_area = (action.get_remains()) * sum_priority * action.get_priority(); total_area /= speed_.peak; - action->setFinishTime(speedIntegratedTrace_->solve(now, total_area)); + action.set_finish_time(speedIntegratedTrace_->solve(now, total_area)); /* verify which event will happen before (max_duration or finish time) */ - if (action->getMaxDuration() > NO_MAX_DURATION && - action->getStartTime() + action->getMaxDuration() < action->finishTime_) - min_finish = action->getStartTime() + action->getMaxDuration(); + if (action.get_max_duration() > NO_MAX_DURATION && + action.get_start_time() + action.get_max_duration() < action.get_finish_time()) + min_finish = action.get_start_time() + action.get_max_duration(); else - min_finish = action->finishTime_; + min_finish = action.get_finish_time(); } else { /* put the max duration time on heap */ - if (action->getMaxDuration() > NO_MAX_DURATION) - min_finish = action->getStartTime() + action->getMaxDuration(); + if (action.get_max_duration() > NO_MAX_DURATION) + min_finish = action.get_start_time() + action.get_max_duration(); } /* add in action heap */ - XBT_DEBUG("action(%p) index %d", action, action->indexHeap_); - if (action->indexHeap_ >= 0) { - CpuTiAction* heap_act = static_cast( - xbt_heap_remove(static_cast(model())->tiActionHeap_, action->indexHeap_)); - if (heap_act != action) - DIE_IMPOSSIBLE; - } if (min_finish > NO_MAX_DURATION) - xbt_heap_push(static_cast(model())->tiActionHeap_, action, min_finish); + action.heapUpdate(min_finish, kernel::resource::Action::Type::NOTSET); + else + action.heapRemove(); - XBT_DEBUG("Update finish time: Cpu(%s) Action: %p, Start Time: %f Finish Time: %f Max duration %f", cname(), action, - action->getStartTime(), action->finishTime_, action->getMaxDuration()); + XBT_DEBUG("Update finish time: Cpu(%s) Action: %p, Start Time: %f Finish Time: %f Max duration %f", getCname(), + &action, action.get_start_time(), action.get_finish_time(), action.get_max_duration()); } /* remove from modified cpu */ modified(false); @@ -558,7 +518,7 @@ void CpuTi::updateActionsFinishTime(double now) bool CpuTi::isUsed() { - return not actionSet_->empty(); + return not actionSet_.empty(); } double CpuTi::getAvailableSpeed() @@ -578,42 +538,40 @@ void CpuTi::updateRemainingAmount(double now) /* compute the integration area */ double area_total = speedIntegratedTrace_->integrate(lastUpdate_, now) * speed_.peak; XBT_DEBUG("Flops total: %f, Last update %f", area_total, lastUpdate_); - - for(ActionTiList::iterator it(actionSet_->begin()), itend(actionSet_->end()) ; it != itend ; ++it) { - CpuTiAction *action = &*it; + for (CpuTiAction& action : actionSet_) { /* action not running, skip it */ - if (action->getStateSet() != model()->getRunningActionSet()) + if (action.get_state_set() != model()->getRunningActionSet()) continue; /* bogus priority, skip it */ - if (action->getPriority() <= 0) + if (action.get_priority() <= 0) continue; /* action suspended, skip it */ - if (action->suspended_ != 0) + if (action.suspended_ != kernel::resource::Action::SuspendStates::not_suspended) continue; /* action don't need update */ - if (action->getStartTime() >= now) + if (action.get_start_time() >= now) continue; /* skip action that are finishing now */ - if (action->finishTime_ >= 0 && action->finishTime_ <= now) + if (action.get_finish_time() >= 0 && action.get_finish_time() <= now) continue; /* update remaining */ - action->updateRemains(area_total / (sumPriority_ * action->getPriority())); - XBT_DEBUG("Update remaining action(%p) remaining %f", action, action->remains_); + action.update_remains(area_total / (sumPriority_ * action.get_priority())); + XBT_DEBUG("Update remaining action(%p) remaining %f", &action, action.get_remains_no_update()); } lastUpdate_ = now; } CpuAction *CpuTi::execution_start(double size) { - XBT_IN("(%s,%g)", cname(), size); + XBT_IN("(%s,%g)", getCname(), size); CpuTiAction* action = new CpuTiAction(static_cast(model()), size, isOff(), this); - actionSet_->push_back(*action); + actionSet_.push_back(*action); XBT_OUT(); return action; @@ -623,37 +581,35 @@ CpuAction *CpuTi::execution_start(double size) CpuAction *CpuTi::sleep(double duration) { if (duration > 0) - duration = MAX(duration, sg_surf_precision); + duration = std::max(duration, sg_surf_precision); - XBT_IN("(%s,%g)", cname(), duration); + XBT_IN("(%s,%g)", getCname(), duration); CpuTiAction* action = new CpuTiAction(static_cast(model()), 1.0, isOff(), this); - action->maxDuration_ = duration; - action->suspended_ = 2; + action->set_max_duration(duration); + action->suspended_ = kernel::resource::Action::SuspendStates::sleeping; if (duration == NO_MAX_DURATION) { - /* Move to the *end* of the corresponding action set. This convention - is used to speed up update_resource_state */ - action->getStateSet()->erase(action->getStateSet()->iterator_to(*action)); - action->stateSet_ = static_cast(model())->runningActionSetThatDoesNotNeedBeingChecked_; - action->getStateSet()->push_back(*action); + /* Move to the *end* of the corresponding action set. This convention is used to speed up update_resource_state */ + simgrid::xbt::intrusive_erase(*action->get_state_set(), *action); + action->state_set_ = &static_cast(model())->runningActionSetThatDoesNotNeedBeingChecked_; + action->get_state_set()->push_back(*action); } - actionSet_->push_back(*action); + actionSet_.push_back(*action); XBT_OUT(); return action; } void CpuTi::modified(bool modified){ - CpuTiList* modifiedCpu = static_cast(model())->modifiedCpu_; + CpuTiList& modifiedCpu = static_cast(model())->modifiedCpu_; if (modified) { if (not cpu_ti_hook.is_linked()) { - modifiedCpu->push_back(*this); + modifiedCpu.push_back(*this); } } else { - if (cpu_ti_hook.is_linked()) { - modifiedCpu->erase(modifiedCpu->iterator_to(*this)); - } + if (cpu_ti_hook.is_linked()) + simgrid::xbt::intrusive_erase(modifiedCpu, *this); } } @@ -665,52 +621,37 @@ CpuTiAction::CpuTiAction(CpuTiModel *model_, double cost, bool failed, CpuTi *cp : CpuAction(model_, cost, failed) , cpu_(cpu) { - indexHeap_ = -1; cpu_->modified(true); } - -void CpuTiAction::updateIndexHeap(int i) -{ - indexHeap_ = i; -} - -void CpuTiAction::setState(Action::State state) +CpuTiAction::~CpuTiAction() { - CpuAction::setState(state); + /* remove from action_set */ + if (action_ti_hook.is_linked()) + simgrid::xbt::intrusive_erase(cpu_->actionSet_, *this); + /* remove from heap */ + heapRemove(); cpu_->modified(true); } -int CpuTiAction::unref() +void CpuTiAction::set_state(Action::State state) { - refcount_--; - if (not refcount_) { - if (action_hook.is_linked()) - getStateSet()->erase(getStateSet()->iterator_to(*this)); - /* remove from action_set */ - if (action_ti_hook.is_linked()) - cpu_->actionSet_->erase(cpu_->actionSet_->iterator_to(*this)); - /* remove from heap */ - xbt_heap_remove(static_cast(getModel())->tiActionHeap_, this->indexHeap_); - cpu_->modified(true); - delete this; - return 1; - } - return 0; + CpuAction::set_state(state); + cpu_->modified(true); } void CpuTiAction::cancel() { - this->setState(Action::State::failed); - xbt_heap_remove(getModel()->getActionHeap(), this->indexHeap_); + this->set_state(Action::State::failed); + heapRemove(); cpu_->modified(true); } void CpuTiAction::suspend() { XBT_IN("(%p)", this); - if (suspended_ != 2) { - suspended_ = 1; - xbt_heap_remove(getModel()->getActionHeap(), indexHeap_); + if (suspended_ != Action::SuspendStates::sleeping) { + suspended_ = Action::SuspendStates::suspended; + heapRemove(); cpu_->modified(true); } XBT_OUT(); @@ -719,52 +660,47 @@ void CpuTiAction::suspend() void CpuTiAction::resume() { XBT_IN("(%p)", this); - if (suspended_ != 2) { - suspended_ = 0; + if (suspended_ != Action::SuspendStates::sleeping) { + suspended_ = Action::SuspendStates::not_suspended; cpu_->modified(true); } XBT_OUT(); } -void CpuTiAction::setMaxDuration(double duration) +void CpuTiAction::set_max_duration(double duration) { double min_finish; XBT_IN("(%p,%g)", this, duration); - maxDuration_ = duration; + Action::set_max_duration(duration); if (duration >= 0) - min_finish = (getStartTime() + getMaxDuration()) < getFinishTime() ? - (getStartTime() + getMaxDuration()) : getFinishTime(); + min_finish = (get_start_time() + get_max_duration()) < get_finish_time() ? (get_start_time() + get_max_duration()) + : get_finish_time(); else - min_finish = getFinishTime(); + min_finish = get_finish_time(); -/* add in action heap */ - if (indexHeap_ >= 0) { - CpuTiAction *heap_act = static_cast(xbt_heap_remove(getModel()->getActionHeap(), indexHeap_)); - if (heap_act != this) - DIE_IMPOSSIBLE; - } - xbt_heap_push(getModel()->getActionHeap(), this, min_finish); + /* add in action heap */ + heapUpdate(min_finish, Action::Type::NOTSET); XBT_OUT(); } -void CpuTiAction::setSharingWeight(double priority) +void CpuTiAction::set_priority(double priority) { XBT_IN("(%p,%g)", this, priority); - sharingWeight_ = priority; + set_priority_no_update(priority); cpu_->modified(true); XBT_OUT(); } -double CpuTiAction::getRemains() +double CpuTiAction::get_remains() { XBT_IN("(%p)", this); cpu_->updateRemainingAmount(surf_get_clock()); XBT_OUT(); - return remains_; + return get_remains_no_update(); } }