namespace simgrid {
namespace surf {
-simgrid::xbt::Extension<simgrid::Host, Cpu> Cpu::EXTENSION_ID;
-
-void Cpu::classInit()
-{
- if (!EXTENSION_ID.valid())
- EXTENSION_ID = simgrid::Host::extension_create<simgrid::surf::Cpu>();
-}
-
/*************
* Callbacks *
*************/
Cpu *getActionCpu(CpuAction *action) {
return static_cast<Cpu*>(lmm_constraint_id(lmm_get_cnst_from_var
- (action->getModel()->getMaxminSystem(),
- action->getVariable(), 0)));
+ (action->getModel()->getMaxminSystem(),
+ action->getVariable(), 0)));
}
-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();
-}
+simgrid::xbt::signal<void(CpuAction*, e_surf_action_state_t, e_surf_action_state_t)> cpuActionStateChangedCallbacks;
/*********
* Model *
for(ActionList::iterator it(running_actions->begin()), itNext=it, itend(running_actions->end())
; it != itend ; it=itNext) {
- ++itNext;
+ ++itNext;
action = static_cast<CpuAction*>(&*it);
if (TRACE_is_enabled()) {
Cpu *x = static_cast<Cpu*> (lmm_constraint_id(lmm_get_cnst_from_var(getMaxminSystem(), action->getVariable(), 0)) );
/************
* Resource *
************/
-Cpu::Cpu()
+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)
{
}
-
-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, 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, 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, host->getName().c_str(), constraint, stateInitial)
+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)
{
- host->extension_set(Cpu::EXTENSION_ID, this);
+ p_speed.peak = speedPeak;
+ p_speed.scale = speedScale;
+ host->pimpl_cpu = this;
+ xbt_assert(p_speed.scale > 0, "Available speed has to be >0");
// Copy the power peak array:
p_speedPeakList = xbt_dynar_new(sizeof(double), nullptr);
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->getName().c_str(), i);
- p_constraintCore[i] = lmm_constraint_new(model->getMaxminSystem(), p_constraintCoreId[i], m_speedScale * m_speedPeak);
+ p_constraintCoreId[i] = bprintf("%s:%i", host->name().c_str(), i);
+ p_constraintCore[i] = lmm_constraint_new(model->getMaxminSystem(), p_constraintCoreId[i], p_speed.scale * p_speed.peak);
}
}
}
-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, host, constraint, speedPeakList, pstate, core, speedPeak, speedScale, SURF_RESOURCE_ON)
-{
- 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()
{
if (p_constraintCoreId){
for (int i = 0; i < m_core; i++) {
- xbt_free(p_constraintCoreId[i]);
+ xbt_free(p_constraintCoreId[i]);
}
xbt_free(p_constraintCore);
}
if (p_constraintCoreId)
xbt_free(p_constraintCoreId);
+ if (p_speedPeakList)
+ xbt_dynar_free(&p_speedPeakList);
}
double Cpu::getCurrentPowerPeak()
{
- return m_speedPeak;
+ return p_speed.peak;
}
int Cpu::getNbPStates()
{
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));
+ "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;
+ p_speed.peak = new_peak_speed;
+
+ onSpeedChange();
}
int Cpu::getPState()
double Cpu::getSpeed(double load)
{
- return load * m_speedPeak;
+ return load * p_speed.peak;
}
double Cpu::getAvailableSpeed()
{
/* number between 0 and 1 */
- return m_speedScale;
+ return p_speed.scale;
+}
+
+void Cpu::onSpeedChange() {
+ TRACE_surf_host_set_speed(surf_get_clock(), getName(),
+ m_core * p_speed.scale * p_speed.peak);
}
+
int Cpu::getCore()
{
return m_core;
}
+void Cpu::set_state_trace(tmgr_trace_t trace)
+{
+ xbt_assert(p_stateEvent==NULL,"Cannot set a second state trace to Host %s", m_host->name().c_str());
+
+ p_stateEvent = future_evt_set->add_trace(trace, 0.0, this);
+}
+void Cpu::set_speed_trace(tmgr_trace_t trace)
+{
+ xbt_assert(p_speed.event==NULL,"Cannot set a second speed trace to Host %s", m_host->name().c_str());
+
+ p_speed.event = future_evt_set->add_trace(trace, 0.0, this);
+}
+
+
/**********
* Action *
**********/
XBT_OUT();
}
-simgrid::surf::signal<void(simgrid::surf::CpuAction*, e_surf_action_state_t, e_surf_action_state_t)> CpuAction::onStateChange;
+simgrid::xbt::signal<void(simgrid::surf::CpuAction*, e_surf_action_state_t)> CpuAction::onStateChange;
void CpuAction::setState(e_surf_action_state_t state){
- e_surf_action_state_t old = getState();
+ e_surf_action_state_t previous = getState();
Action::setState(state);
- onStateChange(this, old, state);
+ onStateChange(this, previous);
}
}
