X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/18d23a87c23647366cfffbc61d3f7c632301159c..e47d2126ee520f8d88107618c42b84544e91a32c:/src/surf/cpu_interface.cpp diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp index dd9ee5a276..a935630d10 100644 --- a/src/surf/cpu_interface.cpp +++ b/src/surf/cpu_interface.cpp @@ -1,11 +1,49 @@ +/* Copyright (c) 2013-2015. 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" XBT_LOG_EXTERNAL_CATEGORY(surf_kernel); 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; +int autoload_surf_cpu_model = 1; +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 { + +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 * @@ -13,40 +51,35 @@ CpuModelPtr surf_cpu_model_vm; void CpuModel::updateActionsStateLazy(double now, double /*delta*/) { - void *_action; - CpuActionLmmPtr action; + CpuAction *action; while ((xbt_heap_size(getActionHeap()) > 0) - && (double_equals(xbt_heap_maxkey(getActionHeap()), now))) { - action = dynamic_cast(static_cast(xbt_heap_pop(getActionHeap()))); + && (double_equals(xbt_heap_maxkey(getActionHeap()), now, sg_surf_precision))) { + 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 = 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(cpu->getName(), action->getCategory(), lmm_variable_getvalue(action->getVariable()), action->getLastUpdate(), now - action->getLastUpdate()); } -#endif action->finish(); 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->setRemains(0); action->setState(SURF_ACTION_DONE); action->heapRemove(getActionHeap()); //FIXME: strange call since action was already popped } -#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_t actionSet = getRunningActionSet(); - xbt_swag_foreach(_action, actionSet) { - action = dynamic_cast(static_cast(_action)); + 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; @@ -59,22 +92,20 @@ void CpuModel::updateActionsStateLazy(double now, double /*delta*/) 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 = getRunningActionSet(); + CpuAction *action = NULL; + ActionList *running_actions = getRunningActionSet(); - xbt_swag_foreach_safe(_action, _next_action, running_actions) { - action = dynamic_cast(static_cast(_action)); -#ifdef HAVE_TRACING + 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()) { - CpuPtr x = (CpuPtr) lmm_constraint_id(lmm_get_cnst_from_var - (getMaxminSystem(), action->getVariable(), 0)); + 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(), @@ -83,7 +114,6 @@ void CpuModel::updateActionsStateFull(double now, double delta) delta); TRACE_last_timestamp_to_dump = now - delta; } -#endif action->updateRemains(lmm_variable_getvalue(action->getVariable()) * delta); @@ -92,7 +122,7 @@ void CpuModel::updateActionsStateFull(double now, double delta) action->updateMaxDuration(delta); - if ((action->getRemains() <= 0) && + if ((action->getRemainsNoUpdate() <= 0) && (lmm_get_variable_weight(action->getVariable()) > 0)) { action->finish(); action->setState(SURF_ACTION_DONE); @@ -101,7 +131,6 @@ void CpuModel::updateActionsStateFull(double now, double delta) action->finish(); action->setState(SURF_ACTION_DONE); } - action->updateEnergy(); } return; @@ -110,66 +139,154 @@ void CpuModel::updateActionsStateFull(double now, double delta) /************ * Resource * ************/ - -Cpu::Cpu(int core, double powerPeak, double powerScale) - : m_core(core), m_powerPeak(powerPeak), m_powerScale(powerScale) -{} - -double Cpu::getSpeed(double load) +Cpu::Cpu() { - return load * m_powerPeak; } -double Cpu::getAvailableSpeed() + +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) { -/* number between 0 and 1 */ - return m_powerScale; + host->extension_set(Cpu::EXTENSION_ID, this); + + // 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; } -int Cpu::getCore() +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) { - return m_core; -} + host->extension_set(Cpu::EXTENSION_ID, this); + + // 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); + } -CpuLmm::CpuLmm(lmm_constraint_t constraint) -: ResourceLmm(constraint), p_constraintCore(NULL), p_constraintCoreId(NULL) -{} + m_pstate = pstate; -CpuLmm::CpuLmm(lmm_constraint_t constraint, int core, double powerPeak, double powerScale) - : ResourceLmm(constraint) - , Cpu(core, powerPeak, powerScale) -{ - /* At now, we assume that a VM does not have a multicore CPU. */ + /* Currently, we assume that a VM does not have a multicore CPU. */ if (core > 1) - xbt_assert(getModel() == surf_cpu_model_pm); + 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); - 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", getName(), i); - p_constraintCore[i] = lmm_constraint_new(getModel()->getMaxminSystem(), p_constraintCoreId[i], m_powerScale * m_powerPeak); + 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); + } } } -CpuLmm::~CpuLmm(){ - if (p_constraintCore){ +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) +{ + xbt_assert(0,"FIXME: this constructor could be removed"); +} + +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() +{ + if (p_constraintCoreId){ for (int i = 0; i < m_core; i++) { xbt_free(p_constraintCoreId[i]); } xbt_free(p_constraintCore); - xbt_free(p_constraintCoreId); } + if (p_constraintCoreId) + xbt_free(p_constraintCoreId); +} + +double Cpu::getCurrentPowerPeak() +{ + return m_speedPeak; +} + +int Cpu::getNbPStates() +{ + return xbt_dynar_length(p_speedPeakList); +} + +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)); + + double new_peak_speed = xbt_dynar_get_as(plist, pstate_index, double); + m_pstate = pstate_index; + m_speedPeak = new_peak_speed; +} + +int Cpu::getPState() +{ + return m_pstate; +} + +double Cpu::getPowerPeakAt(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)"); + + return xbt_dynar_get_as(plist, pstate_index, double); +} + +double Cpu::getSpeed(double load) +{ + return load * m_speedPeak; +} + +double Cpu::getAvailableSpeed() +{ +/* number between 0 and 1 */ + return m_speedScale; +} + +int Cpu::getCore() +{ + return m_core; } /********** * Action * **********/ -void CpuActionLmm::updateRemainingLazy(double now) +void CpuAction::updateRemainingLazy(double now) { double delta = 0.0; @@ -183,33 +300,20 @@ void CpuActionLmm::updateRemainingLazy(double now) 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); + 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); -#ifdef HAVE_TRACING if (TRACE_is_enabled()) { - CpuPtr cpu = static_cast(lmm_constraint_id(lmm_get_cnst_from_var(getModel()->getMaxminSystem(), getVariable(), 0))); + 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); } -#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, m_remains); } m_lastUpdate = now; m_lastValue = lmm_variable_getvalue(getVariable()); } -void CpuActionLmm::setBound(double bound) -{ - XBT_IN("(%p,%g)", this, bound); - m_bound = bound; - lmm_update_variable_bound(getModel()->getMaxminSystem(), getVariable(), bound); - - if (getModel()->getUpdateMechanism() == UM_LAZY) - heapRemove(getModel()->getActionHeap()); - XBT_OUT(); -} - /* * * This function formulates a constraint problem that pins a given task to @@ -230,10 +334,9 @@ void CpuActionLmm::setBound(double bound) * action object does not have the information about the location where the * action is being executed. */ -void CpuActionLmm::setAffinity(CpuPtr _cpu, unsigned long mask) +void CpuAction::setAffinity(Cpu *cpu, unsigned long mask) { lmm_variable_t var_obj = getVariable(); - CpuLmmPtr cpu = reinterpret_cast(_cpu); XBT_IN("(%p,%lx)", this, mask); { @@ -276,6 +379,16 @@ void CpuActionLmm::setAffinity(CpuPtr _cpu, unsigned long mask) if (cpu->getModel()->getUpdateMechanism() == UM_LAZY) { /* FIXME (hypervisor): Do we need to do something for the LAZY mode? */ } - 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); +} + +} +}