X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a13d43daf0284cec291d65f0585fd2a44e9d87fd..18bee871381a6ce670d9da211f43ab9b55fdc350:/src/surf/cpu_interface.cpp diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp index e6a50ecba5..3d7be6fc91 100644 --- a/src/surf/cpu_interface.cpp +++ b/src/surf/cpu_interface.cpp @@ -10,11 +10,7 @@ #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"); - -int autoload_surf_cpu_model = 1; -void_f_void_t surf_cpu_model_init_preparse = NULL; +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu, surf, "Logging specific to the SURF cpu module"); simgrid::surf::CpuModel *surf_cpu_model_pm; simgrid::surf::CpuModel *surf_cpu_model_vm; @@ -22,28 +18,16 @@ simgrid::surf::CpuModel *surf_cpu_model_vm; namespace simgrid { namespace surf { -/************* - * Callbacks * - *************/ - -Cpu *getActionCpu(CpuAction *action) { - return static_cast(lmm_constraint_id(lmm_get_cnst_from_var - (action->getModel()->getMaxminSystem(), - action->getVariable(), 0))); -} - -simgrid::xbt::signal cpuActionStateChangedCallbacks; - /********* * Model * *********/ void CpuModel::updateActionsStateLazy(double now, double /*delta*/) { - CpuAction *action; while ((xbt_heap_size(getActionHeap()) > 0) && (double_equals(xbt_heap_maxkey(getActionHeap()), now, sg_surf_precision))) { - action = static_cast(xbt_heap_pop(getActionHeap())); + + CpuAction *action = static_cast(xbt_heap_pop(getActionHeap())); XBT_CDEBUG(surf_kernel, "Something happened to action %p", action); if (TRACE_is_enabled()) { Cpu *cpu = static_cast(lmm_constraint_id(lmm_get_cnst_from_var(getMaxminSystem(), action->getVariable(), 0))); @@ -58,8 +42,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->heapRemove(getActionHeap()); //FIXME: strange call since action was already popped + action->setState(Action::State::done); } if (TRACE_is_enabled()) { //defining the last timestamp that we can safely dump to trace file @@ -68,7 +51,7 @@ void CpuModel::updateActionsStateLazy(double now, double /*delta*/) ActionList *actionSet = getRunningActionSet(); for(ActionList::iterator it(actionSet->begin()), itend(actionSet->end()) ; it != itend ; ++it) { - action = static_cast(&*it); + CpuAction *action = static_cast(&*it); if (smaller < 0) { smaller = action->getLastUpdate(); continue; @@ -81,22 +64,21 @@ void CpuModel::updateActionsStateLazy(double now, double /*delta*/) TRACE_last_timestamp_to_dump = smaller; } } - return; } 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()) ; 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, @@ -114,145 +96,110 @@ 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 speedPeakList, int core, double speedPeak) - : Cpu(model, host, NULL/*constraint*/, speedPeakList, core, speedPeak) +Cpu::Cpu(Model *model, simgrid::s4u::Host *host, std::vector *speedPerPstate, int core) + : Cpu(model, host, nullptr/*constraint*/, speedPerPstate, core) { } -Cpu::Cpu(Model *model, simgrid::s4u::Host *host, lmm_constraint_t constraint, - xbt_dynar_t speedPeakList, int core, double speedPeak) - : Resource(model, host->name().c_str(), constraint) - , m_core(core) - , m_host(host) +Cpu::Cpu(Model* model, simgrid::s4u::Host* host, lmm_constraint_t constraint, std::vector* speedPerPstate, + int core) + : Resource(model, host->cname(), constraint), coresAmount_(core), host_(host) { - p_speed.peak = speedPeak; - p_speed.scale = 1; + xbt_assert(core > 0, "Host %s must have at least one core, not 0.", host->cname()); + + speed_.peak = speedPerPstate->front(); + speed_.scale = 1; host->pimpl_cpu = this; - xbt_assert(p_speed.scale > 0, "Available speed has to be >0"); + xbt_assert(speed_.scale > 0, "Speed of host %s must be >0", host->cname()); // Copy the power peak array: - p_speedPeakList = xbt_dynar_new(sizeof(double), nullptr); - unsigned long n = xbt_dynar_length(speedPeakList); - for (unsigned long i = 0; i != n; ++i) { - double value = xbt_dynar_get_as(speedPeakList, i, double); - xbt_dynar_push(p_speedPeakList, &value); + for (double value : *speedPerPstate) { + speedPerPstate_.push_back(value); } - /* Currently, we assume that a VM does not have a multicore CPU. */ - if (core > 1) - xbt_assert(model == surf_cpu_model_pm); - - if (model->getUpdateMechanism() != UM_UNDEFINED) { - p_constraintCore = xbt_new(lmm_constraint_t, core); - p_constraintCoreId = xbt_new(void*, core); - - int i; - for (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], p_speed.scale * p_speed.peak); - } - } + xbt_assert(model == surf_cpu_model_pm || core==1, "Currently, VM cannot be multicore"); } -Cpu::~Cpu() -{ - if (p_constraintCoreId){ - for (int i = 0; i < m_core; i++) { - xbt_free(p_constraintCoreId[i]); - } - xbt_free(p_constraintCore); - } - if (p_constraintCoreId) - xbt_free(p_constraintCoreId); - if (p_speedPeakList) - xbt_dynar_free(&p_speedPeakList); -} +Cpu::~Cpu() = default; -double Cpu::getCurrentPowerPeak() +double Cpu::getPstateSpeedCurrent() { - return p_speed.peak; + return speed_.peak; } int Cpu::getNbPStates() { - return xbt_dynar_length(p_speedPeakList); + return speedPerPstate_.size(); } void Cpu::setPState(int pstate_index) { - xbt_dynar_t plist = p_speedPeakList; - xbt_assert(pstate_index <= (int)xbt_dynar_length(plist), - "Invalid parameters for CPU %s (pstate %d > length of pstates %d)", getName(), pstate_index, (int)xbt_dynar_length(plist)); + xbt_assert(pstate_index <= static_cast(speedPerPstate_.size()), + "Invalid parameters for CPU %s (pstate %d > length of pstates %d)", getName(), pstate_index, + static_cast(speedPerPstate_.size())); - double new_peak_speed = xbt_dynar_get_as(plist, pstate_index, double); - m_pstate = pstate_index; - p_speed.peak = new_peak_speed; + double new_peak_speed = speedPerPstate_[pstate_index]; + pstate_ = pstate_index; + speed_.peak = new_peak_speed; onSpeedChange(); } int Cpu::getPState() { - return m_pstate; + return pstate_; } -double Cpu::getPowerPeakAt(int pstate_index) +double Cpu::getPstateSpeed(int pstate_index) { - xbt_dynar_t plist = p_speedPeakList; - xbt_assert((pstate_index <= (int)xbt_dynar_length(plist)), "Invalid parameters (pstate index out of bounds)"); + xbt_assert((pstate_index <= static_cast(speedPerPstate_.size())), "Invalid parameters (pstate index out of bounds)"); - return xbt_dynar_get_as(plist, pstate_index, double); + return speedPerPstate_[pstate_index]; } double Cpu::getSpeed(double load) { - return load * p_speed.peak; + return load * speed_.peak; } double Cpu::getAvailableSpeed() { /* number between 0 and 1 */ - return p_speed.scale; + return speed_.scale; } void Cpu::onSpeedChange() { - TRACE_surf_host_set_speed(surf_get_clock(), getName(), - m_core * p_speed.scale * p_speed.peak); + TRACE_surf_host_set_speed(surf_get_clock(), getName(), coresAmount_ * speed_.scale * speed_.peak); } - -int Cpu::getCore() +int Cpu::coreCount() { - return m_core; + return coresAmount_; } -void Cpu::set_state_trace(tmgr_trace_t trace) +void Cpu::setStateTrace(tmgr_trace_t trace) { - xbt_assert(p_stateEvent==NULL,"Cannot set a second state trace to Host %s", m_host->name().c_str()); + xbt_assert(stateEvent_ == nullptr, "Cannot set a second state trace to Host %s", host_->cname()); - p_stateEvent = future_evt_set->add_trace(trace, 0.0, this); + stateEvent_ = future_evt_set->add_trace(trace, 0.0, this); } -void Cpu::set_speed_trace(tmgr_trace_t trace) +void Cpu::setSpeedTrace(tmgr_trace_t trace) { - xbt_assert(p_speed.event==NULL,"Cannot set a second speed trace to Host %s", m_host->name().c_str()); + xbt_assert(speed_.event == nullptr, "Cannot set a second speed trace to Host %s", host_->cname()); - p_speed.event = future_evt_set->add_trace(trace, 0.0, this); + speed_.event = future_evt_set->add_trace(trace, 0.0, this); } @@ -262,106 +209,42 @@ void Cpu::set_speed_trace(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."); + 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."); + double delta = now - lastUpdate_; - /* bogus priority, skip it */ - xbt_assert(getPriority() > 0, - "You're updating an action that seems suspended."); - - delta = now - m_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()); } -/* - * - * This function formulates a constraint problem that pins a given task to - * particular cores. Currently, it is possible to pin a task to an exactly one - * specific core. The system links the variable object of the task to the - * per-core constraint object. - * - * But, the taskset command on Linux takes a mask value specifying a CPU - * affinity setting of a given task. If the mask value is 0x03, the given task - * will be executed on the first core (CPU0) or the second core (CPU1) on the - * given PM. The schedular will determine appropriate placements of tasks, - * considering given CPU affinities and task activities. - * - * How should the system formulate constraint problems for an affinity to - * multiple cores? - * - * The cpu argument must be the host where the task is being executed. The - * action object does not have the information about the location where the - * action is being executed. - */ -void CpuAction::setAffinity(Cpu *cpu, unsigned long mask) -{ - lmm_variable_t var_obj = getVariable(); - XBT_IN("(%p,%lx)", this, mask); - - { - unsigned long nbits = 0; - - /* FIXME: There is much faster algorithms doing this. */ - for (int i = 0; i < cpu->m_core; i++) { - unsigned long has_affinity = (1UL << i) & mask; - if (has_affinity) - 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; - } - } +simgrid::xbt::signal CpuAction::onStateChange; - for (int i = 0; i < cpu->m_core; i++) { - XBT_DEBUG("clear affinity %p to cpu-%d@%s", this, i, cpu->getName()); - lmm_shrink(cpu->getModel()->getMaxminSystem(), cpu->p_constraintCore[i], var_obj); - - unsigned long has_affinity = (1UL << i) & mask; - if (has_affinity) { - /* This function only accepts an affinity setting on the host where the - * task is now running. In future, a task might move to another host. - * But, at this moment, this function cannot take an affinity setting on - * that future host. - * - * It might be possible to extend the code to allow this function to - * accept affinity settings on a future host. We might be able to assign - * zero to elem->value to maintain such inactive affinity settings in the - * system. But, this will make the system complex. */ - XBT_DEBUG("set affinity %p to cpu-%d@%s", this, i, cpu->getName()); - lmm_expand(cpu->getModel()->getMaxminSystem(), cpu->p_constraintCore[i], var_obj, 1.0); - } - } - - if (cpu->getModel()->getUpdateMechanism() == UM_LAZY) { - /* FIXME (hypervisor): Do we need to do something for the LAZY mode? */ - } - XBT_OUT(); +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()); -simgrid::xbt::signal CpuAction::onStateChange; + for(int i = 0; i