namespace simgrid {
namespace surf {
-simgrid::xbt::FacetLevel<simgrid::Host, Cpu> Cpu::LEVEL;
+simgrid::xbt::Extension<simgrid::Host, Cpu> Cpu::EXTENSION_ID;
void Cpu::init()
{
- if (!LEVEL.valid())
- LEVEL = simgrid::Host::add_level<simgrid::surf::Cpu>();
+ if (!EXTENSION_ID.valid())
+ EXTENSION_ID = simgrid::Host::extension_create<simgrid::surf::Cpu>();
}
/*************
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;
+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, xbt_dict_t props,
+Cpu::Cpu(Model *model, const char *name,
int core, double speedPeak, double speedScale,
e_surf_resource_state_t stateInitial)
- : Resource(model, name, props, stateInitial)
+ : Resource(model, name, stateInitial)
, m_core(core)
, m_speedPeak(speedPeak)
, m_speedScale(speedScale)
}
-Cpu::Cpu(Model *model, const char *name, xbt_dict_t props,
+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, props, constraint, stateInitial)
+ : Resource(model, name, constraint, stateInitial)
, m_core(core)
, m_speedPeak(speedPeak)
, m_speedScale(speedScale)
}
}
-Cpu::Cpu(Model *model, const char *name, xbt_dict_t props,
+Cpu::Cpu(Model *model, const char *name,
lmm_constraint_t constraint, int core, double speedPeak, double speedScale)
-: Cpu(model, name, props, constraint, core, speedPeak, speedScale, SURF_RESOURCE_ON)
+: Cpu(model, name, constraint, core, speedPeak, speedScale, SURF_RESOURCE_ON)
{}
-Cpu::Cpu(Model *model, const char *name, xbt_dict_t props,
+Cpu::Cpu(Model *model, const char *name,
int core, double speedPeak, double speedScale)
-: Cpu(model, name, props, core, speedPeak, speedScale, SURF_RESOURCE_ON)
+: Cpu(model, name, core, speedPeak, speedScale, SURF_RESOURCE_ON)
{}
-Cpu::~Cpu(){
- surf_callback_emit(cpuDestructedCallbacks, this);
+void Cpu::onDie()
+{
+ 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);
- surf_callback_emit(cpuStateChangedCallbacks, this, old, state);
-}
-
void Cpu::plug(simgrid::Host* host)
{
if (this->m_host != nullptr)
- xbt_die("Aleady plugged into host %s", host->id().c_str());
- host->set_facet(this);
+ 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());
}
/**********
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);
+ cpuActionStateChangedCallbacks(this, old, state);
}
}