return;
}
- surf_cpu_model_pm = new CpuCas01Model();
- surf_cpu_model_vm = new CpuCas01Model();
+ surf_cpu_model_pm = new simgrid::surf::CpuCas01Model();
+ surf_cpu_model_vm = new simgrid::surf::CpuCas01Model();
- sg_platf_postparse_add_cb(cpu_add_traces);
+ sg_platf_postparse_add_cb(simgrid::surf::cpu_add_traces);
- Model *model_pm = surf_cpu_model_pm;
- Model *model_vm = surf_cpu_model_vm;
+ simgrid::surf::Model *model_pm = surf_cpu_model_pm;
+ simgrid::surf::Model *model_vm = surf_cpu_model_vm;
xbt_dynar_push(all_existing_models, &model_pm);
xbt_dynar_push(all_existing_models, &model_vm);
}
-CpuCas01Model::CpuCas01Model() : CpuModel()
+namespace simgrid {
+namespace surf {
+
+CpuCas01Model::CpuCas01Model() : simgrid::surf::CpuModel()
{
char *optim = xbt_cfg_get_string(_sg_cfg_set, "cpu/optim");
int select = xbt_cfg_get_boolean(_sg_cfg_set, "cpu/maxmin_selective_update");
delete p_cpuRunningActionSetThatDoesNotNeedBeingChecked;
}
-Cpu *CpuCas01Model::createCpu(const char *name, xbt_dynar_t power_peak,
- int pstate, double power_scale,
- tmgr_trace_t power_trace, int core,
+Cpu *CpuCas01Model::createCpu(const char *name, xbt_dynar_t speedPeak,
+ int pstate, double speedScale,
+ tmgr_trace_t speedTrace, int core,
e_surf_resource_state_t state_initial,
- tmgr_trace_t state_trace,
- xbt_dict_t cpu_properties)
+ tmgr_trace_t state_trace)
{
- Cpu *cpu = NULL;
- sg_host_t host = sg_host_by_name(name);
- xbt_assert(xbt_dynar_getfirst_as(power_peak, double) > 0.0,
- "Power has to be >0.0. Did you forget to specify the mandatory power attribute?");
+ 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 = new CpuCas01(this, name, power_peak, pstate, power_scale, power_trace, core, state_initial, state_trace, cpu_properties);
- sg_host_surfcpu_register(host, cpu);
+ Cpu *cpu = new CpuCas01(this, name, speedPeak, pstate, speedScale, speedTrace, core, state_initial, state_trace);
return cpu;
}
/************
* Resource *
************/
-CpuCas01::CpuCas01(CpuCas01Model *model, const char *name, xbt_dynar_t powerPeak,
- int pstate, double powerScale, tmgr_trace_t powerTrace, int core,
- e_surf_resource_state_t stateInitial, tmgr_trace_t stateTrace,
- xbt_dict_t properties)
-: Cpu(model, name, properties,
- lmm_constraint_new(model->getMaxminSystem(), this, core * powerScale * xbt_dynar_get_as(powerPeak, pstate, double)),
- core, xbt_dynar_get_as(powerPeak, pstate, double), powerScale,
+CpuCas01::CpuCas01(CpuCas01Model *model, const char *name, xbt_dynar_t speedPeak,
+ int pstate, double speedScale, tmgr_trace_t speedTrace, int core,
+ e_surf_resource_state_t stateInitial, tmgr_trace_t stateTrace)
+: Cpu(model, name,
+ lmm_constraint_new(model->getMaxminSystem(), this, core * speedScale * xbt_dynar_get_as(speedPeak, pstate, double)),
+ core, xbt_dynar_get_as(speedPeak, pstate, double), speedScale,
stateInitial) {
- p_powerEvent = NULL;
+ p_speedEvent = NULL;
// Copy the power peak array:
- p_powerPeakList = xbt_dynar_new(sizeof(double), nullptr);
- unsigned long n = xbt_dynar_length(powerPeak);
+ p_speedPeakList = xbt_dynar_new(sizeof(double), nullptr);
+ unsigned long n = xbt_dynar_length(speedPeak);
for (unsigned long i = 0; i != n; ++i) {
- double value = xbt_dynar_get_as(powerPeak, i, double);
- xbt_dynar_push(p_powerPeakList, &value);
+ double value = xbt_dynar_get_as(speedPeak, i, double);
+ xbt_dynar_push(p_speedPeakList, &value);
}
m_pstate = pstate;
XBT_DEBUG("CPU create: peak=%f, pstate=%d", m_speedPeak, m_pstate);
m_core = core;
- if (powerTrace)
- p_powerEvent = tmgr_history_add_trace(history, powerTrace, 0.0, 0, this);
+ if (speedTrace)
+ p_speedEvent = tmgr_history_add_trace(history, speedTrace, 0.0, 0, this);
if (stateTrace)
p_stateEvent = tmgr_history_add_trace(history, stateTrace, 0.0, 0, this);
}
-CpuCas01::~CpuCas01(){
+CpuCas01::~CpuCas01()
+{
if (getModel() == surf_cpu_model_pm)
- xbt_dynar_free(&p_powerPeakList);
+ xbt_dynar_free(&p_speedPeakList);
}
void CpuCas01::setStateEvent(tmgr_trace_event_t stateEvent)
void CpuCas01::setPowerEvent(tmgr_trace_event_t powerEvent)
{
- p_powerEvent = powerEvent;
+ p_speedEvent = powerEvent;
}
-xbt_dynar_t CpuCas01::getPowerPeakList(){
- return p_powerPeakList;
+xbt_dynar_t CpuCas01::getSpeedPeakList(){
+ return p_speedPeakList;
}
int CpuCas01::getPState()
lmm_variable_t var = NULL;
lmm_element_t elem = NULL;
- if (event_type == p_powerEvent) {
+ if (event_type == p_speedEvent) {
/* TODO (Hypervisor): do the same thing for constraint_core[i] */
- xbt_assert(m_core == 1, "FIXME: add power scaling code also for constraint_core[i]");
+ xbt_assert(m_core == 1, "FIXME: add speed scaling code also for constraint_core[i]");
m_speedScale = value;
lmm_update_constraint_bound(getModel()->getMaxminSystem(), getConstraint(),
m_core * m_speedScale *
m_speedPeak);
- TRACE_surf_host_set_power(date, getName(),
+ TRACE_surf_host_set_speed(date, getName(),
m_core * m_speedScale *
m_speedPeak);
while ((var = lmm_get_var_from_cnst
m_speedScale * m_speedPeak);
}
if (tmgr_trace_event_free(event_type))
- p_powerEvent = NULL;
+ p_speedEvent = NULL;
} else if (event_type == p_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]");
double CpuCas01::getPowerPeakAt(int pstate_index)
{
- xbt_dynar_t plist = p_powerPeakList;
+ xbt_dynar_t plist = p_speedPeakList;
xbt_assert((pstate_index <= (int)xbt_dynar_length(plist)), "Invalid parameters (pstate index out of bounds)");
return xbt_dynar_get_as(plist, pstate_index, double);
int CpuCas01::getNbPstates()
{
- return xbt_dynar_length(p_powerPeakList);
+ return xbt_dynar_length(p_speedPeakList);
}
void CpuCas01::setPstate(int pstate_index)
{
- xbt_dynar_t plist = p_powerPeakList;
+ xbt_dynar_t plist = p_speedPeakList;
xbt_assert((pstate_index <= (int)xbt_dynar_length(plist)), "Invalid parameters (pstate index out of bounds)");
double new_pstate = xbt_dynar_get_as(plist, pstate_index, double);
* Action *
**********/
-CpuCas01Action::CpuCas01Action(Model *model, double cost, bool failed, double power, lmm_constraint_t constraint)
+CpuCas01Action::CpuCas01Action(Model *model, double cost, bool failed, double speed, lmm_constraint_t constraint)
: CpuAction(model, cost, failed,
lmm_variable_new(model->getMaxminSystem(), this,
- 1.0, power, 1))
+ 1.0, speed, 1))
{
m_suspended = 0;
if (model->getUpdateMechanism() == UM_LAZY) {
}
lmm_expand(model->getMaxminSystem(), constraint, getVariable(), 1.0);
}
+
+}
+}