X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0f59720c71f842e5ac1da02aa4db5832327b2b94..18bee871381a6ce670d9da211f43ab9b55fdc350:/src/surf/cpu_interface.cpp diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp index 0530b0ddee..3d7be6fc91 100644 --- a/src/surf/cpu_interface.cpp +++ b/src/surf/cpu_interface.cpp @@ -12,32 +12,22 @@ 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; - simgrid::surf::CpuModel *surf_cpu_model_pm; simgrid::surf::CpuModel *surf_cpu_model_vm; namespace simgrid { namespace surf { -/************* - * Callbacks * - *************/ - -simgrid::xbt::signal cpuActionStateChangedCallbacks; - /********* * Model * *********/ -CpuModel::~CpuModel() {} - 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))); @@ -53,7 +43,6 @@ 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(Action::State::done); - action->heapRemove(getActionHeap()); //FIXME: strange call since action was already popped } if (TRACE_is_enabled()) { //defining the last timestamp that we can safely dump to trace file @@ -62,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; @@ -75,12 +64,11 @@ 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()) @@ -117,82 +105,52 @@ void CpuModel::updateActionsStateFull(double now, double delta) } } -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::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 speedPerPstate, int core) - : Resource(model, host->name().c_str(), constraint) - , coresAmount_(core) - , 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) { - xbt_assert(core > 0, "Host %s must have at least one core, not 0.", host->name().c_str()); + xbt_assert(core > 0, "Host %s must have at least one core, not 0.", host->cname()); - speed_.peak = xbt_dynar_get_as(speedPerPstate, 0/*pstate*/, double); + speed_.peak = speedPerPstate->front(); speed_.scale = 1; host->pimpl_cpu = this; - xbt_assert(speed_.scale > 0, "Speed of host %s must be >0", host->name().c_str()); + xbt_assert(speed_.scale > 0, "Speed of host %s must be >0", host->cname()); // Copy the power peak array: - speedPerPstate_ = xbt_dynar_new(sizeof(double), nullptr); - unsigned long n = xbt_dynar_length(speedPerPstate); - for (unsigned long i = 0; i != n; ++i) { - double value = xbt_dynar_get_as(speedPerPstate, i, double); - xbt_dynar_push(speedPerPstate_, &value); + for (double value : *speedPerPstate) { + speedPerPstate_.push_back(value); } 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); - - 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); - } - } } -Cpu::~Cpu() -{ - if (p_constraintCoreId){ - for (int i = 0; i < coresAmount_; i++) - xbt_free(p_constraintCoreId[i]); - xbt_free(p_constraintCore); - } - xbt_free(p_constraintCoreId); - xbt_dynar_free(&speedPerPstate_); -} +Cpu::~Cpu() = default; -double Cpu::getCurrentPowerPeak() +double Cpu::getPstateSpeedCurrent() { return speed_.peak; } int Cpu::getNbPStates() { - return xbt_dynar_length(speedPerPstate_); + return speedPerPstate_.size(); } void Cpu::setPState(int pstate_index) { - xbt_dynar_t plist = speedPerPstate_; - 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); + double new_peak_speed = speedPerPstate_[pstate_index]; pstate_ = pstate_index; speed_.peak = new_peak_speed; @@ -204,12 +162,11 @@ 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)"); + 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) @@ -227,21 +184,20 @@ void Cpu::onSpeedChange() { TRACE_surf_host_set_speed(surf_get_clock(), getName(), coresAmount_ * speed_.scale * speed_.peak); } - -int Cpu::getCore() +int Cpu::coreCount() { return coresAmount_; } 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_->cname()); 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_->cname()); speed_.event = future_evt_set->add_trace(trace, 0.0, this); } @@ -273,70 +229,6 @@ void CpuAction::updateRemainingLazy(double 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->coresAmount_; i++) { - unsigned long has_affinity = (1UL << i) & mask; - if (has_affinity) - nbits += 1; - } - - xbt_assert(nbits <= 1, "Affinity mask cannot span over multiple cores."); - } - - for (int i = 0; i < cpu->coresAmount_; 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(); -} - simgrid::xbt::signal CpuAction::onStateChange; void CpuAction::setState(Action::State state){