X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/736f038a333b21482b9e73ed2860a7f096e29ac8..f159a7002798e65df6c90c3b9f774f48920aa41b:/src/surf/cpu_interface.cpp diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp index ea7f63e37a..475e236447 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" @@ -20,14 +21,6 @@ simgrid::surf::CpuModel *surf_cpu_model_vm; namespace simgrid { namespace surf { -simgrid::xbt::Extension Cpu::EXTENSION_ID; - -void Cpu::init() -{ - if (!EXTENSION_ID.valid()) - EXTENSION_ID = simgrid::Host::extension_create(); -} - /************* * Callbacks * *************/ @@ -38,11 +31,7 @@ Cpu *getActionCpu(CpuAction *action) { action->getVariable(), 0))); } -simgrid::surf::signal cpuActionStateChangedCallbacks; - -void cpu_add_traces(){ - surf_cpu_model_pm->addTraces(); -} +simgrid::xbt::signal cpuActionStateChangedCallbacks; /********* * Model * @@ -138,31 +127,38 @@ void CpuModel::updateActionsStateFull(double now, double delta) /************ * Resource * ************/ -Cpu::Cpu() +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) { } - -Cpu::Cpu(Model *model, const char *name, - int core, double speedPeak, double speedScale, - e_surf_resource_state_t stateInitial) - : Resource(model, name, stateInitial) +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_speedPeak(speedPeak) , m_speedScale(speedScale) + , m_host(host) { + 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; -Cpu::Cpu(Model *model, const char *name, - lmm_constraint_t constraint, int core, double speedPeak, - double speedScale, e_surf_resource_state_t stateInitial) - : Resource(model, name, constraint, stateInitial) - , m_core(core) - , m_speedPeak(speedPeak) - , m_speedScale(speedScale) -{ - /* 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(model == surf_cpu_model_pm); @@ -173,22 +169,12 @@ Cpu::Cpu(Model *model, const char *name, 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->name().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, - lmm_constraint_t constraint, int core, double speedPeak, double speedScale) -: Cpu(model, name, constraint, core, speedPeak, speedScale, SURF_RESOURCE_ON) -{} - -Cpu::Cpu(Model *model, const char *name, - int core, double speedPeak, double speedScale) -: Cpu(model, name, core, speedPeak, speedScale, SURF_RESOURCE_ON) -{} - Cpu::~Cpu() { if (p_constraintCoreId){ @@ -206,6 +192,37 @@ 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_speedPeak; @@ -217,18 +234,30 @@ double Cpu::getAvailableSpeed() 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::plug(simgrid::Host* host) +void Cpu::set_state_trace(tmgr_trace_t trace) { - if (this->m_host != nullptr) - xbt_die("Already plugged into host %s", host->id().c_str()); - host->extension_set(this); - this->m_host = host; + xbt_assert(p_stateEvent==NULL,"Cannot set a second state trace to Host %s", m_host->name().c_str()); + + p_stateEvent = future_evt_set->add_trace(trace, 0.0, this); } +void Cpu::set_speed_trace(tmgr_trace_t trace) +{ + xbt_assert(p_speedEvent==NULL,"Cannot set a second speed trace to Host %s", m_host->name().c_str()); + + p_speedEvent = future_evt_set->add_trace(trace, 0.0, this); +} + /********** * Action * @@ -330,10 +359,12 @@ 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); - cpuActionStateChangedCallbacks(this, old, state); + onStateChange(this, previous); } }