X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f9436b840852218b39dce22d6057b6f223168daa..1bd1bbd35034c2e93a030a676dc244ad2cf74c70:/src/surf/cpu_ti.cpp diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp index 16f0c64eba..942cfd235d 100644 --- a/src/surf/cpu_ti.cpp +++ b/src/surf/cpu_ti.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 "cpu_ti.hpp" -#include "xbt/heap.h" #include "src/surf/trace_mgr.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 * *********/ @@ -34,7 +28,7 @@ CpuTiTrace::CpuTiTrace(tmgr_trace_t speedTrace) nbPoints_ = speedTrace->event_list.size() + 1; timePoints_ = new double[nbPoints_]; integral_ = new double[nbPoints_]; - for (auto val : speedTrace->event_list) { + for (auto const& val : speedTrace->event_list) { timePoints_[i] = time; integral_[i] = integral; integral += val.date_ * val.value_; @@ -273,7 +267,7 @@ CpuTiTgmr::CpuTiTgmr(tmgr_trace_t speedTrace, double value) : type_ = TRACE_DYNAMIC; /* count the total time of trace file */ - for (auto val : speedTrace->event_list) + for (auto const& val : speedTrace->event_list) total_time += val.date_; trace_ = new CpuTiTrace(speedTrace); @@ -296,9 +290,8 @@ int CpuTiTrace::binarySearch(double *array, double a, int low, int high) { xbt_assert(low < high, "Wrong parameters: low (%d) should be smaller than high (%d)", low, high); - int mid; do { - mid = low + (high - low) / 2; + int mid = low + (high - low) / 2; XBT_DEBUG("a %f low %d high %d mid %d value %f", a, low, high, mid, array[mid]); if (array[mid] > a) @@ -338,9 +331,6 @@ 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() @@ -348,7 +338,6 @@ 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) @@ -361,15 +350,17 @@ 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 ;) { + CpuTiList::iterator itend(modifiedCpu_->end()); + CpuTiList::iterator it(modifiedCpu_->begin()); + while (it != itend) { CpuTi *ti = &*it; ++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; + if (not actionHeapIsEmpty()) + min_action_duration = actionHeapTopDate() - now; XBT_DEBUG("Share resources, min next event date: %f", min_action_duration); @@ -378,13 +369,12 @@ 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(); + action->finish(Action::State::done); /* set the remains to 0 due to precision problems when updating the remaining amount */ action->setRemains(0); - action->setState(Action::State::done); /* update remaining amount of all actions */ action->cpu_->updateRemainingAmount(surf_get_clock()); } @@ -462,20 +452,15 @@ 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) { - + 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); - if (action->indexHeap_ >= 0) { - CpuTiAction* heap_act = static_cast( - xbt_heap_remove(static_cast(model())->tiActionHeap_, action->indexHeap_)); - if (heap_act != action) - DIE_IMPOSSIBLE; - } + action->heapRemove(model()->getActionHeap()); } } } @@ -491,12 +476,12 @@ void CpuTi::updateActionsFinishTime(double now) CpuTiAction *action; double sum_priority = 0.0; double total_area; - double min_finish = -1; /* update remaining amount of actions */ updateRemainingAmount(now); - for(ActionTiList::iterator it(actionSet_->begin()), itend(actionSet_->end()) ; it != itend ; ++it) { + ActionTiList::iterator itend(actionSet_->end()); + for (ActionTiList::iterator it(actionSet_->begin()); it != itend; ++it) { action = &*it; /* action not running, skip it */ if (action->getStateSet() != surf_cpu_model_pm->getRunningActionSet()) @@ -514,9 +499,9 @@ void CpuTi::updateActionsFinishTime(double now) } sumPriority_ = sum_priority; - for(ActionTiList::iterator it(actionSet_->begin()), itend(actionSet_->end()) ; it != itend ; ++it) { + for (ActionTiList::iterator it(actionSet_->begin()); it != itend; ++it) { action = &*it; - min_finish = -1; + double min_finish = -1; /* action not running, skip it */ if (action->getStateSet() != surf_cpu_model_pm->getRunningActionSet()) continue; @@ -531,28 +516,23 @@ void CpuTi::updateActionsFinishTime(double now) 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->finishTime_) + action->getStartTime() + action->getMaxDuration() < action->getFinishTime()) min_finish = action->getStartTime() + action->getMaxDuration(); else - min_finish = action->finishTime_; + min_finish = action->getFinishTime(); } else { /* put the max duration time on heap */ if (action->getMaxDuration() > NO_MAX_DURATION) min_finish = action->getStartTime() + action->getMaxDuration(); } /* 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(model()->getActionHeap(), min_finish, NOTSET); + else + action->heapRemove(model()->getActionHeap()); - 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->getStartTime(), action->getFinishTime(), action->getMaxDuration()); } /* remove from modified cpu */ modified(false); @@ -580,8 +560,8 @@ 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) { + ActionTiList::iterator itend(actionSet_->end()); + for (ActionTiList::iterator it(actionSet_->begin()); it != itend; ++it) { CpuTiAction *action = &*it; /* action not running, skip it */ if (action->getStateSet() != model()->getRunningActionSet()) @@ -600,19 +580,19 @@ void CpuTi::updateRemainingAmount(double now) continue; /* skip action that are finishing now */ - if (action->finishTime_ >= 0 && action->finishTime_ <= 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->remains_); + XBT_DEBUG("Update remaining action(%p) remaining %f", action, action->getRemainsNoUpdate()); } 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); @@ -625,12 +605,12 @@ 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->setMaxDuration(duration); action->suspended_ = 2; if (duration == NO_MAX_DURATION) { /* Move to the *end* of the corresponding action set. This convention @@ -670,11 +650,6 @@ CpuTiAction::CpuTiAction(CpuTiModel *model_, double cost, bool failed, CpuTi *cp cpu_->modified(true); } -void CpuTiAction::updateIndexHeap(int i) -{ - indexHeap_ = i; -} - void CpuTiAction::setState(Action::State state) { CpuAction::setState(state); @@ -691,7 +666,7 @@ int CpuTiAction::unref() 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_); + heapRemove(getModel()->getActionHeap()); cpu_->modified(true); delete this; return 1; @@ -702,7 +677,7 @@ int CpuTiAction::unref() void CpuTiAction::cancel() { this->setState(Action::State::failed); - xbt_heap_remove(getModel()->getActionHeap(), this->indexHeap_); + heapRemove(getModel()->getActionHeap()); cpu_->modified(true); } @@ -711,7 +686,7 @@ void CpuTiAction::suspend() XBT_IN("(%p)", this); if (suspended_ != 2) { suspended_ = 1; - xbt_heap_remove(getModel()->getActionHeap(), indexHeap_); + heapRemove(getModel()->getActionHeap()); cpu_->modified(true); } XBT_OUT(); @@ -733,7 +708,7 @@ void CpuTiAction::setMaxDuration(double duration) XBT_IN("(%p,%g)", this, duration); - maxDuration_ = duration; + Action::setMaxDuration(duration); if (duration >= 0) min_finish = (getStartTime() + getMaxDuration()) < getFinishTime() ? @@ -741,21 +716,16 @@ void CpuTiAction::setMaxDuration(double duration) else min_finish = getFinishTime(); -/* 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(getModel()->getActionHeap(), min_finish, NOTSET); XBT_OUT(); } -void CpuTiAction::setPriority(double priority) +void CpuTiAction::setSharingWeight(double priority) { XBT_IN("(%p,%g)", this, priority); - priority_ = priority; + setSharingWeightNoUpdate(priority); cpu_->modified(true); XBT_OUT(); } @@ -765,7 +735,7 @@ double CpuTiAction::getRemains() XBT_IN("(%p)", this); cpu_->updateRemainingAmount(surf_get_clock()); XBT_OUT(); - return remains_; + return getRemainsNoUpdate(); } }