surf_cpu_model_pm = new CpuCas01Model();
surf_cpu_model_vm = new CpuCas01Model();
- sg_platf_host_add_cb(cpu_parse_init);
sg_platf_postparse_add_cb(cpu_add_traces);
Model *model_pm = surf_cpu_model_pm;
Model *model_vm = surf_cpu_model_vm;
- xbt_dynar_push(model_list, &model_pm);
- xbt_dynar_push(model_list, &model_vm);
+ xbt_dynar_push(all_existing_models, &model_pm);
+ xbt_dynar_push(all_existing_models, &model_vm);
}
CpuCas01Model::CpuCas01Model() : CpuModel()
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_set(host, cpu);
-
+ sg_host_surfcpu_register(host, cpu);
return cpu;
}
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) {
+ core, xbt_dynar_get_as(powerPeak, pstate, double), powerScale,
+ stateInitial) {
p_powerEvent = NULL;
- p_powerPeakList = powerPeak;
+
+ // Copy the power peak array:
+ p_powerPeakList = xbt_dynar_new(sizeof(double), nullptr);
+ unsigned long n = xbt_dynar_length(powerPeak);
+ for (unsigned long i = 0; i != n; ++i) {
+ double value = xbt_dynar_get_as(powerPeak, i, double);
+ xbt_dynar_push(p_powerPeakList, &value);
+ }
+
m_pstate = pstate;
XBT_DEBUG("CPU create: peak=%f, pstate=%d", m_powerPeak, m_pstate);
m_core = core;
- setState(stateInitial);
if (powerTrace)
p_powerEvent = tmgr_history_add_trace(history, powerTrace, 0.0, 0, this);