X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/10c02c776839657b86a6f1bdbb9817a8268bc397..6a07d63f0f7ce92c6e77881af3ca2fd1113f1fd1:/src/surf/cpu_interface.cpp diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp index 5b31783685..ccdad63294 100644 --- a/src/surf/cpu_interface.cpp +++ b/src/surf/cpu_interface.cpp @@ -7,6 +7,7 @@ #include #include "cpu_interface.hpp" #include "plugins/energy.hpp" +#include "src/instr/instr_private.h" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals XBT_LOG_EXTERNAL_CATEGORY(surf_kernel); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu, surf, @@ -25,10 +26,15 @@ namespace surf { * Callbacks * *************/ -Cpu *getActionCpu(CpuAction *action) { - return static_cast(lmm_constraint_id(lmm_get_cnst_from_var - (action->getModel()->getMaxminSystem(), - action->getVariable(), 0))); +std::list getActionCpus(CpuAction *action) { + std::list retlist; + lmm_system_t sys = action->getModel()->getMaxminSystem(); + int llen = lmm_get_number_of_cnst_from_var(sys, action->getVariable()); + + for(int i = 0; igetVariable(), i) )) ); + } + return retlist; } simgrid::xbt::signal cpuActionStateChangedCallbacks; @@ -90,7 +96,7 @@ void CpuModel::updateActionsStateFull(double now, double delta) for(ActionList::iterator it(running_actions->begin()), itNext=it, itend(running_actions->end()) ; it != itend ; it=itNext) { - ++itNext; + ++itNext; action = static_cast(&*it); if (TRACE_is_enabled()) { Cpu *x = static_cast (lmm_constraint_id(lmm_get_cnst_from_var(getMaxminSystem(), action->getVariable(), 0)) ); @@ -128,49 +134,43 @@ void CpuModel::updateActionsStateFull(double now, double delta) * Resource * ************/ 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) + xbt_dynar_t speedPeakList, int core, double speedPeak) + : Cpu(model, host, NULL/*constraint*/, speedPeakList, core, speedPeak) { } 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) + xbt_dynar_t speedPeakList, int core, double speedPeak) + : Resource(model, host->name().c_str(), constraint) + , coresAmount_(core) + , host_(host) { + speed_.peak = speedPeak; + speed_.scale = 1; host->pimpl_cpu = this; - xbt_assert(m_speedScale > 0, "Available speed has to be >0"); + xbt_assert(speed_.scale > 0, "Available speed has to be >0"); // Copy the power peak array: - p_speedPeakList = xbt_dynar_new(sizeof(double), nullptr); + 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); + xbt_dynar_push(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); if (model->getUpdateMechanism() != UM_UNDEFINED) { - p_constraintCore = xbt_new(lmm_constraint_t, core); - p_constraintCoreId = xbt_new(void*, core); + p_constraintCore = xbt_new(lmm_constraint_t, core); + p_constraintCoreId = xbt_new(void*, core); int i; for (i = 0; i < core; i++) { /* just for a unique id, never used as a string. */ 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); + p_constraintCore[i] = lmm_constraint_new(model->getMaxminSystem(), p_constraintCoreId[i], speed_.scale * speed_.peak); } } } @@ -178,46 +178,48 @@ Cpu::Cpu(Model *model, simgrid::s4u::Host *host, lmm_constraint_t constraint, Cpu::~Cpu() { if (p_constraintCoreId){ - for (int i = 0; i < m_core; i++) { - xbt_free(p_constraintCoreId[i]); + for (int i = 0; i < coresAmount_; i++) { + xbt_free(p_constraintCoreId[i]); } xbt_free(p_constraintCore); } if (p_constraintCoreId) xbt_free(p_constraintCoreId); + if (speedPeakList_) + xbt_dynar_free(&speedPeakList_); } double Cpu::getCurrentPowerPeak() { - return m_speedPeak; + return speed_.peak; } int Cpu::getNbPStates() { - return xbt_dynar_length(p_speedPeakList); + return xbt_dynar_length(speedPeakList_); } void Cpu::setPState(int pstate_index) { - xbt_dynar_t plist = p_speedPeakList; + xbt_dynar_t plist = 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)); + "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; + pstate_ = pstate_index; + speed_.peak = new_peak_speed; onSpeedChange(); } int Cpu::getPState() { - return m_pstate; + return pstate_; } double Cpu::getPowerPeakAt(int pstate_index) { - xbt_dynar_t plist = p_speedPeakList; + xbt_dynar_t plist = 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); @@ -225,26 +227,40 @@ double Cpu::getPowerPeakAt(int pstate_index) double Cpu::getSpeed(double load) { - return load * m_speedPeak; + return load * speed_.peak; } double Cpu::getAvailableSpeed() { /* number between 0 and 1 */ - return m_speedScale; + return speed_.scale; } void Cpu::onSpeedChange() { - TRACE_surf_host_set_speed(surf_get_clock(), getName(), - m_core * m_speedScale * m_speedPeak); + TRACE_surf_host_set_speed(surf_get_clock(), getName(), + coresAmount_ * speed_.scale * speed_.peak); } int Cpu::getCore() { - return m_core; + return coresAmount_; } +void Cpu::setStateTrace(tmgr_trace_t trace) +{ + xbt_assert(stateEvent_==NULL,"Cannot set a second state trace to Host %s", host_->name().c_str()); + + stateEvent_ = future_evt_set->add_trace(trace, 0.0, this); +} +void Cpu::setSpeedTrace(tmgr_trace_t trace) +{ + xbt_assert(speed_.event==NULL,"Cannot set a second speed trace to Host %s", host_->name().c_str()); + + speed_.event = future_evt_set->add_trace(trace, 0.0, this); +} + + /********** * Action * **********/ @@ -306,7 +322,7 @@ void CpuAction::setAffinity(Cpu *cpu, unsigned long mask) unsigned long nbits = 0; /* FIXME: There is much faster algorithms doing this. */ - for (int i = 0; i < cpu->m_core; i++) { + for (int i = 0; i < cpu->coresAmount_; i++) { unsigned long has_affinity = (1UL << i) & mask; if (has_affinity) nbits += 1; @@ -319,7 +335,7 @@ void CpuAction::setAffinity(Cpu *cpu, unsigned long mask) } } - for (int i = 0; i < cpu->m_core; i++) { + for (int i = 0; i < cpu->coresAmount_; i++) { XBT_DEBUG("clear affinity %p to cpu-%d@%s", this, i, cpu->getName()); lmm_shrink(cpu->getModel()->getMaxminSystem(), cpu->p_constraintCore[i], var_obj);