-/* Copyright (c) 2009-2011, 2013. The SimGrid Team.
+/* Copyright (c) 2009-2011, 2013-2014. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* CallBacks *
*************/
-static void parse_cpu_init(sg_platf_host_cbarg_t host){
- ((CpuCas01ModelPtr)surf_cpu_model_pm)->parseInit(host);
-}
-
-static void cpu_add_traces_cpu(){
- surf_cpu_model_pm->addTraces();
-}
-
static void cpu_define_callbacks()
{
- sg_platf_host_add_cb(parse_cpu_init);
- sg_platf_postparse_add_cb(cpu_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);
}
}
if (getUpdateMechanism() == UM_LAZY) {
- p_actionHeap = xbt_heap_new(8, NULL);
- xbt_heap_set_update_callback(p_actionHeap, surf_action_lmm_update_index_heap);
+ p_actionHeap = new ActionHeap();
p_modifiedSet = new ActionLmmList();
p_maxminSystem->keep_track = p_modifiedSet;
}
p_maxminSystem = NULL;
if (p_actionHeap)
- xbt_heap_free(p_actionHeap);
+ delete p_actionHeap;
delete p_modifiedSet;
surf_cpu_model_pm = NULL;
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,
xbt_assert(core > 0, "Invalid number of cores %d", 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->p_stateEvent = 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->p_powerEvent =
- 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));
}
}
XBT_DEBUG("CPU create: peak=%f, pstate=%d", m_powerPeak, m_pstate);
m_core = core;
- m_stateCurrent = stateInitial;
+ 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(){
- xbt_dynar_free(&p_powerPeakList);
+ if (getModel() == surf_cpu_model_pm)
+ xbt_dynar_free(&p_powerPeakList);
+}
+
+void CpuCas01::setStateEvent(tmgr_trace_event_t stateEvent)
+{
+ p_stateEvent = stateEvent;
+}
+
+void CpuCas01::setPowerEvent(tmgr_trace_event_t powerEvent)
+{
+ p_powerEvent = powerEvent;
+}
+
+xbt_dynar_t CpuCas01::getPowerPeakList(){
+ return p_powerPeakList;
+}
+
+int CpuCas01::getPState()
+{
+ return m_pstate;
}
bool CpuCas01::isUsed()
xbt_assert(m_core == 1, "FIXME: add power scaling code also for constraint_core[i]");
m_powerScale = value;
- lmm_update_constraint_bound(surf_cpu_model_pm->getMaxminSystem(), getConstraint(),
+ lmm_update_constraint_bound(getModel()->getMaxminSystem(), getConstraint(),
m_core * m_powerScale *
m_powerPeak);
#ifdef HAVE_TRACING
m_powerPeak);
#endif
while ((var = lmm_get_var_from_cnst
- (surf_cpu_model_pm->getMaxminSystem(), getConstraint(), &elem))) {
- CpuCas01ActionPtr action = static_cast<CpuCas01ActionPtr>(static_cast<ActionPtr>(lmm_variable_id(var)));
+ (getModel()->getMaxminSystem(), getConstraint(), &elem))) {
+ CpuCas01ActionPtr action = static_cast<CpuCas01ActionPtr>(lmm_variable_id(var));
- lmm_update_variable_bound(surf_cpu_model_pm->getMaxminSystem(),
+ lmm_update_variable_bound(getModel()->getMaxminSystem(),
action->getVariable(),
m_powerScale * m_powerPeak);
}
xbt_assert(m_core == 1, "FIXME: add state change code also for constraint_core[i]");
if (value > 0) {
- if(m_stateCurrent == SURF_RESOURCE_OFF)
+ if(getState() == SURF_RESOURCE_OFF)
xbt_dynar_push_as(host_that_restart, char*, (char *)getName());
- m_stateCurrent = SURF_RESOURCE_ON;
+ setState(SURF_RESOURCE_ON);
} else {
lmm_constraint_t cnst = getConstraint();
- m_stateCurrent = SURF_RESOURCE_OFF;
+ setState(SURF_RESOURCE_OFF);
- while ((var = lmm_get_var_from_cnst(surf_cpu_model_pm->getMaxminSystem(), cnst, &elem))) {
+ while ((var = lmm_get_var_from_cnst(getModel()->getMaxminSystem(), cnst, &elem))) {
ActionPtr action = static_cast<ActionPtr>(lmm_variable_id(var));
if (action->getState() == SURF_ACTION_RUNNING ||
{
XBT_IN("(%s,%g)", getName(), size);
- CpuCas01ActionPtr action = new CpuCas01Action(surf_cpu_model_pm, size, m_stateCurrent != SURF_RESOURCE_ON,
+ CpuCas01ActionPtr action = new CpuCas01Action(getModel(), size, getState() != SURF_RESOURCE_ON,
m_powerScale * m_powerPeak, getConstraint());
XBT_OUT();
CpuActionPtr CpuCas01::sleep(double duration)
{
if (duration > 0)
- duration = MAX(duration, MAXMIN_PRECISION);
+ duration = MAX(duration, sg_surf_precision);
XBT_IN("(%s,%g)", getName(), duration);
- CpuCas01ActionPtr action = new CpuCas01Action(surf_cpu_model_pm, 1.0, m_stateCurrent != SURF_RESOURCE_ON,
+ CpuCas01ActionPtr action = new CpuCas01Action(getModel(), 1.0, getState() != SURF_RESOURCE_ON,
m_powerScale * m_powerPeak, getConstraint());
action->getStateSet()->push_back(*action);
}
- lmm_update_variable_weight(surf_cpu_model_pm->getMaxminSystem(),
+ lmm_update_variable_weight(getModel()->getMaxminSystem(),
action->getVariable(), 0.0);
- if (surf_cpu_model_pm->getUpdateMechanism() == UM_LAZY) { // remove action from the heap
- action->heapRemove(surf_cpu_model_pm->getActionHeap());
+ if (getModel()->getUpdateMechanism() == UM_LAZY) { // remove action from the heap
+ action->heapRemove();
// this is necessary for a variable with weight 0 since such
// variables are ignored in lmm and we need to set its max_duration
// correctly at the next call to share_resources
- surf_cpu_model_pm->getModifiedSet()->push_front(*action);
+ getModel()->getModifiedSet()->push_front(*action);
}
XBT_OUT();
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; /* Should be useless because of the
- calloc but it seems to help valgrind... */
-
+ m_suspended = 0;
if (model->getUpdateMechanism() == UM_LAZY) {
- m_indexHeap = -1;
m_lastUpdate = surf_get_clock();
m_lastValue = 0.0;
}
