X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dae127513a4c52efc8494d26ba2c56c802ba147e..015e60ae9d53f50a72b7b8ec61d17607aaa5a78c:/src/surf/cpu_ti.cpp diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp index a4c47a56e2..3fc88feb06 100644 --- a/src/surf/cpu_ti.cpp +++ b/src/surf/cpu_ti.cpp @@ -6,6 +6,8 @@ #include "cpu_ti.hpp" #include "src/surf/trace_mgr.hpp" +#include "xbt/utility.hpp" +#include #ifndef SURF_MODEL_CPUTI_H_ #define SURF_MODEL_CPUTI_H_ @@ -325,18 +327,9 @@ void surf_cpu_model_init_ti() namespace simgrid { namespace surf { -CpuTiModel::CpuTiModel() : CpuModel() -{ - runningActionSetThatDoesNotNeedBeingChecked_ = new ActionList(); - - modifiedCpu_ = new CpuTiList(); -} - CpuTiModel::~CpuTiModel() { surf_cpu_model_pm = nullptr; - delete runningActionSetThatDoesNotNeedBeingChecked_; - delete modifiedCpu_; } Cpu *CpuTiModel::createCpu(simgrid::s4u::Host *host, std::vector* speedPerPstate, int core) @@ -348,16 +341,14 @@ double CpuTiModel::nextOccuringEvent(double now) { double min_action_duration = -1; -/* iterates over modified cpus to update share resources */ - CpuTiList::iterator itend(modifiedCpu_->end()); - CpuTiList::iterator it(modifiedCpu_->begin()); - while (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 */ + /* get the min next event if heap not empty */ if (not actionHeapIsEmpty()) min_action_duration = actionHeapTopDate() - now; @@ -388,8 +379,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); @@ -400,7 +389,6 @@ CpuTi::~CpuTi() { modified(false); delete speedIntegratedTrace_; - delete actionSet_; } void CpuTi::setSpeedTrace(tmgr_trace_t trace) { @@ -424,7 +412,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); @@ -451,15 +439,12 @@ void CpuTi::apply_event(tmgr_trace_event_t event, double value) double date = surf_get_clock(); /* put all action running on cpu to failed */ - ActionTiList::iterator itend(actionSet_->end()); - for (ActionTiList::iterator it(actionSet_->begin()); 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); - action->heapRemove(model()->getActionHeap()); + for (CpuTiAction& action : actionSet_) { + 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); + action.heapRemove(model()->getActionHeap()); } } } @@ -472,66 +457,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); - ActionTiList::iterator itend(actionSet_->end()); - for (ActionTiList::iterator it(actionSet_->begin()); 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.getStateSet() != surf_cpu_model_pm->getRunningActionSet()) continue; /* bogus priority, skip it */ - if (action->getPriority() <= 0) + if (action.getPriority() <= 0) continue; /* action suspended, skip it */ - if (action->suspended_ != 0) + if (action.suspended_ != 0) continue; - sum_priority += 1.0 / action->getPriority(); + sum_priority += 1.0 / action.getPriority(); } sumPriority_ = sum_priority; - for (ActionTiList::iterator it(actionSet_->begin()); 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.getStateSet() != 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_ == 0 && action.getPriority() > 0) { /* total area needed to finish the action. Used in trace integration */ - total_area = (action->getRemains()) * sum_priority * action->getPriority(); + total_area = (action.getRemains()) * sum_priority * action.getPriority(); total_area /= speed_.peak; - action->setFinishTime(speedIntegratedTrace_->solve(now, total_area)); + action.setFinishTime(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->getFinishTime()) - min_finish = action->getStartTime() + action->getMaxDuration(); + if (action.getMaxDuration() > NO_MAX_DURATION && + action.getStartTime() + action.getMaxDuration() < action.getFinishTime()) + min_finish = action.getStartTime() + action.getMaxDuration(); else - min_finish = action->getFinishTime(); + min_finish = action.getFinishTime(); } else { /* put the max duration time on heap */ - if (action->getMaxDuration() > NO_MAX_DURATION) - min_finish = action->getStartTime() + action->getMaxDuration(); + if (action.getMaxDuration() > NO_MAX_DURATION) + min_finish = action.getStartTime() + action.getMaxDuration(); } /* add in action heap */ if (min_finish > NO_MAX_DURATION) - action->heapUpdate(model()->getActionHeap(), min_finish, NOTSET); + action.heapUpdate(model()->getActionHeap(), min_finish, NOTSET); else - action->heapRemove(model()->getActionHeap()); + action.heapRemove(model()->getActionHeap()); XBT_DEBUG("Update finish time: Cpu(%s) Action: %p, Start Time: %f Finish Time: %f Max duration %f", getCname(), - action, action->getStartTime(), action->getFinishTime(), action->getMaxDuration()); + &action, action.getStartTime(), action.getFinishTime(), action.getMaxDuration()); } /* remove from modified cpu */ modified(false); @@ -539,7 +520,7 @@ void CpuTi::updateActionsFinishTime(double now) bool CpuTi::isUsed() { - return not actionSet_->empty(); + return not actionSet_.empty(); } double CpuTi::getAvailableSpeed() @@ -559,32 +540,30 @@ 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_); - ActionTiList::iterator itend(actionSet_->end()); - for (ActionTiList::iterator it(actionSet_->begin()); it != itend; ++it) { - CpuTiAction *action = &*it; + for (CpuTiAction& action : actionSet_) { /* action not running, skip it */ - if (action->getStateSet() != model()->getRunningActionSet()) + if (action.getStateSet() != model()->getRunningActionSet()) continue; /* bogus priority, skip it */ - if (action->getPriority() <= 0) + if (action.getPriority() <= 0) continue; /* action suspended, skip it */ - if (action->suspended_ != 0) + if (action.suspended_ != 0) continue; /* action don't need update */ - if (action->getStartTime() >= now) + if (action.getStartTime() >= now) continue; /* skip action that are finishing now */ - if (action->getFinishTime() >= 0 && action->getFinishTime() <= now) + if (action.getFinishTime() >= 0 && action.getFinishTime() <= now) continue; /* update remaining */ - action->updateRemains(area_total / (sumPriority_ * action->getPriority())); - XBT_DEBUG("Update remaining action(%p) remaining %f", action, action->getRemainsNoUpdate()); + action.updateRemains(area_total / (sumPriority_ * action.getPriority())); + XBT_DEBUG("Update remaining action(%p) remaining %f", &action, action.getRemainsNoUpdate()); } lastUpdate_ = now; } @@ -594,7 +573,7 @@ CpuAction *CpuTi::execution_start(double 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; @@ -604,7 +583,7 @@ 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)", getCname(), duration); CpuTiAction* action = new CpuTiAction(static_cast(model()), 1.0, isOff(), this); @@ -612,29 +591,27 @@ CpuAction *CpuTi::sleep(double duration) action->setMaxDuration(duration); action->suspended_ = 2; 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->getStateSet(), *action); + action->stateSet_ = &static_cast(model())->runningActionSetThatDoesNotNeedBeingChecked_; + action->getStateSet()->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); } } @@ -646,7 +623,6 @@ CpuTiAction::CpuTiAction(CpuTiModel *model_, double cost, bool failed, CpuTi *cp : CpuAction(model_, cost, failed) , cpu_(cpu) { - updateIndexHeap(-1); cpu_->modified(true); } @@ -661,10 +637,10 @@ int CpuTiAction::unref() refcount_--; if (not refcount_) { if (action_hook.is_linked()) - getStateSet()->erase(getStateSet()->iterator_to(*this)); + simgrid::xbt::intrusive_erase(*getStateSet(), *this); /* remove from action_set */ if (action_ti_hook.is_linked()) - cpu_->actionSet_->erase(cpu_->actionSet_->iterator_to(*this)); + simgrid::xbt::intrusive_erase(cpu_->actionSet_, *this); /* remove from heap */ heapRemove(getModel()->getActionHeap()); cpu_->modified(true);