X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b4b40408881fd9dfc49a7802d4a83689c506b36b..cc12fd6403964b251d1e253b99bdedeb6086a242:/src/surf/cpu_interface.cpp diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp index a935630d10..ace74b4b4e 100644 --- a/src/surf/cpu_interface.cpp +++ b/src/surf/cpu_interface.cpp @@ -1,19 +1,14 @@ -/* Copyright (c) 2013-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2013-2018. 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 #include "cpu_interface.hpp" -#include "plugins/energy.hpp" +#include "src/surf/surf_interface.hpp" +#include "surf/surf.hpp" 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; @@ -21,373 +16,190 @@ simgrid::surf::CpuModel *surf_cpu_model_vm; namespace simgrid { namespace surf { -simgrid::xbt::Extension Cpu::EXTENSION_ID; - -void Cpu::classInit() -{ - if (!EXTENSION_ID.valid()) - EXTENSION_ID = simgrid::Host::extension_create(); -} - -/************* - * Callbacks * - *************/ - -Cpu *getActionCpu(CpuAction *action) { - return static_cast(lmm_constraint_id(lmm_get_cnst_from_var - (action->getModel()->getMaxminSystem(), - action->getVariable(), 0))); -} - -simgrid::surf::signal cpuActionStateChangedCallbacks; - -void cpu_add_traces(){ - surf_cpu_model_pm->addTraces(); -} - /********* * Model * *********/ -void CpuModel::updateActionsStateLazy(double now, double /*delta*/) +void CpuModel::update_actions_state_lazy(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())); + while (not get_action_heap().empty() && double_equals(get_action_heap().top_date(), now, sg_surf_precision)) { + + CpuAction* action = static_cast(get_action_heap().pop()); 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))); - TRACE_surf_host_set_utilization(cpu->getName(), action->getCategory(), - lmm_variable_getvalue(action->getVariable()), - action->getLastUpdate(), - now - action->getLastUpdate()); - } - action->finish(); + action->finish(kernel::resource::Action::State::FINISHED); XBT_CDEBUG(surf_kernel, "Action %p finished", action); - - /* 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 } - 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; - ActionList *actionSet = getRunningActionSet(); - for(ActionList::iterator it(actionSet->begin()), itend(actionSet->end()) - ; it != itend ; ++it) { - action = static_cast(&*it); - if (smaller < 0) { - smaller = action->getLastUpdate(); - continue; - } - if (action->getLastUpdate() < smaller) { - smaller = action->getLastUpdate(); - } - } - if (smaller > 0) { - TRACE_last_timestamp_to_dump = smaller; - } - } - return; } -void CpuModel::updateActionsStateFull(double now, double delta) +void CpuModel::update_actions_state_full(double now, double delta) { - CpuAction *action = NULL; - ActionList *running_actions = getRunningActionSet(); - - for(ActionList::iterator it(running_actions->begin()), itNext=it, itend(running_actions->end()) - ; it != itend ; it=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)) ); - - TRACE_surf_host_set_utilization(x->getName(), - action->getCategory(), - lmm_variable_getvalue(action->getVariable()), - now - delta, - delta); - TRACE_last_timestamp_to_dump = now - delta; - } - - action->updateRemains(lmm_variable_getvalue(action->getVariable()) * delta); - + for (auto it = std::begin(*get_started_action_set()); it != std::end(*get_started_action_set());) { + CpuAction& action = static_cast(*it); + ++it; // increment iterator here since the following calls to action.finish() may invalidate it - if (action->getMaxDuration() != NO_MAX_DURATION) - action->updateMaxDuration(delta); + action.update_remains(action.get_variable()->get_value() * delta); + if (action.get_max_duration() != NO_MAX_DURATION) + action.update_max_duration(delta); - if ((action->getRemainsNoUpdate() <= 0) && - (lmm_get_variable_weight(action->getVariable()) > 0)) { - action->finish(); - action->setState(SURF_ACTION_DONE); - } else if ((action->getMaxDuration() != NO_MAX_DURATION) && - (action->getMaxDuration() <= 0)) { - action->finish(); - action->setState(SURF_ACTION_DONE); + if (((action.get_remains_no_update() <= 0) && (action.get_variable()->get_weight() > 0)) || + ((action.get_max_duration() != NO_MAX_DURATION) && (action.get_max_duration() <= 0))) { + action.finish(kernel::resource::Action::State::FINISHED); } } - - return; } /************ * Resource * ************/ -Cpu::Cpu() +Cpu::Cpu(kernel::resource::Model* model, simgrid::s4u::Host* host, std::vector* speedPerPstate, int core) + : Cpu(model, host, nullptr /*constraint*/, speedPerPstate, core) { } - -Cpu::Cpu(Model *model, simgrid::Host *host, - xbt_dynar_t speedPeakList, int pstate, - int core, double speedPeak, double speedScale, - e_surf_resource_state_t stateInitial) - : Resource(model, host->getName().c_str(), stateInitial) - , m_core(core) - , m_speedPeak(speedPeak) - , m_speedScale(speedScale) - , m_host(host) +Cpu::Cpu(kernel::resource::Model* model, simgrid::s4u::Host* host, kernel::lmm::Constraint* constraint, + std::vector* speedPerPstate, int core) + : Resource(model, host->get_cname(), constraint), core_count_(core), host_(host) { - host->extension_set(Cpu::EXTENSION_ID, this); + xbt_assert(core > 0, "Host %s must have at least one core, not 0.", host->get_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); - } - - m_pstate = pstate; -} - -Cpu::Cpu(Model *model, simgrid::Host *host, lmm_constraint_t constraint, - xbt_dynar_t speedPeakList, int pstate, - int core, double speedPeak, - double speedScale, e_surf_resource_state_t stateInitial) - : Resource(model, host->getName().c_str(), constraint, stateInitial) - , m_core(core) - , m_speedPeak(speedPeak) - , m_speedScale(speedScale) - , m_host(host) -{ - host->extension_set(Cpu::EXTENSION_ID, this); + speed_.peak = speedPerPstate->front(); + speed_.scale = 1; + host->pimpl_cpu = this; + xbt_assert(speed_.scale > 0, "Speed of host %s must be >0", host->get_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); - } - - m_pstate = pstate; - - /* 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->getName().c_str(), i); - p_constraintCore[i] = lmm_constraint_new(model->getMaxminSystem(), p_constraintCoreId[i], m_speedScale * m_speedPeak); - } + for (double const& value : *speedPerPstate) { + speed_per_pstate_.push_back(value); } } -Cpu::Cpu(Model *model, simgrid::Host *host, lmm_constraint_t constraint, - xbt_dynar_t speedPeakList, int pstate, - int core, double speedPeak, double speedScale) -: Cpu(model, host, constraint, speedPeakList, pstate, core, speedPeak, speedScale, SURF_RESOURCE_ON) +Cpu::~Cpu() { - xbt_assert(0,"FIXME: this constructor could be removed"); + if (get_model() == surf_cpu_model_pm) + speed_per_pstate_.clear(); } -Cpu::Cpu(Model *model, simgrid::Host *host, - xbt_dynar_t speedPeakList, int pstate, - int core, double speedPeak, double speedScale) -: Cpu(model, host, speedPeakList, pstate, core, speedPeak, speedScale, SURF_RESOURCE_ON) -{} - -Cpu::~Cpu() +int Cpu::get_pstate_count() { - 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); + return speed_per_pstate_.size(); } -double Cpu::getCurrentPowerPeak() +void Cpu::set_pstate(int pstate_index) { - return m_speedPeak; + xbt_assert(pstate_index <= static_cast(speed_per_pstate_.size()), + "Invalid parameters for CPU %s (pstate %d > length of pstates %d). Please fix your platform file, or your " + "call to change the pstate.", + get_cname(), pstate_index, static_cast(speed_per_pstate_.size())); + + double new_peak_speed = speed_per_pstate_[pstate_index]; + pstate_ = pstate_index; + speed_.peak = new_peak_speed; + + on_speed_change(); } -int Cpu::getNbPStates() +int Cpu::get_pstate() { - return xbt_dynar_length(p_speedPeakList); + return pstate_; } -void Cpu::setPState(int pstate_index) +double Cpu::get_pstate_peak_speed(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(speed_per_pstate_.size())), + "Invalid parameters (pstate index out of bounds)"); - double new_peak_speed = xbt_dynar_get_as(plist, pstate_index, double); - m_pstate = pstate_index; - m_speedPeak = new_peak_speed; + return speed_per_pstate_[pstate_index]; } -int Cpu::getPState() +double Cpu::get_speed(double load) { - return m_pstate; + return load * speed_.peak; } -double Cpu::getPowerPeakAt(int pstate_index) +double Cpu::get_speed_ratio() { - xbt_dynar_t plist = p_speedPeakList; - xbt_assert((pstate_index <= (int)xbt_dynar_length(plist)), "Invalid parameters (pstate index out of bounds)"); - - return xbt_dynar_get_as(plist, pstate_index, double); +/* number between 0 and 1 */ + return speed_.scale; } -double Cpu::getSpeed(double load) +void Cpu::on_speed_change() { - return load * m_speedPeak; + s4u::Host::on_speed_change(*host_); } -double Cpu::getAvailableSpeed() +int Cpu::get_core_count() { -/* number between 0 and 1 */ - return m_speedScale; + return core_count_; } -int Cpu::getCore() +void Cpu::set_speed_trace(tmgr_trace_t trace) { - return m_core; + xbt_assert(speed_.event == nullptr, "Cannot set a second speed trace to Host %s", host_->get_cname()); + + speed_.event = future_evt_set->add_trace(trace, this); } + /********** * Action * **********/ -void CpuAction::updateRemainingLazy(double now) +void CpuAction::update_remains_lazy(double now) { - double delta = 0.0; + xbt_assert(get_state_set() == get_model()->get_started_action_set(), + "You're updating an action that is not running."); + xbt_assert(get_priority() > 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 - get_last_update(); - /* bogus priority, skip it */ - xbt_assert(getPriority() > 0, - "You're updating an action that seems suspended."); + if (get_remains_no_update() > 0) { + XBT_CDEBUG(surf_kernel, "Updating action(%p): remains was %f, last_update was: %f", this, get_remains_no_update(), + get_last_update()); + update_remains(get_last_value() * delta); - 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 (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); - } - 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, get_remains_no_update()); } - m_lastUpdate = now; - m_lastValue = lmm_variable_getvalue(getVariable()); + set_last_update(); + set_last_value(get_variable()->get_value()); } -/* - * - * 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); +simgrid::xbt::signal CpuAction::on_state_change; - { - unsigned long nbits = 0; +void CpuAction::suspend(){ + on_state_change(this); + Action::suspend(); +} - /* 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; - } +void CpuAction::resume(){ + on_state_change(this); + Action::resume(); +} - 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::set_state(Action::State state) +{ + Action::set_state(state); + on_state_change(this); +} - 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); - } - } +/** @brief returns a list of all CPUs that this action is using */ +std::list CpuAction::cpus() { + std::list retlist; + int llen = get_variable()->get_number_of_constraint(); - if (cpu->getModel()->getUpdateMechanism() == UM_LAZY) { - /* FIXME (hypervisor): Do we need to do something for the LAZY mode? */ + 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*... + kernel::resource::Resource* resource = + static_cast(get_variable()->get_constraint(i)->get_id()); + Cpu* cpu = dynamic_cast(resource); + if (cpu != nullptr) + retlist.push_back(cpu); } - XBT_OUT(); -} - -simgrid::surf::signal CpuAction::onStateChange; -void CpuAction::setState(e_surf_action_state_t state){ - e_surf_action_state_t old = getState(); - Action::setState(state); - onStateChange(this, old, state); + return retlist; } }