X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e8b0c2495697cb3be4ea22a4b356e92d118e5a82..8dadf249202bc6834a1d680b8ec8446937b3c4a6:/src/surf/cpu_interface.cpp diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp index 39f1cb9cd9..1b843c0253 100644 --- a/src/surf/cpu_interface.cpp +++ b/src/surf/cpu_interface.cpp @@ -4,6 +4,7 @@ /* 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" @@ -14,8 +15,12 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu, surf, int autoload_surf_cpu_model = 1; void_f_void_t surf_cpu_model_init_preparse = NULL; -CpuModel *surf_cpu_model_pm; -CpuModel *surf_cpu_model_vm; +simgrid::surf::CpuModel *surf_cpu_model_pm; +simgrid::surf::CpuModel *surf_cpu_model_vm; + +namespace simgrid { +namespace surf { + /************* * Callbacks * *************/ @@ -26,10 +31,7 @@ Cpu *getActionCpu(CpuAction *action) { action->getVariable(), 0))); } -surf_callback(void, Cpu*) cpuCreatedCallbacks; -surf_callback(void, Cpu*) cpuDestructedCallbacks; -surf_callback(void, Cpu*, e_surf_resource_state_t, e_surf_resource_state_t) cpuStateChangedCallbacks; -surf_callback(void, CpuAction*, e_surf_action_state_t, e_surf_action_state_t) cpuActionStateChangedCallbacks; +simgrid::surf::signal cpuActionStateChangedCallbacks; void cpu_add_traces(){ surf_cpu_model_pm->addTraces(); @@ -38,6 +40,7 @@ void cpu_add_traces(){ /********* * Model * *********/ + void CpuModel::updateActionsStateLazy(double now, double /*delta*/) { CpuAction *action; @@ -128,38 +131,60 @@ void CpuModel::updateActionsStateFull(double now, double delta) /************ * Resource * ************/ - -Cpu::Cpu(){ +Cpu::Cpu() +{ } -Cpu::Cpu(Model *model, const char *name, xbt_dict_t props, - int core, double powerPeak, double powerScale, +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, name, props, stateInitial) + : Resource(model, host->getName().c_str(), stateInitial) , m_core(core) - , m_speedPeak(powerPeak) - , m_speedScale(powerScale) - , p_constraintCore(NULL) - , p_constraintCoreId(NULL) + , m_speedPeak(speedPeak) + , m_speedScale(speedScale) + , m_host(host) { + host->p_cpu = 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; } -Cpu::Cpu(Model *model, const char *name, xbt_dict_t props, - lmm_constraint_t constraint, int core, double speedPeak, +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, name, props, constraint, stateInitial) + : Resource(model, host->getName().c_str(), constraint, stateInitial) , m_core(core) , m_speedPeak(speedPeak) , m_speedScale(speedScale) + , m_host(host) { - /* At now, we assume that a VM does not have a multicore CPU. */ + host->p_cpu = 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; + + /* 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,24 +192,28 @@ Cpu::Cpu(Model *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_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); } } } -Cpu::Cpu(Model *model, const char *name, xbt_dict_t props, - lmm_constraint_t constraint, int core, double speedPeak, double speedScale) -: Cpu(model, name, props, constraint, core, speedPeak, speedScale, SURF_RESOURCE_ON) -{} +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, const char *name, xbt_dict_t props, +Cpu::Cpu(Model *model, simgrid::Host *host, + xbt_dynar_t speedPeakList, int pstate, int core, double speedPeak, double speedScale) -: Cpu(model, name, props, core, speedPeak, speedScale, SURF_RESOURCE_ON) +: Cpu(model, host, speedPeakList, pstate, core, speedPeak, speedScale, SURF_RESOURCE_ON) {} -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]); @@ -200,6 +229,35 @@ 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; @@ -216,13 +274,6 @@ int Cpu::getCore() return m_core; } -void Cpu::setState(e_surf_resource_state_t state) -{ - e_surf_resource_state_t old = Resource::getState(); - Resource::setState(state); - surf_callback_emit(cpuStateChangedCallbacks, this, old, state); -} - /********** * Action * **********/ @@ -323,8 +374,13 @@ void CpuAction::setAffinity(Cpu *cpu, unsigned long mask) 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); - surf_callback_emit(cpuActionStateChangedCallbacks, this, old, state); + onStateChange(this, old, state); +} + +} }