X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5b3677b425b9cc6949c1573d59ac772540cbf4b2..10c02c776839657b86a6f1bdbb9817a8268bc397:/src/surf/cpu_interface.cpp diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp index c77302ede3..5b31783685 100644 --- a/src/surf/cpu_interface.cpp +++ b/src/surf/cpu_interface.cpp @@ -1,32 +1,37 @@ -/* Copyright (c) 2013-2014. The SimGrid Team. +/* 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 { /************* * Callbacks * *************/ -CpuPtr getActionCpu(CpuActionPtr action) { - return static_cast(lmm_constraint_id(lmm_get_cnst_from_var +Cpu *getActionCpu(CpuAction *action) { + return static_cast(lmm_constraint_id(lmm_get_cnst_from_var (action->getModel()->getMaxminSystem(), action->getVariable(), 0))); } -surf_callback(void, CpuPtr) cpuCreatedCallbacks; -surf_callback(void, CpuPtr) cpuDestructedCallbacks; -surf_callback(void, CpuPtr) cpuStateChangedCallbacks; -surf_callback(void, CpuActionPtr) cpuActionStateChangedCallbacks; +simgrid::xbt::signal cpuActionStateChangedCallbacks; /********* * Model * @@ -34,20 +39,18 @@ surf_callback(void, CpuActionPtr) cpuActionStateChangedCallbacks; void CpuModel::updateActionsStateLazy(double now, double /*delta*/) { - CpuActionPtr action; + CpuAction *action; while ((xbt_heap_size(getActionHeap()) > 0) - && (double_equals(xbt_heap_maxkey(getActionHeap()), now))) { - action = static_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); @@ -57,15 +60,14 @@ void CpuModel::updateActionsStateLazy(double now, double /*delta*/) 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; - ActionListPtr actionSet = getRunningActionSet(); + ActionList *actionSet = getRunningActionSet(); for(ActionList::iterator it(actionSet->begin()), itend(actionSet->end()) ; it != itend ; ++it) { - action = static_cast(&*it); + action = static_cast(&*it); if (smaller < 0) { smaller = action->getLastUpdate(); continue; @@ -78,23 +80,20 @@ void CpuModel::updateActionsStateLazy(double now, double /*delta*/) TRACE_last_timestamp_to_dump = smaller; } } -#endif return; } void CpuModel::updateActionsStateFull(double now, double delta) { - CpuActionPtr action = NULL; - ActionListPtr running_actions = getRunningActionSet(); + 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); -#ifdef HAVE_TRACING + 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(), @@ -103,7 +102,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); @@ -129,37 +127,41 @@ void CpuModel::updateActionsStateFull(double now, double delta) /************ * Resource * ************/ - -Cpu::Cpu(){ - surf_callback_emit(cpuCreatedCallbacks, this); -} - -Cpu::Cpu(ModelPtr model, const char *name, xbt_dict_t props, - int core, double powerPeak, double powerScale) - : Resource(model, name, props) - , m_core(core) - , m_powerPeak(powerPeak) - , m_powerScale(powerScale) - , p_constraintCore(NULL) - , p_constraintCoreId(NULL) +Cpu::Cpu(Model *model, simgrid::s4u::Host *host, + xbt_dynar_t speedPeakList, int pstate, + int core, double speedPeak, double speedScale, + int initiallyOn) + : Cpu(model, host, NULL/*constraint*/, speedPeakList, pstate, core, speedPeak, speedScale, initiallyOn) { - surf_callback_emit(cpuCreatedCallbacks, this); } -Cpu::Cpu(ModelPtr model, const char *name, xbt_dict_t props, - lmm_constraint_t constraint, int core, double powerPeak, double powerScale) - : Resource(model, name, props, constraint) +Cpu::Cpu(Model *model, simgrid::s4u::Host *host, lmm_constraint_t constraint, + xbt_dynar_t speedPeakList, int pstate, + int core, double speedPeak, + double speedScale, int initiallyOn) + : Resource(model, host->name().c_str(), constraint, initiallyOn) , m_core(core) - , m_powerPeak(powerPeak) - , m_powerScale(powerScale) + , m_speedPeak(speedPeak) + , m_speedScale(speedScale) + , m_host(host) { - surf_callback_emit(cpuCreatedCallbacks, this); - /* At now, we assume that a VM does not have a multicore CPU. */ + host->pimpl_cpu = this; + xbt_assert(m_speedScale > 0, "Available speed has to be >0"); + + // 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); - p_constraintCore = NULL; - p_constraintCoreId = NULL; if (model->getUpdateMechanism() != UM_UNDEFINED) { p_constraintCore = xbt_new(lmm_constraint_t, core); p_constraintCoreId = xbt_new(void*, core); @@ -167,14 +169,14 @@ Cpu::Cpu(ModelPtr model, const char *name, xbt_dict_t props, 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(model->getMaxminSystem(), p_constraintCoreId[i], m_powerScale * m_powerPeak); + p_constraintCoreId[i] = bprintf("%s:%i", host->name().c_str(), i); + p_constraintCore[i] = lmm_constraint_new(model->getMaxminSystem(), p_constraintCoreId[i], m_speedScale * m_speedPeak); } } } -Cpu::~Cpu(){ - surf_callback_emit(cpuDestructedCallbacks, this); +Cpu::~Cpu() +{ if (p_constraintCoreId){ for (int i = 0; i < m_core; i++) { xbt_free(p_constraintCoreId[i]); @@ -185,27 +187,64 @@ Cpu::~Cpu(){ 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; + + onSpeedChange(); +} + +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_powerPeak; + return load * m_speedPeak; } double Cpu::getAvailableSpeed() { /* number between 0 and 1 */ - return m_powerScale; + return m_speedScale; +} + +void Cpu::onSpeedChange() { + TRACE_surf_host_set_speed(surf_get_clock(), getName(), + m_core * m_speedScale * m_speedPeak); } + int Cpu::getCore() { return m_core; } -void Cpu::setState(e_surf_resource_state_t state) -{ - Resource::setState(state); - surf_callback_emit(cpuStateChangedCallbacks, this); -} /********** * Action * **********/ @@ -224,33 +263,20 @@ void CpuAction::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 CpuAction::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 @@ -271,7 +297,7 @@ void CpuAction::setBound(double bound) * action object does not have the information about the location where the * action is being executed. */ -void CpuAction::setAffinity(CpuPtr cpu, unsigned long mask) +void CpuAction::setAffinity(Cpu *cpu, unsigned long mask) { lmm_variable_t var_obj = getVariable(); XBT_IN("(%p,%lx)", this, mask); @@ -319,7 +345,13 @@ void CpuAction::setAffinity(CpuPtr cpu, unsigned long mask) XBT_OUT(); } +simgrid::xbt::signal CpuAction::onStateChange; + void CpuAction::setState(e_surf_action_state_t state){ + e_surf_action_state_t previous = getState(); Action::setState(state); - surf_callback_emit(cpuActionStateChangedCallbacks, this); + onStateChange(this, previous); +} + +} }