X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/242fde5e8077f8193db4df5f262a9672085c8d8a..03d87ef83eada5a3cf9aacce9e6a5dc0d169aaa3:/src/surf/cpu_cas01.cpp diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp index d7a4faf622..04d4f3ea74 100644 --- a/src/surf/cpu_cas01.cpp +++ b/src/surf/cpu_cas01.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2009-2011, 2013-2014. The SimGrid Team. +/* Copyright (c) 2009-2011, 2013-2016. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -8,6 +8,7 @@ #include "cpu_ti.hpp" #include "maxmin_private.hpp" #include "simgrid/sg_config.h" +#include "src/surf/platform.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_cas, surf_cpu, "Logging specific to the SURF CPU IMPROVED module"); @@ -17,29 +18,26 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_cas, surf_cpu, *********/ void surf_cpu_model_init_Cas01() { - char *optim = xbt_cfg_get_string(_sg_cfg_set, "cpu/optim"); - xbt_assert(!surf_cpu_model_pm); xbt_assert(!surf_cpu_model_vm); + char *optim = xbt_cfg_get_string(_sg_cfg_set, "cpu/optim"); if (!strcmp(optim, "TI")) { surf_cpu_model_init_ti(); return; } - 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); + surf_cpu_model_pm = new simgrid::surf::CpuCas01Model(); + xbt_dynar_push(all_existing_models, &surf_cpu_model_pm); - 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); + surf_cpu_model_vm = new simgrid::surf::CpuCas01Model(); + xbt_dynar_push(all_existing_models, &surf_cpu_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"); @@ -61,19 +59,7 @@ CpuCas01Model::CpuCas01Model() : CpuModel() p_cpuRunningActionSetThatDoesNotNeedBeingChecked = new ActionList(); - if (getUpdateMechanism() == UM_LAZY) { - shareResources = &CpuCas01Model::shareResourcesLazy; - updateActionsState = &CpuCas01Model::updateActionsStateLazy; - - } else if (getUpdateMechanism() == UM_FULL) { - shareResources = &CpuCas01Model::shareResourcesFull; - updateActionsState = &CpuCas01Model::updateActionsStateFull; - } else - xbt_die("Invalid cpu update mechanism!"); - - if (!p_maxminSystem) { - p_maxminSystem = lmm_system_new(m_selectiveUpdate); - } + p_maxminSystem = lmm_system_new(m_selectiveUpdate); if (getUpdateMechanism() == UM_LAZY) { p_actionHeap = xbt_heap_new(8, NULL); @@ -97,112 +83,59 @@ CpuCas01Model::~CpuCas01Model() 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, - e_surf_resource_state_t state_initial, - tmgr_trace_t state_trace, - xbt_dict_t cpu_properties) +Cpu *CpuCas01Model::createCpu(simgrid::s4u::Host *host, xbt_dynar_t speedPeak, + int pstate, double speedScale, + tmgr_trace_t speedTrace, int core, + int initiallyOn, + tmgr_trace_t state_trace) { - Cpu *cpu = NULL; - 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(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_set(host, cpu); - + Cpu *cpu = new CpuCas01(this, host, speedPeak, pstate, speedScale, speedTrace, core, initiallyOn, state_trace); return cpu; } -double CpuCas01Model::shareResourcesFull(double /*now*/) +double CpuCas01Model::next_occuring_event_full(double /*now*/) { - return Model::shareResourcesMaxMin(getRunningActionSet(), - p_maxminSystem, lmm_solve); + return Model::shareResourcesMaxMin(getRunningActionSet(), p_maxminSystem, lmm_solve); } void CpuCas01Model::addTraces() { - xbt_dict_cursor_t cursor = NULL; - char *trace_name, *elm; - static int called = 0; - if (called) - return; - called = 1; - - /* 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); - CpuCas01 *host = static_cast(sg_host_surfcpu(sg_host_by_name(elm))); - - 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, 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); - CpuCas01 *host = static_cast(sg_host_surfcpu(sg_host_by_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, host)); - } + THROW_DEADCODE; } /************ * 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) { - p_powerEvent = NULL; - p_powerPeakList = powerPeak; - m_pstate = pstate; - - XBT_DEBUG("CPU create: peak=%f, pstate=%d", m_powerPeak, m_pstate); +CpuCas01::CpuCas01(CpuCas01Model *model, simgrid::s4u::Host *host, xbt_dynar_t speedPeak, + int pstate, double speedScale, tmgr_trace_t speedTrace, int core, + int initiallyOn, tmgr_trace_t stateTrace) +: Cpu(model, host, + lmm_constraint_new(model->getMaxminSystem(), this, core * speedScale * xbt_dynar_get_as(speedPeak, pstate, double)), + speedPeak, pstate, + core, xbt_dynar_get_as(speedPeak, pstate, double), speedScale, + initiallyOn) { + + XBT_DEBUG("CPU create: peak=%f, pstate=%d", p_speed.peak, m_pstate); m_core = core; - setState(stateInitial); - if (powerTrace) - p_powerEvent = tmgr_history_add_trace(history, powerTrace, 0.0, 0, this); + if (speedTrace) + p_speed.event = future_evt_set->add_trace(speedTrace, 0.0, this); if (stateTrace) - 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); + p_stateEvent = future_evt_set->add_trace(stateTrace, 0.0, this); } -void CpuCas01::setStateEvent(tmgr_trace_event_t stateEvent) +CpuCas01::~CpuCas01() { - p_stateEvent = stateEvent; -} - -void CpuCas01::setPowerEvent(tmgr_trace_event_t powerEvent) -{ - p_powerEvent = powerEvent; -} - -xbt_dynar_t CpuCas01::getPowerPeakList(){ - return p_powerPeakList; + if (getModel() == surf_cpu_model_pm) + xbt_dynar_free(&p_speedPeakList); } -int CpuCas01::getPState() -{ - return m_pstate; +xbt_dynar_t CpuCas01::getSpeedPeakList(){ + return p_speedPeakList; } bool CpuCas01::isUsed() @@ -210,44 +143,51 @@ bool CpuCas01::isUsed() return lmm_constraint_used(getModel()->getMaxminSystem(), getConstraint()); } -void CpuCas01::updateState(tmgr_trace_event_t event_type, double value, double date) -{ +/** @brief take into account changes of speed (either load or max) */ +void CpuCas01::onSpeedChange() { lmm_variable_t var = NULL; lmm_element_t elem = NULL; - 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(getModel()->getMaxminSystem(), getConstraint(), - m_core * m_powerScale * - m_powerPeak); - TRACE_surf_host_set_power(date, getName(), - m_core * m_powerScale * - m_powerPeak); + m_core * p_speed.scale * p_speed.peak); while ((var = lmm_get_var_from_cnst (getModel()->getMaxminSystem(), getConstraint(), &elem))) { CpuCas01Action *action = static_cast(lmm_variable_id(var)); lmm_update_variable_bound(getModel()->getMaxminSystem(), action->getVariable(), - m_powerScale * m_powerPeak); + p_speed.scale * p_speed.peak); } - if (tmgr_trace_event_free(event_type)) - p_powerEvent = NULL; - } else if (event_type == p_stateEvent) { - /* TODO (Hypervisor): do the same thing for constraint_core[i] */ + + Cpu::onSpeedChange(); +} + +void CpuCas01::apply_event(tmgr_trace_iterator_t event, double value) +{ + lmm_variable_t var = NULL; + lmm_element_t elem = NULL; + + if (event == p_speed.event) { + /* TODO (Hypervisor): do the same thing for constraint_core[i] */ + xbt_assert(m_core == 1, "FIXME: add speed scaling code also for constraint_core[i]"); + + p_speed.scale = value; + onSpeedChange(); + + tmgr_trace_event_unref(&p_speed.event); + } else if (event == 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]"); if (value > 0) { - if(getState() == SURF_RESOURCE_OFF) + if(isOff()) xbt_dynar_push_as(host_that_restart, char*, (char *)getName()); - setState(SURF_RESOURCE_ON); + turnOn(); } else { lmm_constraint_t cnst = getConstraint(); + double date = surf_get_clock(); - setState(SURF_RESOURCE_OFF); + turnOff(); while ((var = lmm_get_var_from_cnst(getModel()->getMaxminSystem(), cnst, &elem))) { Action *action = static_cast(lmm_variable_id(var)); @@ -260,22 +200,20 @@ void CpuCas01::updateState(tmgr_trace_event_t event_type, double value, double d } } } - if (tmgr_trace_event_free(event_type)) - p_stateEvent = NULL; + tmgr_trace_event_unref(&p_stateEvent); } else { - XBT_CRITICAL("Unknown event ! \n"); - xbt_abort(); + xbt_die("Unknown event!\n"); } return; } -CpuAction *CpuCas01::execute(double size) +CpuAction *CpuCas01::execution_start(double size) { XBT_IN("(%s,%g)", getName(), size); - CpuCas01Action *action = new CpuCas01Action(getModel(), size, getState() != SURF_RESOURCE_ON, - m_powerScale * m_powerPeak, getConstraint()); + CpuCas01Action *action = new CpuCas01Action(getModel(), size, isOff(), + p_speed.scale * p_speed.peak, getConstraint()); XBT_OUT(); return action; @@ -287,8 +225,8 @@ CpuAction *CpuCas01::sleep(double duration) duration = MAX(duration, sg_surf_precision); XBT_IN("(%s,%g)", getName(), duration); - CpuCas01Action *action = new CpuCas01Action(getModel(), 1.0, getState() != SURF_RESOURCE_ON, - m_powerScale * m_powerPeak, getConstraint()); + CpuCas01Action *action = new CpuCas01Action(getModel(), 1.0, isOff(), + p_speed.scale * p_speed.peak, getConstraint()); // FIXME: sleep variables should not consume 1.0 in lmm_expand @@ -297,13 +235,13 @@ CpuAction *CpuCas01::sleep(double 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 */ - action->getStateSet()->erase(action->getStateSet()->iterator_to(*action)); + action->getStateSet()->erase(action->getStateSet()->iterator_to(*action)); action->p_stateSet = static_cast(getModel())->p_cpuRunningActionSetThatDoesNotNeedBeingChecked; action->getStateSet()->push_back(*action); } lmm_update_variable_weight(getModel()->getMaxminSystem(), - action->getVariable(), 0.0); + 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 @@ -316,49 +254,15 @@ CpuAction *CpuCas01::sleep(double duration) 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(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)) + lmm_variable_new(model->getMaxminSystem(), this, + 1.0, speed, 1)) { - m_suspended = 0; if (model->getUpdateMechanism() == UM_LAZY) { m_indexHeap = -1; m_lastUpdate = surf_get_clock(); @@ -366,3 +270,6 @@ CpuCas01Action::CpuCas01Action(Model *model, double cost, bool failed, double po } lmm_expand(model->getMaxminSystem(), constraint, getVariable(), 1.0); } + +} +}