X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/66acb13a76dfe861a60220704697e361495e0eb0..b56f5db19216ad6717f65e0c52383c87bad6e043:/src/surf/cpu_ti.cpp diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp index 90e5e8510e..0611e46a0d 100644 --- a/src/surf/cpu_ti.cpp +++ b/src/surf/cpu_ti.cpp @@ -1,11 +1,10 @@ -/* 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" #ifndef SURF_MODEL_CPUTI_H_ @@ -16,12 +15,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 * *********/ @@ -32,13 +25,13 @@ CpuTiTrace::CpuTiTrace(tmgr_trace_t speedTrace) double time = 0; int i = 0; nbPoints_ = speedTrace->event_list.size() + 1; - timePoints_ = static_cast(xbt_malloc0(sizeof(double) * nbPoints_)); - integral_ = static_cast(xbt_malloc0(sizeof(double) * nbPoints_)); - for (auto val : speedTrace->event_list) { + timePoints_ = new double[nbPoints_]; + integral_ = new double[nbPoints_]; + for (auto const& val : speedTrace->event_list) { timePoints_[i] = time; integral_[i] = integral; - integral += val.delta * val.value; - time += val.delta; + integral += val.date_ * val.value_; + time += val.date_; i++; } timePoints_[i] = time; @@ -47,8 +40,8 @@ CpuTiTrace::CpuTiTrace(tmgr_trace_t speedTrace) CpuTiTrace::~CpuTiTrace() { - xbt_free(timePoints_); - xbt_free(integral_); + delete [] timePoints_; + delete [] integral_; } CpuTiTgmr::~CpuTiTgmr() @@ -69,11 +62,7 @@ CpuTiTgmr::~CpuTiTgmr() */ double CpuTiTgmr::integrate(double a, double b) { - double first_chunk; - double middle_chunk; - double last_chunk; int a_index; - int b_index; if ((a < 0.0) || (a > b)) { xbt_die("Error, invalid integration interval [%.2f,%.2f]. " @@ -91,15 +80,15 @@ double CpuTiTgmr::integrate(double a, double b) else a_index = static_cast (ceil(a / lastTime_)); - b_index = static_cast (floor(b / lastTime_)); + int b_index = static_cast (floor(b / lastTime_)); if (a_index > b_index) { /* Same chunk */ return trace_->integrateSimple(a - (a_index - 1) * lastTime_, b - (b_index) * lastTime_); } - first_chunk = trace_->integrateSimple(a - (a_index - 1) * lastTime_, lastTime_); - middle_chunk = (b_index - a_index) * total_; - last_chunk = trace_->integrateSimple(0.0, b - (b_index) * lastTime_); + double first_chunk = trace_->integrateSimple(a - (a_index - 1) * lastTime_, lastTime_); + double middle_chunk = (b_index - a_index) * total_; + double last_chunk = trace_->integrateSimple(0.0, b - (b_index) * lastTime_); XBT_DEBUG("first_chunk=%.2f middle_chunk=%.2f last_chunk=%.2f\n", first_chunk, middle_chunk, last_chunk); @@ -124,10 +113,10 @@ double CpuTiTrace::integrateSimple(double a, double b) double CpuTiTrace::integrateSimplePoint(double a) { double integral = 0; - int ind; double a_aux = a; - ind = binarySearch(timePoints_, a, 0, nbPoints_ - 1); + int ind = binarySearch(timePoints_, a, 0, nbPoints_ - 1); integral += integral_[ind]; + XBT_DEBUG("a %f ind %d integral %f ind + 1 %f ind %f time +1 %f time %f", a, ind, integral, integral_[ind + 1], integral_[ind], timePoints_[ind + 1], timePoints_[ind]); double_update(&a_aux, timePoints_[ind], sg_maxmin_precision*sg_surf_precision); @@ -241,8 +230,8 @@ double CpuTiTgmr::getPowerScale(double a) { double reduced_a = a - floor(a / lastTime_) * lastTime_; int point = trace_->binarySearch(trace_->timePoints_, reduced_a, 0, trace_->nbPoints_ - 1); - s_tmgr_event_t val = speedTrace_->event_list.at(point); - return val.value; + trace_mgr::DatedValue val = speedTrace_->event_list.at(point); + return val.value_; } /** @@ -252,13 +241,14 @@ double CpuTiTgmr::getPowerScale(double a) * \param value Percentage of CPU speed available (useful to fixed tracing) * \return Integration trace structure */ -CpuTiTgmr::CpuTiTgmr(tmgr_trace_t speedTrace, double value) +CpuTiTgmr::CpuTiTgmr(tmgr_trace_t speedTrace, double value) : + speedTrace_(speedTrace) { double total_time = 0.0; trace_ = 0; /* no availability file, fixed trace */ - if (!speedTrace) { + if (not speedTrace) { type_ = TRACE_FIXED; value_ = value; XBT_DEBUG("No availability trace. Constant value = %f", value); @@ -267,19 +257,18 @@ CpuTiTgmr::CpuTiTgmr(tmgr_trace_t speedTrace, double value) /* only one point available, fixed trace */ if (speedTrace->event_list.size() == 1) { - s_tmgr_event_t val = speedTrace->event_list.front(); + trace_mgr::DatedValue val = speedTrace->event_list.front(); type_ = TRACE_FIXED; - value_ = val.value; + value_ = val.value_; return; } type_ = TRACE_DYNAMIC; - speedTrace_ = speedTrace; /* count the total time of trace file */ - for (auto val: speedTrace->event_list) { - total_time += val.delta; - } + for (auto const& val : speedTrace->event_list) + total_time += val.date_; + trace_ = new CpuTiTrace(speedTrace); lastTime_ = total_time; total_ = trace_->integrateSimple(0, total_time); @@ -300,9 +289,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) @@ -324,8 +312,8 @@ int CpuTiTrace::binarySearch(double *array, double a, int low, int high) void surf_cpu_model_init_ti() { - xbt_assert(!surf_cpu_model_pm,"CPU model already initialized. This should not happen."); - xbt_assert(!surf_cpu_model_vm,"CPU model already initialized. This should not happen."); + xbt_assert(not surf_cpu_model_pm, "CPU model already initialized. This should not happen."); + xbt_assert(not surf_cpu_model_vm, "CPU model already initialized. This should not happen."); surf_cpu_model_pm = new simgrid::surf::CpuTiModel(); all_existing_models->push_back(surf_cpu_model_pm); @@ -342,9 +330,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() @@ -352,7 +337,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) @@ -360,20 +344,22 @@ Cpu *CpuTiModel::createCpu(simgrid::s4u::Host *host, std::vector* speedP return new CpuTi(this, host, speedPerPstate, core); } -double CpuTiModel::next_occuring_event(double now) +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); @@ -382,13 +368,12 @@ double CpuTiModel::next_occuring_event(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()); } @@ -426,13 +411,13 @@ void CpuTi::setSpeedTrace(tmgr_trace_t trace) /* add a fake trace event if periodicity == 0 */ if (trace && trace->event_list.size() > 1) { - s_tmgr_event_t val = trace->event_list.back(); - if (val.delta < 1e-12) - speed_.event = future_evt_set->add_trace(tmgr_empty_trace_new(), 0.0, this); + trace_mgr::DatedValue val = trace->event_list.back(); + if (val.date_ < 1e-12) + speed_.event = future_evt_set->add_trace(new simgrid::trace_mgr::trace(), this); } } -void CpuTi::apply_event(tmgr_trace_iterator_t event, double value) +void CpuTi::apply_event(tmgr_trace_event_t event, double value) { if (event == speed_.event) { tmgr_trace_t speedTrace; @@ -445,12 +430,12 @@ void CpuTi::apply_event(tmgr_trace_iterator_t event, double value) modified(true); speedTrace = speedIntegratedTrace_->speedTrace_; - s_tmgr_event_t val = speedTrace->event_list.back(); + trace_mgr::DatedValue val = speedTrace->event_list.back(); delete speedIntegratedTrace_; - speed_.scale = val.value; + speed_.scale = val.value_; - trace = new CpuTiTgmr(TRACE_FIXED, val.value); - XBT_DEBUG("value %f", val.value); + trace = new CpuTiTgmr(TRACE_FIXED, val.value_); + XBT_DEBUG("value %f", val.value_); speedIntegratedTrace_ = trace; @@ -459,27 +444,22 @@ void CpuTi::apply_event(tmgr_trace_iterator_t event, double value) } else if (event == stateEvent_) { if (value > 0) { if(isOff()) - xbt_dynar_push_as(host_that_restart, char*, (char *)getName()); + host_that_restart.push_back(getHost()); turnOn(); } else { turnOff(); 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(getModel())->tiActionHeap_, action->indexHeap_)); - if (heap_act != action) - DIE_IMPOSSIBLE; - } + action->heapRemove(model()->getActionHeap()); } } } @@ -495,12 +475,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()) @@ -518,9 +498,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; @@ -535,28 +515,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(getModel())->tiActionHeap_, action->indexHeap_)); - if (heap_act != action) - DIE_IMPOSSIBLE; - } if (min_finish > NO_MAX_DURATION) - xbt_heap_push(static_cast(getModel())->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", - getName(), 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); @@ -564,7 +539,7 @@ void CpuTi::updateActionsFinishTime(double now) bool CpuTi::isUsed() { - return !actionSet_->empty(); + return not actionSet_->empty(); } double CpuTi::getAvailableSpeed() @@ -584,11 +559,11 @@ 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() != getModel()->getRunningActionSet()) + if (action->getStateSet() != model()->getRunningActionSet()) continue; /* bogus priority, skip it */ @@ -604,20 +579,20 @@ 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)", getName(), size); - CpuTiAction *action = new CpuTiAction(static_cast(getModel()), size, isOff(), this); + XBT_IN("(%s,%g)", getCname(), size); + CpuTiAction* action = new CpuTiAction(static_cast(model()), size, isOff(), this); actionSet_->push_back(*action); @@ -631,17 +606,17 @@ CpuAction *CpuTi::sleep(double duration) if (duration > 0) duration = MAX(duration, sg_surf_precision); - XBT_IN("(%s,%g)", getName(), duration); - CpuTiAction *action = new CpuTiAction(static_cast(getModel()), 1.0, isOff(), this); + 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 is used to speed up update_resource_state */ action->getStateSet()->erase(action->getStateSet()->iterator_to(*action)); - action->stateSet_ = static_cast(getModel())->runningActionSetThatDoesNotNeedBeingChecked_; - action->getStateSet()->push_back(*action); + action->stateSet_ = static_cast(model())->runningActionSetThatDoesNotNeedBeingChecked_; + action->getStateSet()->push_back(*action); } actionSet_->push_back(*action); @@ -651,9 +626,9 @@ CpuAction *CpuTi::sleep(double duration) } void CpuTi::modified(bool modified){ - CpuTiList *modifiedCpu = static_cast(getModel())->modifiedCpu_; + CpuTiList* modifiedCpu = static_cast(model())->modifiedCpu_; if (modified) { - if (!cpu_ti_hook.is_linked()) { + if (not cpu_ti_hook.is_linked()) { modifiedCpu->push_back(*this); } } else { @@ -669,17 +644,11 @@ void CpuTi::modified(bool modified){ CpuTiAction::CpuTiAction(CpuTiModel *model_, double cost, bool failed, CpuTi *cpu) : CpuAction(model_, cost, failed) + , cpu_(cpu) { - cpu_ = cpu; - indexHeap_ = -1; cpu_->modified(true); } -void CpuTiAction::updateIndexHeap(int i) -{ - indexHeap_ = i; -} - void CpuTiAction::setState(Action::State state) { CpuAction::setState(state); @@ -689,14 +658,14 @@ void CpuTiAction::setState(Action::State state) int CpuTiAction::unref() { refcount_--; - if (!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_); + heapRemove(getModel()->getActionHeap()); cpu_->modified(true); delete this; return 1; @@ -707,9 +676,8 @@ int CpuTiAction::unref() void CpuTiAction::cancel() { this->setState(Action::State::failed); - xbt_heap_remove(getModel()->getActionHeap(), this->indexHeap_); + heapRemove(getModel()->getActionHeap()); cpu_->modified(true); - return; } void CpuTiAction::suspend() @@ -717,7 +685,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(); @@ -739,7 +707,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() ? @@ -747,21 +715,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(); } @@ -771,7 +734,7 @@ double CpuTiAction::getRemains() XBT_IN("(%p)", this); cpu_->updateRemainingAmount(surf_get_clock()); XBT_OUT(); - return remains_; + return getRemainsNoUpdate(); } }