X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f0a4750df69ffc8154f013462ae5fe459cfbc599..d17f206ea75d3cccc5f1b83b67f58d4fe87781d1:/src/surf/cpu_interface.cpp diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp index 72ab8bcbfa..ee3fc09929 100644 --- a/src/surf/cpu_interface.cpp +++ b/src/surf/cpu_interface.cpp @@ -10,10 +10,8 @@ #include "src/instr/instr_private.h" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals XBT_LOG_EXTERNAL_CATEGORY(surf_kernel); -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu, surf, - "Logging specific to the SURF cpu module"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu, surf, "Logging specific to the SURF cpu module"); -int autoload_surf_cpu_model = 1; void_f_void_t surf_cpu_model_init_preparse = NULL; simgrid::surf::CpuModel *surf_cpu_model_pm; @@ -26,18 +24,7 @@ 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 * @@ -63,7 +50,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()) { @@ -96,12 +83,12 @@ void CpuModel::updateActionsStateFull(double now, double delta) for(ActionList::iterator it(running_actions->begin()), itNext=it, itend(running_actions->end()) ; it != itend ; it=itNext) { - ++itNext; + ++itNext; action = static_cast(&*it); if (TRACE_is_enabled()) { - Cpu *x = static_cast (lmm_constraint_id(lmm_get_cnst_from_var(getMaxminSystem(), action->getVariable(), 0)) ); + Cpu *cpu = static_cast (lmm_constraint_id(lmm_get_cnst_from_var(getMaxminSystem(), action->getVariable(), 0)) ); - TRACE_surf_host_set_utilization(x->getName(), + TRACE_surf_host_set_utilization(cpu->getName(), action->getCategory(), lmm_variable_getvalue(action->getVariable()), now - delta, @@ -119,22 +106,19 @@ 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); } } - - return; } /************ * Resource * ************/ -Cpu::Cpu(Model *model, simgrid::s4u::Host *host, - xbt_dynar_t speedPerPstate, int core) +Cpu::Cpu(Model *model, simgrid::s4u::Host *host, xbt_dynar_t speedPerPstate, int core) : Cpu(model, host, NULL/*constraint*/, speedPerPstate, core) { } @@ -145,10 +129,12 @@ Cpu::Cpu(Model *model, simgrid::s4u::Host *host, lmm_constraint_t constraint, , coresAmount_(core) , host_(host) { + xbt_assert(core > 0, "Host %s must have at least one core, not 0.", host->name().c_str()); + speed_.peak = xbt_dynar_get_as(speedPerPstate, 0/*pstate*/, double); speed_.scale = 1; host->pimpl_cpu = this; - xbt_assert(speed_.scale > 0, "Available speed has to be >0"); + xbt_assert(speed_.scale > 0, "Speed of host %s must be >0", host->name().c_str()); // Copy the power peak array: speedPerPstate_ = xbt_dynar_new(sizeof(double), nullptr); @@ -158,16 +144,13 @@ Cpu::Cpu(Model *model, simgrid::s4u::Host *host, lmm_constraint_t constraint, xbt_dynar_push(speedPerPstate_, &value); } - /* Currently, we assume that a VM does not have a multicore CPU. */ - if (core > 1) - xbt_assert(model == surf_cpu_model_pm); + xbt_assert(model == surf_cpu_model_pm || core==1, "Currently, VM cannot be multicore"); if (model->getUpdateMechanism() != UM_UNDEFINED) { - p_constraintCore = xbt_new(lmm_constraint_t, core); - p_constraintCoreId = xbt_new(void*, core); + p_constraintCore = xbt_new(lmm_constraint_t, core); + p_constraintCoreId = xbt_new(void*, core); - int i; - for (i = 0; i < core; i++) { + for (int i = 0; i < core; i++) { /* just for a unique id, never used as a string. */ p_constraintCoreId[i] = bprintf("%s:%i", host->name().c_str(), i); p_constraintCore[i] = lmm_constraint_new(model->getMaxminSystem(), p_constraintCoreId[i], speed_.scale * speed_.peak); @@ -178,15 +161,12 @@ Cpu::Cpu(Model *model, simgrid::s4u::Host *host, lmm_constraint_t constraint, Cpu::~Cpu() { if (p_constraintCoreId){ - for (int i = 0; i < coresAmount_; i++) { - xbt_free(p_constraintCoreId[i]); - } + for (int i = 0; i < coresAmount_; i++) + xbt_free(p_constraintCoreId[i]); xbt_free(p_constraintCore); } - if (p_constraintCoreId) - xbt_free(p_constraintCoreId); - if (speedPerPstate_) - xbt_dynar_free(&speedPerPstate_); + xbt_free(p_constraintCoreId); + xbt_dynar_free(&speedPerPstate_); } double Cpu::getCurrentPowerPeak() @@ -237,8 +217,7 @@ double Cpu::getAvailableSpeed() } void Cpu::onSpeedChange() { - TRACE_surf_host_set_speed(surf_get_clock(), getName(), - coresAmount_ * speed_.scale * speed_.peak); + TRACE_surf_host_set_speed(surf_get_clock(), getName(), coresAmount_ * speed_.scale * speed_.peak); } @@ -267,30 +246,24 @@ void Cpu::setSpeedTrace(tmgr_trace_t trace) void CpuAction::updateRemainingLazy(double now) { - double delta = 0.0; - - xbt_assert(getStateSet() == getModel()->getRunningActionSet(), - "You're updating an action that is not running."); - - /* bogus priority, skip it */ - xbt_assert(getPriority() > 0, - "You're updating an action that seems suspended."); + 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."); - 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()); } /* @@ -328,11 +301,7 @@ void CpuAction::setAffinity(Cpu *cpu, unsigned long mask) nbits += 1; } - if (nbits > 1) { - XBT_CRITICAL("Do not specify multiple cores for an affinity mask."); - XBT_CRITICAL("See the comment in cpu_action_set_affinity()."); - DIE_IMPOSSIBLE; - } + xbt_assert(nbits <= 1, "Affinity mask cannot span over multiple cores."); } for (int i = 0; i < cpu->coresAmount_; i++) { @@ -361,13 +330,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