X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9ba3bfdef0f13d77474c16059ca813b75ade43ab..e47d2126ee520f8d88107618c42b84544e91a32c:/src/surf/cpu_interface.cpp diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp index 2f1f7df542..a935630d10 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" @@ -22,7 +23,7 @@ namespace surf { simgrid::xbt::Extension Cpu::EXTENSION_ID; -void Cpu::init() +void Cpu::classInit() { if (!EXTENSION_ID.valid()) EXTENSION_ID = simgrid::Host::extension_create(); @@ -38,10 +39,8 @@ Cpu *getActionCpu(CpuAction *action) { action->getVariable(), 0))); } -simgrid::surf::signal cpuCreatedCallbacks; -simgrid::surf::signal cpuDestructedCallbacks; -simgrid::surf::signal cpuStateChangedCallbacks; simgrid::surf::signal cpuActionStateChangedCallbacks; + void cpu_add_traces(){ surf_cpu_model_pm->addTraces(); } @@ -145,26 +144,52 @@ Cpu::Cpu() } -Cpu::Cpu(Model *model, const char *name, - int core, double speedPeak, double speedScale, +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, stateInitial) + : Resource(model, host->getName().c_str(), stateInitial) , m_core(core) , m_speedPeak(speedPeak) , m_speedScale(speedScale) + , m_host(host) { + 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; } -Cpu::Cpu(Model *model, const char *name, - 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, 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->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; + + /* Currently, we assume that a VM does not have a multicore CPU. */ if (core > 1) xbt_assert(model == surf_cpu_model_pm); @@ -175,31 +200,28 @@ 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->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, - 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, +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, name, core, speedPeak, speedScale, SURF_RESOURCE_ON) -{} - -void Cpu::onDie() +: Cpu(model, host, constraint, speedPeakList, pstate, core, speedPeak, speedScale, SURF_RESOURCE_ON) { - cpuDestructedCallbacks(this); - Resource::onDie(); + 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() { - this->die(); if (p_constraintCoreId){ for (int i = 0; i < m_core; i++) { xbt_free(p_constraintCoreId[i]); @@ -215,6 +237,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; @@ -231,24 +282,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); - cpuStateChangedCallbacks(this, old, state); -} - -void Cpu::plug(simgrid::Host* host) -{ - if (this->m_host != nullptr) - xbt_die("Already plugged into host %s", host->id().c_str()); - host->extension_set(this); - this->m_host = host; - simgrid::surf::cpuCreatedCallbacks(this); - simgrid::surf::cpuStateChangedCallbacks(this, - SURF_RESOURCE_ON, this->getState()); -} - /********** * Action * **********/ @@ -349,10 +382,12 @@ 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); - cpuActionStateChangedCallbacks(this, old, state); + onStateChange(this, old, state); } }