#include "cpu_cas01.hpp"
#include "cpu_ti.hpp"
-#include "plugins/energy.hpp"
#include "maxmin_private.hpp"
#include "simgrid/sg_config.h"
static void cpu_define_callbacks()
{
- sg_platf_host_add_cb(parse_cpu_init);
- sg_platf_postparse_add_cb(add_traces_cpu);
+ sg_platf_host_add_cb(cpu_parse_init);
+ sg_platf_postparse_add_cb(cpu_add_traces);
}
/*********
surf_cpu_model_vm = new CpuCas01Model();
cpu_define_callbacks();
- ModelPtr model_pm = static_cast<ModelPtr>(surf_cpu_model_pm);
- ModelPtr model_vm = static_cast<ModelPtr>(surf_cpu_model_vm);
+ ModelPtr model_pm = surf_cpu_model_pm;
+ ModelPtr model_vm = surf_cpu_model_vm;
xbt_dynar_push(model_list, &model_pm);
xbt_dynar_push(model_list, &model_vm);
}
delete p_cpuRunningActionSetThatDoesNotNeedBeingChecked;
}
-void CpuCas01Model::parseInit(sg_platf_host_cbarg_t host)
-{
- createResource(host->id,
- host->power_peak,
- host->pstate,
- host->power_scale,
- host->power_trace,
- host->core_amount,
- host->initial_state,
- host->state_trace,
- host->properties);
-}
-
-CpuPtr CpuCas01Model::createResource(const char *name, xbt_dynar_t power_peak,
+CpuPtr CpuCas01Model::createCpu(const char *name, xbt_dynar_t power_peak,
int pstate, double power_scale,
tmgr_trace_t power_trace, int core,
e_surf_resource_state_t state_initial,
"Host '%s' declared several times in the platform file",
name);
xbt_assert(xbt_dynar_getfirst_as(power_peak, double) > 0.0,
- "Power has to be >0.0");
- xbt_assert(core > 0, "Invalid number of cores %d", core);
+ "Power 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);
- xbt_lib_set(host_lib, name, SURF_CPU_LEVEL, static_cast<ResourcePtr>(cpu));
+ xbt_lib_set(host_lib, name, SURF_CPU_LEVEL, cpu);
return cpu;
}
xbt_assert(host, "Host %s undefined", elm);
xbt_assert(trace, "Trace %s undefined", trace_name);
- host->setStateEvent(tmgr_history_add_trace(history, trace, 0.0, 0, static_cast<ResourcePtr>(host)));
+ host->setStateEvent(tmgr_history_add_trace(history, trace, 0.0, 0, host));
}
xbt_dict_foreach(trace_connect_list_power, cursor, trace_name, elm) {
xbt_assert(host, "Host %s undefined", elm);
xbt_assert(trace, "Trace %s undefined", trace_name);
- host->setPowerEvent(tmgr_history_add_trace(history, trace, 0.0, 0, static_cast<ResourcePtr>(host)));
+ host->setPowerEvent(tmgr_history_add_trace(history, trace, 0.0, 0, host));
}
}
m_core = core;
setState(stateInitial);
if (powerTrace)
- p_powerEvent = tmgr_history_add_trace(history, powerTrace, 0.0, 0, static_cast<ResourcePtr>(this));
+ p_powerEvent = tmgr_history_add_trace(history, powerTrace, 0.0, 0, this);
if (stateTrace)
- p_stateEvent = tmgr_history_add_trace(history, stateTrace, 0.0, 0, static_cast<ResourcePtr>(this));
+ p_stateEvent = tmgr_history_add_trace(history, stateTrace, 0.0, 0, this);
}
CpuCas01::~CpuCas01(){
lmm_update_constraint_bound(getModel()->getMaxminSystem(), getConstraint(),
m_core * m_powerScale *
m_powerPeak);
-#ifdef HAVE_TRACING
TRACE_surf_host_set_power(date, getName(),
m_core * m_powerScale *
m_powerPeak);
-#endif
while ((var = lmm_get_var_from_cnst
(getModel()->getMaxminSystem(), getConstraint(), &elem))) {
- CpuCas01ActionPtr action = static_cast<CpuCas01ActionPtr>(static_cast<ActionPtr>(lmm_variable_id(var)));
+ CpuCas01ActionPtr action = static_cast<CpuCas01ActionPtr>(lmm_variable_id(var));
lmm_update_variable_bound(getModel()->getMaxminSystem(),
action->getVariable(),
return xbt_dynar_length(p_powerPeakList);
}
-void CpuCas01::setPowerPeakAt(int pstate_index)
+void CpuCas01::setPstate(int pstate_index)
{
xbt_dynar_t plist = p_powerPeakList;
xbt_assert((pstate_index <= (int)xbt_dynar_length(plist)), "Invalid parameters (pstate index out of bounds)");
- double new_power_peak = xbt_dynar_get_as(plist, pstate_index, double);
+ double new_pstate = xbt_dynar_get_as(plist, pstate_index, double);
m_pstate = pstate_index;
- m_powerPeak = new_power_peak;
+ m_powerPeak = new_pstate;
+}
+
+int CpuCas01::getPstate()
+{
+ return m_pstate;
}
/**********
CpuCas01Action::CpuCas01Action(ModelPtr model, double cost, bool failed, double power, lmm_constraint_t constraint)
: CpuAction(model, cost, failed,
- lmm_variable_new(model->getMaxminSystem(), static_cast<ActionPtr>(this),
+ lmm_variable_new(model->getMaxminSystem(), this,
1.0, power, 1))
{
m_suspended = 0;