X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/45d7d1ab9ae1e9a941dd34440467f25e6d337970..c9197fe448d95724ea56119ac409e6460ed86b8a:/src/surf/cpu_interface.cpp diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp index 6bb195a11b..c1ab0e1f6c 100644 --- a/src/surf/cpu_interface.cpp +++ b/src/surf/cpu_interface.cpp @@ -12,7 +12,7 @@ XBT_LOG_EXTERNAL_CATEGORY(surf_kernel); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu, surf, "Logging specific to the SURF cpu module"); -void_f_void_t surf_cpu_model_init_preparse = NULL; +void_f_void_t surf_cpu_model_init_preparse = nullptr; simgrid::surf::CpuModel *surf_cpu_model_pm; simgrid::surf::CpuModel *surf_cpu_model_vm; @@ -24,23 +24,14 @@ namespace surf { * Callbacks * *************/ -std::list getActionCpus(CpuAction *action) { - std::list retlist; - lmm_system_t sys = action->getModel()->getMaxminSystem(); - int llen = lmm_get_number_of_cnst_from_var(sys, action->getVariable()); - - for(int i = 0; igetVariable(), i) )) ); - } - return retlist; -} - -simgrid::xbt::signal cpuActionStateChangedCallbacks; +simgrid::xbt::signal cpuActionStateChangedCallbacks; /********* * Model * *********/ +CpuModel::~CpuModel() {} + void CpuModel::updateActionsStateLazy(double now, double /*delta*/) { CpuAction *action; @@ -61,7 +52,7 @@ void CpuModel::updateActionsStateLazy(double now, double /*delta*/) /* set the remains to 0 due to precision problems when updating the remaining amount */ action->setRemains(0); - action->setState(SURF_ACTION_DONE); + action->setState(Action::State::done); action->heapRemove(getActionHeap()); //FIXME: strange call since action was already popped } if (TRACE_is_enabled()) { @@ -89,7 +80,7 @@ void CpuModel::updateActionsStateLazy(double now, double /*delta*/) void CpuModel::updateActionsStateFull(double now, double delta) { - CpuAction *action = NULL; + CpuAction *action = nullptr; ActionList *running_actions = getRunningActionSet(); for(ActionList::iterator it(running_actions->begin()), itNext=it, itend(running_actions->end()) @@ -117,20 +108,25 @@ void CpuModel::updateActionsStateFull(double now, double delta) if ((action->getRemainsNoUpdate() <= 0) && (lmm_get_variable_weight(action->getVariable()) > 0)) { action->finish(); - action->setState(SURF_ACTION_DONE); + action->setState(Action::State::done); } else if ((action->getMaxDuration() != NO_MAX_DURATION) && (action->getMaxDuration() <= 0)) { action->finish(); - action->setState(SURF_ACTION_DONE); + action->setState(Action::State::done); } } } +bool CpuModel::next_occuring_event_isIdempotent() +{ + return true; +} + /************ * Resource * ************/ Cpu::Cpu(Model *model, simgrid::s4u::Host *host, xbt_dynar_t speedPerPstate, int core) - : Cpu(model, host, NULL/*constraint*/, speedPerPstate, core) + : Cpu(model, host, nullptr/*constraint*/, speedPerPstate, core) { } @@ -180,7 +176,7 @@ Cpu::~Cpu() xbt_dynar_free(&speedPerPstate_); } -double Cpu::getCurrentPowerPeak() +double Cpu::getPstateSpeedCurrent() { return speed_.peak; } @@ -208,7 +204,7 @@ int Cpu::getPState() return pstate_; } -double Cpu::getPowerPeakAt(int pstate_index) +double Cpu::getPstateSpeed(int pstate_index) { xbt_dynar_t plist = speedPerPstate_; xbt_assert((pstate_index <= (int)xbt_dynar_length(plist)), "Invalid parameters (pstate index out of bounds)"); @@ -239,13 +235,13 @@ int Cpu::getCore() void Cpu::setStateTrace(tmgr_trace_t trace) { - xbt_assert(stateEvent_==NULL,"Cannot set a second state trace to Host %s", host_->name().c_str()); + xbt_assert(stateEvent_==nullptr,"Cannot set a second state trace to Host %s", host_->name().c_str()); stateEvent_ = future_evt_set->add_trace(trace, 0.0, this); } void Cpu::setSpeedTrace(tmgr_trace_t trace) { - xbt_assert(speed_.event==NULL,"Cannot set a second speed trace to Host %s", host_->name().c_str()); + xbt_assert(speed_.event==nullptr,"Cannot set a second speed trace to Host %s", host_->name().c_str()); speed_.event = future_evt_set->add_trace(trace, 0.0, this); } @@ -260,21 +256,21 @@ void CpuAction::updateRemainingLazy(double now) xbt_assert(getStateSet() == getModel()->getRunningActionSet(), "You're updating an action that is not running."); xbt_assert(getPriority() > 0, "You're updating an action that seems suspended."); - double delta = now - m_lastUpdate; + double delta = now - lastUpdate_; - if (m_remains > 0) { - XBT_CDEBUG(surf_kernel, "Updating action(%p): remains was %f, last_update was: %f", this, m_remains, m_lastUpdate); - double_update(&(m_remains), m_lastValue * delta, sg_maxmin_precision*sg_surf_precision); + if (remains_ > 0) { + XBT_CDEBUG(surf_kernel, "Updating action(%p): remains was %f, last_update was: %f", this, remains_, lastUpdate_); + double_update(&(remains_), lastValue_ * delta, sg_maxmin_precision*sg_surf_precision); if (TRACE_is_enabled()) { Cpu *cpu = static_cast(lmm_constraint_id(lmm_get_cnst_from_var(getModel()->getMaxminSystem(), getVariable(), 0))); - TRACE_surf_host_set_utilization(cpu->getName(), getCategory(), m_lastValue, m_lastUpdate, now - m_lastUpdate); + TRACE_surf_host_set_utilization(cpu->getName(), getCategory(), lastValue_, lastUpdate_, now - lastUpdate_); } - XBT_CDEBUG(surf_kernel, "Updating action(%p): remains is now %f", this, m_remains); + XBT_CDEBUG(surf_kernel, "Updating action(%p): remains is now %f", this, remains_); } - m_lastUpdate = now; - m_lastValue = lmm_variable_getvalue(getVariable()); + lastUpdate_ = now; + lastValue_ = lmm_variable_getvalue(getVariable()); } /* @@ -341,13 +337,23 @@ void CpuAction::setAffinity(Cpu *cpu, unsigned long mask) XBT_OUT(); } -simgrid::xbt::signal CpuAction::onStateChange; +simgrid::xbt::signal CpuAction::onStateChange; -void CpuAction::setState(e_surf_action_state_t state){ - e_surf_action_state_t previous = getState(); +void CpuAction::setState(Action::State state){ + Action::State previous = getState(); Action::setState(state); onStateChange(this, previous); } +std::list CpuAction::cpus() { + std::list retlist; + lmm_system_t sys = getModel()->getMaxminSystem(); + int llen = lmm_get_number_of_cnst_from_var(sys, getVariable()); + + for(int i = 0; i