X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/86a2c5fe8e05d3a764f7af7c3d872e0ba87dd3e3..347f9a2ca55bffc88bf965952b9be3a15535e908:/src/surf/cpu_interface.cpp diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp index 03cea6deee..10334fa25f 100644 --- a/src/surf/cpu_interface.cpp +++ b/src/surf/cpu_interface.cpp @@ -14,8 +14,20 @@ 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 { + +simgrid::xbt::Extension Cpu::EXTENSION_ID; + +void Cpu::classInit() +{ + if (!EXTENSION_ID.valid()) + EXTENSION_ID = simgrid::Host::extension_create(); +} + /************* * Callbacks * *************/ @@ -26,23 +38,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; - -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); -} +simgrid::surf::signal cpuActionStateChangedCallbacks; void cpu_add_traces(){ surf_cpu_model_pm->addTraces(); @@ -51,6 +47,7 @@ void cpu_add_traces(){ /********* * Model * *********/ + void CpuModel::updateActionsStateLazy(double now, double /*delta*/) { CpuAction *action; @@ -141,39 +138,34 @@ void CpuModel::updateActionsStateFull(double now, double delta) /************ * Resource * ************/ - -Cpu::Cpu(){ - surf_callback_emit(cpuCreatedCallbacks, this); - physCpu = NULL; +Cpu::Cpu() +{ } -Cpu::Cpu(Model *model, const char *name, xbt_dict_t props, - int core, double powerPeak, double powerScale) - : Resource(model, name, props) + +Cpu::Cpu(Model *model, const char *name, + int core, double speedPeak, double speedScale, + e_surf_resource_state_t stateInitial) + : Resource(model, name, stateInitial) , m_core(core) - , m_powerPeak(powerPeak) - , m_powerScale(powerScale) - , p_constraintCore(NULL) - , p_constraintCoreId(NULL) + , m_speedPeak(speedPeak) + , m_speedScale(speedScale) { - 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, 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_powerPeak(powerPeak) - , m_powerScale(powerScale) + , m_speedPeak(speedPeak) + , m_speedScale(speedScale) { - surf_callback_emit(cpuCreatedCallbacks, this); /* At now, 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); @@ -182,14 +174,23 @@ Cpu::Cpu(Model *model, const char *name, xbt_dict_t props, 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_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(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){ for (int i = 0; i < m_core; i++) { xbt_free(p_constraintCoreId[i]); @@ -202,18 +203,18 @@ Cpu::~Cpu(){ double Cpu::getCurrentPowerPeak() { - return m_powerPeak; + return m_speedPeak; } double Cpu::getSpeed(double load) { - return load * m_powerPeak; + return load * m_speedPeak; } double Cpu::getAvailableSpeed() { /* number between 0 and 1 */ - return m_powerScale; + return m_speedScale; } int Cpu::getCore() @@ -221,25 +222,12 @@ 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); -} - -void Cpu::setVirtual(Cpu *physCpu) -{ - 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; -} - -Cpu* Cpu::isVirtual(void) +void Cpu::plug(simgrid::Host* host) { - return physCpu; + if (this->m_host != nullptr) + xbt_die("Already plugged into host %s", host->getName().c_str()); + host->extension_set(this); + this->m_host = host; } /********** @@ -342,8 +330,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); +} + +} }