X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b1da263522ee9c5ca0b60d0ce75d3f06a2e641ba..10c02c776839657b86a6f1bdbb9817a8268bc397:/src/surf/cpu_interface.cpp diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp index 03cea6deee..5b31783685 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,31 +31,12 @@ 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; - -void cpu_parse_init(sg_platf_host_cbarg_t host){ - surf_cpu_model_pm->createCpu( - host->id, - host->power_peak, - host->pstate, - host->power_scale, - host->power_trace, - host->core_amount, - host->initial_state, - host->state_trace, - host->properties); -} - -void cpu_add_traces(){ - surf_cpu_model_pm->addTraces(); -} +simgrid::xbt::signal cpuActionStateChangedCallbacks; /********* * Model * *********/ + void CpuModel::updateActionsStateLazy(double now, double /*delta*/) { CpuAction *action; @@ -141,39 +127,41 @@ void CpuModel::updateActionsStateFull(double now, double delta) /************ * Resource * ************/ - -Cpu::Cpu(){ - surf_callback_emit(cpuCreatedCallbacks, this); - physCpu = NULL; -} - -Cpu::Cpu(Model *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); - physCpu = NULL; } -Cpu::Cpu(Model *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); @@ -181,15 +169,14 @@ 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_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); } } - physCpu = NULL; } -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]); @@ -202,44 +189,60 @@ Cpu::~Cpu(){ double Cpu::getCurrentPowerPeak() { - return m_powerPeak; + return m_speedPeak; } -double Cpu::getSpeed(double load) +int Cpu::getNbPStates() { - return load * m_powerPeak; + return xbt_dynar_length(p_speedPeakList); } -double Cpu::getAvailableSpeed() +void Cpu::setPState(int pstate_index) { -/* number between 0 and 1 */ - return m_powerScale; + 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::getCore() +int Cpu::getPState() { - return m_core; + return m_pstate; } -void Cpu::setState(e_surf_resource_state_t state) +double Cpu::getPowerPeakAt(int pstate_index) { - e_surf_resource_state_t old = Resource::getState(); - Resource::setState(state); - surf_callback_emit(cpuStateChangedCallbacks, this, old, state); + 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); } -void Cpu::setVirtual(Cpu *physCpu) +double Cpu::getSpeed(double load) { - this->physCpu = physCpu; - XBT_DEBUG("The CPU is virtual so associate the cpu energy to the physical cpu instead of creating a new one"); - std::map::iterator cpu_energy_it = surf_energy->find(physCpu); - xbt_assert(cpu_energy_it != surf_energy->end(), "The cpu is not in surf_energy."); - (*surf_energy)[this] = cpu_energy_it->second; + return load * m_speedPeak; +} + +double Cpu::getAvailableSpeed() +{ +/* number between 0 and 1 */ + return m_speedScale; } -Cpu* Cpu::isVirtual(void) +void Cpu::onSpeedChange() { + TRACE_surf_host_set_speed(surf_get_clock(), getName(), + m_core * m_speedScale * m_speedPeak); +} + + +int Cpu::getCore() { - return physCpu; + return m_core; } /********** @@ -342,8 +345,13 @@ void CpuAction::setAffinity(Cpu *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 old = getState(); + e_surf_action_state_t previous = getState(); Action::setState(state); - surf_callback_emit(cpuActionStateChangedCallbacks, this, old, state); + onStateChange(this, previous); +} + +} }