simgrid::xbt::Extension<simgrid::Host, Cpu> Cpu::EXTENSION_ID;
-void Cpu::init()
+void Cpu::classInit()
{
if (!EXTENSION_ID.valid())
EXTENSION_ID = simgrid::Host::extension_create<simgrid::surf::Cpu>();
action->getVariable(), 0)));
}
-simgrid::surf::signal<void(Cpu*)> cpuCreatedCallbacks;
-simgrid::surf::signal<void(Cpu*)> cpuDestructedCallbacks;
-simgrid::surf::signal<void(Cpu*, e_surf_resource_state_t, e_surf_resource_state_t)> cpuStateChangedCallbacks;
simgrid::surf::signal<void(CpuAction*, e_surf_action_state_t, e_surf_action_state_t)> cpuActionStateChangedCallbacks;
+
void cpu_add_traces(){
surf_cpu_model_pm->addTraces();
}
}
-Cpu::Cpu(Model *model, const char *name,
+Cpu::Cpu(Model *model, simgrid::Host *host,
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);
}
-Cpu::Cpu(Model *model, const char *name,
+Cpu::Cpu(Model *model, simgrid::Host *host,
lmm_constraint_t constraint, 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);
+ /* Currently, we assume that a VM does not have a multicore CPU. */
if (core > 1)
xbt_assert(model == surf_cpu_model_pm);
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,
+Cpu::Cpu(Model *model, simgrid::Host *host,
lmm_constraint_t constraint, int core, double speedPeak, double speedScale)
-: Cpu(model, name, constraint, core, speedPeak, speedScale, SURF_RESOURCE_ON)
+: Cpu(model, host, constraint, core, speedPeak, speedScale, SURF_RESOURCE_ON)
{}
-Cpu::Cpu(Model *model, const char *name,
+Cpu::Cpu(Model *model, simgrid::Host *host,
int core, double speedPeak, double speedScale)
-: Cpu(model, name, core, speedPeak, speedScale, SURF_RESOURCE_ON)
+: Cpu(model, host, core, speedPeak, speedScale, SURF_RESOURCE_ON)
{}
-void Cpu::onDie()
-{
- cpuDestructedCallbacks(this);
- Resource::onDie();
-}
-
Cpu::~Cpu()
{
- this->die();
if (p_constraintCoreId){
for (int i = 0; i < m_core; i++) {
xbt_free(p_constraintCoreId[i]);
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 *
**********/
XBT_OUT();
}
+simgrid::surf::signal<void(simgrid::surf::CpuAction*, e_surf_action_state_t, e_surf_action_state_t)> 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);
}
}