-/* Copyright (c) 2009-2011. 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
#include "cpu_cas01.hpp"
#include "cpu_ti.hpp"
-#include "surf.hpp"
-#include "maxmin_private.h"
+#include "maxmin_private.hpp"
#include "simgrid/sg_config.h"
-extern "C" {
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_cas, surf,
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_cas, surf_cpu,
"Logging specific to the SURF CPU IMPROVED module");
-}
-
-static xbt_swag_t
- cpu_running_action_set_that_does_not_need_being_checked = NULL;
-
-/*************
- * CallBacks *
- *************/
-
-static void parse_cpu_init(sg_platf_host_cbarg_t host){
- ((CpuCas01ModelPtr)surf_cpu_model)->parseInit(host);
-}
-
-static void cpu_add_traces_cpu(){
- surf_cpu_model->addTraces();
-}
-
-static void cpu_define_callbacks()
-{
- sg_platf_host_add_cb(parse_cpu_init);
- sg_platf_postparse_add_cb(cpu_add_traces_cpu);
-}
/*********
* Model *
{
char *optim = xbt_cfg_get_string(_sg_cfg_set, "cpu/optim");
- if (surf_cpu_model)
- return;
+ xbt_assert(!surf_cpu_model_pm);
+ xbt_assert(!surf_cpu_model_vm);
if (!strcmp(optim, "TI")) {
- surf_cpu_model = new CpuTiModel();
+ surf_cpu_model_init_ti();
return;
}
- surf_cpu_model = new CpuCas01Model();
- cpu_define_callbacks();
- ModelPtr model = static_cast<ModelPtr>(surf_cpu_model);
- xbt_dynar_push(model_list, &model);
+ 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);
+
+ 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);
}
CpuCas01Model::CpuCas01Model() : CpuModel("cpu")
{
- ActionPtr action;
- ActionLmmPtr actionlmm;
-
char *optim = xbt_cfg_get_string(_sg_cfg_set, "cpu/optim");
int select = xbt_cfg_get_boolean(_sg_cfg_set, "cpu/maxmin_selective_update");
xbt_die("Unsupported optimization (%s) for this model", optim);
}
- cpu_running_action_set_that_does_not_need_being_checked =
- xbt_swag_new(xbt_swag_offset(*action, p_stateHookup));
+ p_cpuRunningActionSetThatDoesNotNeedBeingChecked = new ActionList();
- if (p_updateMechanism == UM_LAZY) {
+ if (getUpdateMechanism() == UM_LAZY) {
shareResources = &CpuCas01Model::shareResourcesLazy;
updateActionsState = &CpuCas01Model::updateActionsStateLazy;
- } else if (p_updateMechanism == UM_FULL) {
+ } else if (getUpdateMechanism() == UM_FULL) {
shareResources = &CpuCas01Model::shareResourcesFull;
updateActionsState = &CpuCas01Model::updateActionsStateFull;
} else
p_maxminSystem = lmm_system_new(m_selectiveUpdate);
}
- if (p_updateMechanism == UM_LAZY) {
+ 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_modifiedSet = xbt_swag_new(xbt_swag_offset(*actionlmm, p_actionListHookup));
+ p_modifiedSet = new ActionLmmList();
p_maxminSystem->keep_track = p_modifiedSet;
}
}
if (p_actionHeap)
xbt_heap_free(p_actionHeap);
- xbt_swag_free(p_modifiedSet);
+ delete p_modifiedSet;
- surf_cpu_model = NULL;
+ surf_cpu_model_pm = NULL;
- xbt_swag_free(cpu_running_action_set_that_does_not_need_being_checked);
- cpu_running_action_set_that_does_not_need_being_checked = NULL;
+ delete p_cpuRunningActionSetThatDoesNotNeedBeingChecked;
}
-void CpuCas01Model::parseInit(sg_platf_host_cbarg_t host)
-{
- createResource(host->id,
- host->power_peak,
- host->power_scale,
- host->power_trace,
- host->core_amount,
- host->initial_state,
- host->state_trace,
- host->properties);
-}
-CpuCas01LmmPtr CpuCas01Model::createResource(const char *name, double power_peak, double power_scale,
+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,
tmgr_trace_t state_trace,
xbt_dict_t cpu_properties)
{
CpuPtr cpu = NULL;
- xbt_assert(!surf_cpu_resource_priv(surf_cpu_resource_by_name(name)),
+ sg_host_t host = sg_host_by_name(name);
+ xbt_assert(!sg_host_surfcpu(host),
"Host '%s' declared several times in the platform file",
name);
- xbt_assert(power_peak > 0, "Power has to be >0");
- xbt_assert(core > 0, "Invalid number of cores %d", core);
+ 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(core > 0, "Invalid number of cores %d. Must be larger than 0", core);
- cpu = new CpuCas01Lmm(this, name, power_peak, power_scale, power_trace, core, state_initial, state_trace, cpu_properties);
- xbt_lib_set(host_lib, name, SURF_CPU_LEVEL, static_cast<ResourcePtr>(cpu));
+ 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);
- return (CpuCas01LmmPtr) xbt_lib_get_elm_or_null(host_lib, name);
+ return cpu;
}
-double CpuCas01Model::shareResourcesFull(double now)
+double CpuCas01Model::shareResourcesFull(double /*now*/)
{
- CpuCas01ActionLmm action;
- Model::shareResourcesMaxMin(p_runningActionSet,
- xbt_swag_offset(action, p_variable),
+ return Model::shareResourcesMaxMin(getRunningActionSet(),
p_maxminSystem, lmm_solve);
- return 0;
}
void CpuCas01Model::addTraces()
/* connect all traces relative to hosts */
xbt_dict_foreach(trace_connect_list_host_avail, cursor, trace_name, elm) {
tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name);
- CpuCas01LmmPtr host = (CpuCas01LmmPtr) surf_cpu_resource_priv(surf_cpu_resource_by_name(elm));
+ CpuCas01Ptr host = static_cast<CpuCas01Ptr>(sg_host_surfcpu(sg_host_by_name(elm)));
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, (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) {
tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name);
- CpuCas01LmmPtr host = (CpuCas01LmmPtr) surf_cpu_resource_priv(surf_cpu_resource_by_name(elm));
+ CpuCas01Ptr host = static_cast<CpuCas01Ptr>(sg_host_surfcpu(sg_host_by_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, (ResourcePtr) host);
+ host->setPowerEvent(tmgr_history_add_trace(history, trace, 0.0, 0, host));
}
}
/************
* Resource *
************/
-CpuCas01Lmm::CpuCas01Lmm(CpuCas01ModelPtr model, const char *name, double powerPeak,
- double powerScale, tmgr_trace_t powerTrace, int core,
- e_surf_resource_state_t stateInitial, tmgr_trace_t stateTrace,
- xbt_dict_t properties) :
- CpuLmm(model, name, properties), Resource(model, name, properties) {
- m_powerPeak = powerPeak;
- m_powerScale = powerScale;
+CpuCas01::CpuCas01(CpuCas01ModelPtr 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) {
+ p_powerEvent = NULL;
+ p_powerPeakList = powerPeak;
+ m_pstate = pstate;
+
+ XBT_DEBUG("CPU create: peak=%f, pstate=%d", m_powerPeak, m_pstate);
+
m_core = core;
- p_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(){
+ if (getModel() == surf_cpu_model_pm)
+ xbt_dynar_free(&p_powerPeakList);
+}
+
+void CpuCas01::setStateEvent(tmgr_trace_event_t stateEvent)
+{
+ p_stateEvent = stateEvent;
+}
- p_constraint = lmm_constraint_new(p_model->p_maxminSystem, this, m_core * m_powerScale * m_powerPeak);
+void CpuCas01::setPowerEvent(tmgr_trace_event_t powerEvent)
+{
+ p_powerEvent = powerEvent;
}
-bool CpuCas01Lmm::isUsed()
+xbt_dynar_t CpuCas01::getPowerPeakList(){
+ return p_powerPeakList;
+}
+
+int CpuCas01::getPState()
{
- return lmm_constraint_used(p_model->p_maxminSystem, p_constraint);
+ return m_pstate;
}
-void CpuCas01Lmm::updateState(tmgr_trace_event_t event_type, double value, double date)
+bool CpuCas01::isUsed()
+{
+ return lmm_constraint_used(getModel()->getMaxminSystem(), getConstraint());
+}
+
+void CpuCas01::updateState(tmgr_trace_event_t event_type, double value, double date)
{
lmm_variable_t var = NULL;
lmm_element_t elem = NULL;
- surf_watched_hosts();
-
if (event_type == p_powerEvent) {
+ /* 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]");
+
m_powerScale = value;
- lmm_update_constraint_bound(surf_cpu_model->p_maxminSystem, p_constraint,
+ lmm_update_constraint_bound(getModel()->getMaxminSystem(), getConstraint(),
m_core * m_powerScale *
m_powerPeak);
-#ifdef HAVE_TRACING
- TRACE_surf_host_set_power(date, m_name,
+ TRACE_surf_host_set_power(date, getName(),
m_core * m_powerScale *
m_powerPeak);
-#endif
while ((var = lmm_get_var_from_cnst
- (surf_cpu_model->p_maxminSystem, p_constraint, &elem))) {
- CpuCas01ActionLmmPtr action = static_cast<CpuCas01ActionLmmPtr>(static_cast<ActionLmmPtr>(lmm_variable_id(var)));
+ (getModel()->getMaxminSystem(), getConstraint(), &elem))) {
+ CpuCas01ActionPtr action = static_cast<CpuCas01ActionPtr>(lmm_variable_id(var));
- lmm_update_variable_bound(surf_cpu_model->p_maxminSystem,
- action->p_variable,
+ lmm_update_variable_bound(getModel()->getMaxminSystem(),
+ action->getVariable(),
m_powerScale * m_powerPeak);
}
if (tmgr_trace_event_free(event_type))
p_powerEvent = NULL;
} else if (event_type == p_stateEvent) {
- if (value > 0)
- p_stateCurrent = SURF_RESOURCE_ON;
- else {
- lmm_constraint_t cnst = p_constraint;
+ /* 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]");
+
+ if (value > 0) {
+ if(getState() == SURF_RESOURCE_OFF)
+ xbt_dynar_push_as(host_that_restart, char*, (char *)getName());
+ setState(SURF_RESOURCE_ON);
+ } else {
+ lmm_constraint_t cnst = getConstraint();
- p_stateCurrent = SURF_RESOURCE_OFF;
+ setState(SURF_RESOURCE_OFF);
- while ((var = lmm_get_var_from_cnst(surf_cpu_model->p_maxminSystem, cnst, &elem))) {
- ActionLmmPtr action = static_cast<ActionLmmPtr>(lmm_variable_id(var));
+ 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 ||
action->getState() == SURF_ACTION_READY ||
action->getState() == SURF_ACTION_NOT_IN_THE_SYSTEM) {
- action->m_finish = date;
+ action->setFinishTime(date);
action->setState(SURF_ACTION_FAILED);
}
}
return;
}
-ActionPtr CpuCas01Lmm::execute(double size)
+CpuActionPtr CpuCas01::execute(double size)
{
- XBT_IN("(%s,%g)", m_name, size);
- CpuCas01ActionLmmPtr action = new CpuCas01ActionLmm(surf_cpu_model, size, p_stateCurrent != SURF_RESOURCE_ON);
+ XBT_IN("(%s,%g)", getName(), size);
+ CpuCas01ActionPtr action = new CpuCas01Action(getModel(), size, getState() != SURF_RESOURCE_ON,
+ m_powerScale * m_powerPeak, getConstraint());
- action->m_suspended = 0; /* Should be useless because of the
- calloc but it seems to help valgrind... */
-
- action->p_variable =
- lmm_variable_new(surf_cpu_model->p_maxminSystem, static_cast<ActionLmmPtr>(action),
- action->m_priority,
- m_powerScale * m_powerPeak, 1);
- if (surf_cpu_model->p_updateMechanism == UM_LAZY) {
- action->m_indexHeap = -1;
- action->m_lastUpdate = surf_get_clock();
- action->m_lastValue = 0.0;
- }
- lmm_expand(surf_cpu_model->p_maxminSystem, p_constraint,
- action->p_variable, 1.0);
XBT_OUT();
return action;
}
-ActionPtr CpuCas01Lmm::sleep(double duration)
+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(getModel(), 1.0, getState() != SURF_RESOURCE_ON,
+ m_powerScale * m_powerPeak, getConstraint());
- XBT_IN("(%s,%g)", m_name, duration);
- CpuCas01ActionLmmPtr action = dynamic_cast<CpuCas01ActionLmmPtr>(execute(1.0));
// FIXME: sleep variables should not consume 1.0 in lmm_expand
action->m_maxDuration = duration;
if (duration == NO_MAX_DURATION) {
/* Move to the *end* of the corresponding action set. This convention
is used to speed up update_resource_state */
- xbt_swag_remove(static_cast<ActionPtr>(action), action->p_stateSet);
- action->p_stateSet = cpu_running_action_set_that_does_not_need_being_checked;
- xbt_swag_insert(static_cast<ActionPtr>(action), action->p_stateSet);
+ action->getStateSet()->erase(action->getStateSet()->iterator_to(*action));
+ action->p_stateSet = static_cast<CpuCas01ModelPtr>(getModel())->p_cpuRunningActionSetThatDoesNotNeedBeingChecked;
+ action->getStateSet()->push_back(*action);
}
- lmm_update_variable_weight(surf_cpu_model->p_maxminSystem,
- action->p_variable, 0.0);
- if (surf_cpu_model->p_updateMechanism == UM_LAZY) { // remove action from the heap
- action->heapRemove(surf_cpu_model->p_actionHeap);
+ lmm_update_variable_weight(getModel()->getMaxminSystem(),
+ action->getVariable(), 0.0);
+ if (getModel()->getUpdateMechanism() == UM_LAZY) { // remove action from the heap
+ action->heapRemove(getModel()->getActionHeap());
// 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
- xbt_swag_insert_at_head(static_cast<ActionLmmPtr>(action), surf_cpu_model->p_modifiedSet);
+ getModel()->getModifiedSet()->push_front(*action);
}
XBT_OUT();
return action;
}
+double CpuCas01::getCurrentPowerPeak()
+{
+ return m_powerPeak;
+}
+
+double CpuCas01::getPowerPeakAt(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)");
+
+ return xbt_dynar_get_as(plist, pstate_index, double);
+}
+
+int CpuCas01::getNbPstates()
+{
+ return xbt_dynar_length(p_powerPeakList);
+}
+
+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_pstate = xbt_dynar_get_as(plist, pstate_index, double);
+ m_pstate = pstate_index;
+ m_powerPeak = new_pstate;
+}
+
+int CpuCas01::getPstate()
+{
+ return m_pstate;
+}
/**********
* Action *
**********/
-
+CpuCas01Action::CpuCas01Action(ModelPtr model, double cost, bool failed, double power, lmm_constraint_t constraint)
+ : CpuAction(model, cost, failed,
+ lmm_variable_new(model->getMaxminSystem(), this,
+ 1.0, power, 1))
+{
+ m_suspended = 0;
+ if (model->getUpdateMechanism() == UM_LAZY) {
+ m_indexHeap = -1;
+ m_lastUpdate = surf_get_clock();
+ m_lastValue = 0.0;
+ }
+ lmm_expand(model->getMaxminSystem(), constraint, getVariable(), 1.0);
+}
