#include "maxmin_private.hpp"
#include "simgrid/sg_config.h"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_cas, surf_cpu,
- "Logging specific to the SURF CPU IMPROVED module");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_cas, surf_cpu, "Logging specific to the SURF CPU IMPROVED module");
/*********
* Model *
delete p_cpuRunningActionSetThatDoesNotNeedBeingChecked;
}
-Cpu *CpuCas01Model::createCpu(simgrid::s4u::Host *host, xbt_dynar_t speedPeak,
- tmgr_trace_t speedTrace, int core, tmgr_trace_t state_trace)
+Cpu *CpuCas01Model::createCpu(simgrid::s4u::Host *host, xbt_dynar_t speedPerPstate, int core)
{
- xbt_assert(xbt_dynar_getfirst_as(speedPeak, double) > 0.0,
- "Speed has to be >0.0. Did you forget to specify the mandatory power attribute?");
- xbt_assert(core > 0, "Invalid number of cores %d. Must be larger than 0", core);
- Cpu *cpu = new CpuCas01(this, host, speedPeak, speedTrace, core, state_trace);
- return cpu;
+ return new CpuCas01(this, host, speedPerPstate, core);
}
double CpuCas01Model::next_occuring_event_full(double /*now*/)
/************
* Resource *
************/
-CpuCas01::CpuCas01(CpuCas01Model *model, simgrid::s4u::Host *host, xbt_dynar_t speedPeak,
- tmgr_trace_t speedTrace, int core, tmgr_trace_t stateTrace)
+CpuCas01::CpuCas01(CpuCas01Model *model, simgrid::s4u::Host *host, xbt_dynar_t speedPerPstate, int core)
: Cpu(model, host,
- lmm_constraint_new(model->getMaxminSystem(), this, core * xbt_dynar_get_as(speedPeak, 0/*pstate*/, double)),
- speedPeak, core, xbt_dynar_get_as(speedPeak, 0/*pstate*/, double))
+ lmm_constraint_new(model->getMaxminSystem(), this, core * xbt_dynar_get_as(speedPerPstate, 0/*pstate*/, double)),
+ speedPerPstate, core)
{
-
- XBT_DEBUG("CPU create: peak=%f, pstate=%d", p_speed.peak, m_pstate);
-
- m_core = core;
- if (speedTrace)
- p_speed.event = future_evt_set->add_trace(speedTrace, 0.0, this);
-
- if (stateTrace)
- p_stateEvent = future_evt_set->add_trace(stateTrace, 0.0, this);
}
CpuCas01::~CpuCas01()
{
if (getModel() == surf_cpu_model_pm)
- xbt_dynar_free(&p_speedPeakList);
+ xbt_dynar_free(&speedPerPstate_);
}
xbt_dynar_t CpuCas01::getSpeedPeakList(){
- return p_speedPeakList;
+ return speedPerPstate_;
}
bool CpuCas01::isUsed()
lmm_element_t elem = NULL;
lmm_update_constraint_bound(getModel()->getMaxminSystem(), getConstraint(),
- m_core * p_speed.scale * p_speed.peak);
+ coresAmount_ * speed_.scale * speed_.peak);
while ((var = lmm_get_var_from_cnst
(getModel()->getMaxminSystem(), getConstraint(), &elem))) {
CpuCas01Action *action = static_cast<CpuCas01Action*>(lmm_variable_id(var));
lmm_update_variable_bound(getModel()->getMaxminSystem(),
action->getVariable(),
- p_speed.scale * p_speed.peak);
+ speed_.scale * speed_.peak);
}
Cpu::onSpeedChange();
void CpuCas01::apply_event(tmgr_trace_iterator_t event, double value)
{
- if (event == p_speed.event) {
+ if (event == speed_.event) {
/* TODO (Hypervisor): do the same thing for constraint_core[i] */
- xbt_assert(m_core == 1, "FIXME: add speed scaling code also for constraint_core[i]");
+ xbt_assert(coresAmount_ == 1, "FIXME: add speed scaling code also for constraint_core[i]");
- p_speed.scale = value;
+ speed_.scale = value;
onSpeedChange();
- tmgr_trace_event_unref(&p_speed.event);
- } else if (event == p_stateEvent) {
+ tmgr_trace_event_unref(&speed_.event);
+ } else if (event == stateEvent_) {
/* TODO (Hypervisor): do the same thing for constraint_core[i] */
- xbt_assert(m_core == 1, "FIXME: add state change code also for constraint_core[i]");
+ xbt_assert(coresAmount_ == 1, "FIXME: add state change code also for constraint_core[i]");
if (value > 0) {
if(isOff())
while ((var = lmm_get_var_from_cnst(getModel()->getMaxminSystem(), cnst, &elem))) {
Action *action = static_cast<Action*>(lmm_variable_id(var));
- if (action->getState() == SURF_ACTION_RUNNING ||
- action->getState() == SURF_ACTION_READY ||
- action->getState() == SURF_ACTION_NOT_IN_THE_SYSTEM) {
+ if (action->getState() == Action::State::running ||
+ action->getState() == Action::State::ready ||
+ action->getState() == Action::State::not_in_the_system) {
action->setFinishTime(date);
- action->setState(SURF_ACTION_FAILED);
+ action->setState(Action::State::failed);
}
}
}
- tmgr_trace_event_unref(&p_stateEvent);
+ tmgr_trace_event_unref(&stateEvent_);
} else {
xbt_die("Unknown event!\n");
XBT_IN("(%s,%g)", getName(), size);
CpuCas01Action *action = new CpuCas01Action(getModel(), size, isOff(),
- p_speed.scale * p_speed.peak, getConstraint());
+ speed_.scale * speed_.peak, getConstraint());
XBT_OUT();
return action;
XBT_IN("(%s,%g)", getName(), duration);
CpuCas01Action *action = new CpuCas01Action(getModel(), 1.0, isOff(),
- p_speed.scale * p_speed.peak, getConstraint());
-
+ speed_.scale * speed_.peak, getConstraint());
// FIXME: sleep variables should not consume 1.0 in lmm_expand
action->m_maxDuration = duration;