X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/93c8beeb914dc3624c3818b21f17567345b4d36c..ac0bf6a9396efa37d528695f248e568ab5a2eb98:/src/surf/cpu_interface.cpp diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp index 57d285af19..faa4ab5ddc 100644 --- a/src/surf/cpu_interface.cpp +++ b/src/surf/cpu_interface.cpp @@ -1,11 +1,21 @@ +/* Copyright (c) 2013-2017. The SimGrid Team. + * All rights reserved. */ + +/* This program is free software; you can redistribute it and/or modify it + * under the terms of the license (GNU LGPL) which comes with this package. */ + #include "cpu_interface.hpp" +#include "src/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals +#include 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"); -CpuModelPtr surf_cpu_model_pm; -CpuModelPtr surf_cpu_model_vm; +simgrid::surf::CpuModel *surf_cpu_model_pm; +simgrid::surf::CpuModel *surf_cpu_model_vm; + +namespace simgrid { +namespace surf { /********* * Model * @@ -13,259 +23,226 @@ CpuModelPtr surf_cpu_model_vm; void CpuModel::updateActionsStateLazy(double now, double /*delta*/) { - void *_action; - CpuActionLmmPtr action; - while ((xbt_heap_size(p_actionHeap) > 0) - && (double_equals(xbt_heap_maxkey(p_actionHeap), now))) { - action = dynamic_cast(static_cast(xbt_heap_pop(p_actionHeap))); + while ((xbt_heap_size(getActionHeap()) > 0) + && (double_equals(xbt_heap_maxkey(getActionHeap()), now, sg_surf_precision))) { + + CpuAction *action = static_cast(xbt_heap_pop(getActionHeap())); XBT_CDEBUG(surf_kernel, "Something happened to action %p", action); -#ifdef HAVE_TRACING if (TRACE_is_enabled()) { - CpuPtr cpu = (CpuPtr) lmm_constraint_id(lmm_get_cnst_from_var(p_maxminSystem, action->p_variable, 0)); - TRACE_surf_host_set_utilization(cpu->m_name, action->p_category, - lmm_variable_getvalue(action->p_variable), - action->m_lastUpdate, - now - action->m_lastUpdate); + Cpu *cpu = static_cast(lmm_constraint_id(lmm_get_cnst_from_var(getMaxminSystem(), action->getVariable(), 0))); + TRACE_surf_host_set_utilization(cpu->getCname(), action->getCategory(), + lmm_variable_getvalue(action->getVariable()), action->getLastUpdate(), + now - action->getLastUpdate()); } -#endif - action->m_finish = surf_get_clock(); + action->finish(Action::State::done); XBT_CDEBUG(surf_kernel, "Action %p finished", action); - action->updateEnergy(); - /* set the remains to 0 due to precision problems when updating the remaining amount */ - action->m_remains = 0; - action->setState(SURF_ACTION_DONE); - action->heapRemove(p_actionHeap); //FIXME: strange call since action was already popped + action->setRemains(0); } -#ifdef HAVE_TRACING if (TRACE_is_enabled()) { //defining the last timestamp that we can safely dump to trace file //without losing the event ascending order (considering all CPU's) double smaller = -1; - xbt_swag_foreach(_action, p_runningActionSet) { - action = dynamic_cast(static_cast(_action)); - if (smaller < 0) { - smaller = action->m_lastUpdate; - continue; - } - if (action->m_lastUpdate < smaller) { - smaller = action->m_lastUpdate; - } + ActionList *actionSet = getRunningActionSet(); + ActionList::iterator it(actionSet->begin()); + ActionList::iterator itend(actionSet->end()); + for (; it != itend; ++it) { + CpuAction *action = static_cast(&*it); + if (smaller < 0 || action->getLastUpdate() < smaller) + smaller = action->getLastUpdate(); } if (smaller > 0) { TRACE_last_timestamp_to_dump = smaller; } } -#endif - return; } void CpuModel::updateActionsStateFull(double now, double delta) { - void *_action, *_next_action; - CpuActionLmmPtr action = NULL; - xbt_swag_t running_actions = p_runningActionSet; - - xbt_swag_foreach_safe(_action, _next_action, running_actions) { - action = dynamic_cast(static_cast(_action)); -#ifdef HAVE_TRACING + CpuAction *action = nullptr; + ActionList *running_actions = getRunningActionSet(); + ActionList::iterator it(running_actions->begin()); + ActionList::iterator itNext = it; + ActionList::iterator itend(running_actions->end()); + for (; it != itend; it = itNext) { + ++itNext; + action = static_cast(&*it); if (TRACE_is_enabled()) { - CpuPtr x = (CpuPtr) lmm_constraint_id(lmm_get_cnst_from_var - (p_maxminSystem, action->p_variable, 0)); - - TRACE_surf_host_set_utilization(x->m_name, - action->p_category, - lmm_variable_getvalue(action->p_variable), - now - delta, - delta); + Cpu *cpu = static_cast (lmm_constraint_id(lmm_get_cnst_from_var(getMaxminSystem(), action->getVariable(), 0)) ); + + TRACE_surf_host_set_utilization(cpu->getCname(), action->getCategory(), + lmm_variable_getvalue(action->getVariable()), now - delta, delta); TRACE_last_timestamp_to_dump = now - delta; } -#endif - - double_update(&(action->m_remains), - lmm_variable_getvalue(action->p_variable) * delta); + action->updateRemains(lmm_variable_getvalue(action->getVariable()) * delta); - if (action->m_maxDuration != NO_MAX_DURATION) - double_update(&(action->m_maxDuration), delta); + if (action->getMaxDuration() != NO_MAX_DURATION) + action->updateMaxDuration(delta); - - if ((action->m_remains <= 0) && - (lmm_get_variable_weight(action->p_variable) > 0)) { - action->m_finish = surf_get_clock(); - action->setState(SURF_ACTION_DONE); - - } else if ((action->m_maxDuration != NO_MAX_DURATION) && - (action->m_maxDuration <= 0)) { - action->m_finish = surf_get_clock(); - action->setState(SURF_ACTION_DONE); + if (((action->getRemainsNoUpdate() <= 0) && (lmm_get_variable_weight(action->getVariable()) > 0)) || + ((action->getMaxDuration() != NO_MAX_DURATION) && (action->getMaxDuration() <= 0))) { + action->finish(Action::State::done); } - action->updateEnergy(); } - - return; } /************ * Resource * ************/ +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, std::vector* speedPerPstate, + int core) + : Resource(model, host->getCname(), constraint), coresAmount_(core), host_(host) +{ + xbt_assert(core > 0, "Host %s must have at least one core, not 0.", host->getCname()); + + speed_.peak = speedPerPstate->front(); + speed_.scale = 1; + host->pimpl_cpu = this; + xbt_assert(speed_.scale > 0, "Speed of host %s must be >0", host->getCname()); + + // Copy the power peak array: + for (double const& value : *speedPerPstate) { + speedPerPstate_.push_back(value); + } +} + +Cpu::~Cpu() = default; + +int Cpu::getNbPStates() +{ + return speedPerPstate_.size(); +} + +void Cpu::setPState(int pstate_index) +{ + xbt_assert(pstate_index <= static_cast(speedPerPstate_.size()), + "Invalid parameters for CPU %s (pstate %d > length of pstates %d)", getCname(), pstate_index, + static_cast(speedPerPstate_.size())); + + double new_peak_speed = speedPerPstate_[pstate_index]; + pstate_ = pstate_index; + speed_.peak = new_peak_speed; + + onSpeedChange(); +} + +int Cpu::getPState() +{ + return pstate_; +} + +double Cpu::getPstateSpeed(int pstate_index) +{ + xbt_assert((pstate_index <= static_cast(speedPerPstate_.size())), "Invalid parameters (pstate index out of bounds)"); + + return speedPerPstate_[pstate_index]; +} double Cpu::getSpeed(double load) { - return load * m_powerPeak; + return load * speed_.peak; } double Cpu::getAvailableSpeed() { /* number between 0 and 1 */ - return m_powerScale; + return speed_.scale; } -int Cpu::getCore() -{ - return m_core; +void Cpu::onSpeedChange() { + TRACE_surf_host_set_speed(surf_get_clock(), getCname(), coresAmount_ * speed_.scale * speed_.peak); + s4u::Host::onSpeedChange(*host_); } -CpuLmm::CpuLmm(CpuModelPtr model, const char* name, xbt_dict_t properties, int core, double powerPeak, double powerScale) -: ResourceLmm(), Cpu(model, name, properties, core, powerPeak, powerScale) { - /* At now, we assume that a VM does not have a multicore CPU. */ - if (core > 1) - xbt_assert(model == surf_cpu_model_pm); +int Cpu::coreCount() +{ + return coresAmount_; +} - p_constraintCore = xbt_new(lmm_constraint_t, core); - p_constraintCoreId = xbt_new(void*, core); +void Cpu::setStateTrace(tmgr_trace_t trace) +{ + xbt_assert(stateEvent_ == nullptr, "Cannot set a second state trace to Host %s", host_->getCname()); - int i; - for (i = 0; i < core; i++) { - /* just for a unique id, never used as a string. */ - p_constraintCoreId[i] = bprintf("%s:%i", name, i); - p_constraintCore[i] = lmm_constraint_new(p_model->p_maxminSystem, p_constraintCoreId[i], m_powerScale * m_powerPeak); - } + stateEvent_ = future_evt_set->add_trace(trace, this); } +void Cpu::setSpeedTrace(tmgr_trace_t trace) +{ + xbt_assert(speed_.event == nullptr, "Cannot set a second speed trace to Host %s", host_->getCname()); -CpuLmm::~CpuLmm(){ - if (p_constraintCore){ - for (int i = 0; i < m_core; i++) { - xbt_free(p_constraintCoreId[i]); - } - xbt_free(p_constraintCore); - xbt_free(p_constraintCoreId); - } + speed_.event = future_evt_set->add_trace(trace, this); } + /********** * Action * **********/ -void CpuActionLmm::updateRemainingLazy(double now) +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(p_stateSet == p_model->p_runningActionSet, - "You're updating an action that is not running."); + double delta = now - lastUpdate_; - /* bogus priority, skip it */ - xbt_assert(m_priority > 0, - "You're updating an action that seems suspended."); + 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); - delta = now - m_lastUpdate; - - if (m_remains > 0) { - XBT_CDEBUG(surf_kernel, "Updating action(%p): remains was %lf, last_update was: %lf", this, m_remains, m_lastUpdate); - double_update(&(m_remains), m_lastValue * delta); - -#ifdef HAVE_TRACING if (TRACE_is_enabled()) { - CpuPtr cpu = (CpuPtr) lmm_constraint_id(lmm_get_cnst_from_var(p_model->p_maxminSystem, p_variable, 0)); - TRACE_surf_host_set_utilization(cpu->m_name, p_category, m_lastValue, m_lastUpdate, now - m_lastUpdate); + Cpu *cpu = static_cast(lmm_constraint_id(lmm_get_cnst_from_var(getModel()->getMaxminSystem(), getVariable(), 0))); + TRACE_surf_host_set_utilization(cpu->getCname(), getCategory(), lastValue_, lastUpdate_, now - lastUpdate_); } -#endif - XBT_CDEBUG(surf_kernel, "Updating action(%p): remains is now %lf", this, m_remains); + XBT_CDEBUG(surf_kernel, "Updating action(%p): remains is now %f", this, remains_); } - m_lastUpdate = now; - m_lastValue = lmm_variable_getvalue(p_variable); + lastUpdate_ = now; + lastValue_ = lmm_variable_getvalue(getVariable()); } -void CpuActionLmm::setBound(double bound) -{ - XBT_IN("(%p,%g)", this, bound); - m_bound = bound; - lmm_update_variable_bound(p_model->p_maxminSystem, p_variable, bound); +simgrid::xbt::signal CpuAction::onStateChange; - if (p_model->p_updateMechanism == UM_LAZY) - heapRemove(p_model->p_actionHeap); - XBT_OUT(); +void CpuAction::suspend(){ + Action::State previous = getState(); + onStateChange(this, previous); + Action::suspend(); } -/* - * - * 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 CpuActionLmm::setAffinity(CpuPtr _cpu, unsigned long mask) -{ - lmm_variable_t var_obj = p_variable; - CpuLmmPtr cpu = reinterpret_cast(_cpu); - 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; - } - } +void CpuAction::resume(){ + Action::State previous = getState(); + onStateChange(this, previous); + Action::resume(); +} - for (int i = 0; i < cpu->m_core; i++) { - XBT_DEBUG("clear affinity %p to cpu-%d@%s", this, i, cpu->m_name); - lmm_shrink(cpu->p_model->p_maxminSystem, 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->m_name); - lmm_expand(cpu->p_model->p_maxminSystem, cpu->p_constraintCore[i], var_obj, 1.0); - } +void CpuAction::setState(Action::State state){ + Action::State previous = getState(); + Action::setState(state); + onStateChange(this, previous); +} +/** @brief returns a list of all CPUs that this action is using */ +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 < llen; i++) { + /* Beware of composite actions: ptasks put links and cpus together */ + // extra pb: we cannot dynamic_cast from void*... + Resource* resource = static_cast(lmm_constraint_id(lmm_get_cnst_from_var(sys, getVariable(), i))); + Cpu* cpu = dynamic_cast(resource); + if (cpu != nullptr) + retlist.push_back(cpu); } - if (cpu->p_model->p_updateMechanism == UM_LAZY) { - /* FIXME (hypervisor): Do we need to do something for the LAZY mode? */ - } + return retlist; +} - XBT_OUT(); +} }