X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/66acb13a76dfe861a60220704697e361495e0eb0..ab319b7200020e1280da137a8c77bf57b2588714:/src/surf/cpu_ti.cpp diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp index 90e5e8510e..b55d21ef77 100644 --- a/src/surf/cpu_ti.cpp +++ b/src/surf/cpu_ti.cpp @@ -32,8 +32,8 @@ 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_)); + timePoints_ = new double[nbPoints_]; + integral_ = new double[nbPoints_]; for (auto val : speedTrace->event_list) { timePoints_[i] = time; integral_[i] = integral; @@ -47,8 +47,8 @@ CpuTiTrace::CpuTiTrace(tmgr_trace_t speedTrace) CpuTiTrace::~CpuTiTrace() { - xbt_free(timePoints_); - xbt_free(integral_); + delete [] timePoints_; + delete [] integral_; } CpuTiTgmr::~CpuTiTgmr() @@ -252,7 +252,8 @@ 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; @@ -274,12 +275,11 @@ CpuTiTgmr::CpuTiTgmr(tmgr_trace_t speedTrace, double value) } type_ = TRACE_DYNAMIC; - speedTrace_ = speedTrace; /* count the total time of trace file */ - for (auto val: speedTrace->event_list) { + for (auto val : speedTrace->event_list) total_time += val.delta; - } + trace_ = new CpuTiTrace(speedTrace); lastTime_ = total_time; total_ = trace_->integrateSimple(0, total_time); @@ -360,7 +360,7 @@ 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; @@ -459,7 +459,7 @@ 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(); @@ -475,8 +475,8 @@ void CpuTi::apply_event(tmgr_trace_iterator_t event, double value) 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_)); + CpuTiAction* heap_act = static_cast( + xbt_heap_remove(static_cast(model())->tiActionHeap_, action->indexHeap_)); if (heap_act != action) DIE_IMPOSSIBLE; } @@ -547,16 +547,16 @@ void CpuTi::updateActionsFinishTime(double now) /* 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_)); + 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(getModel())->tiActionHeap_, action, min_finish); + xbt_heap_push(static_cast(model())->tiActionHeap_, action, min_finish); - 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", cname(), action, + action->getStartTime(), action->finishTime_, action->getMaxDuration()); } /* remove from modified cpu */ modified(false); @@ -588,7 +588,7 @@ void CpuTi::updateRemainingAmount(double now) for(ActionTiList::iterator it(actionSet_->begin()), itend(actionSet_->end()) ; 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 */ @@ -616,8 +616,8 @@ void CpuTi::updateRemainingAmount(double 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)", cname(), size); + CpuTiAction* action = new CpuTiAction(static_cast(model()), size, isOff(), this); actionSet_->push_back(*action); @@ -631,8 +631,8 @@ 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)", cname(), duration); + CpuTiAction* action = new CpuTiAction(static_cast(model()), 1.0, isOff(), this); action->maxDuration_ = duration; action->suspended_ = 2; @@ -640,8 +640,8 @@ CpuAction *CpuTi::sleep(double 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,7 +651,7 @@ 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()) { modifiedCpu->push_back(*this); @@ -669,9 +669,8 @@ 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); } @@ -709,7 +708,6 @@ void CpuTiAction::cancel() this->setState(Action::State::failed); xbt_heap_remove(getModel()->getActionHeap(), this->indexHeap_); cpu_->modified(true); - return; } void CpuTiAction::suspend()