X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4736926935eb52f1e561715d2fa5a3fc4144a188..8d777265e12b0b9c5f13fecfc719474cdd214e9e:/src/surf/cpu_cas01.cpp diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp index c767a73002..8db9a0307f 100644 --- a/src/surf/cpu_cas01.cpp +++ b/src/surf/cpu_cas01.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2009-2011, 2013-2015. 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,25 +18,24 @@ 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 simgrid::surf::CpuCas01Model(); - surf_cpu_model_vm = new simgrid::surf::CpuCas01Model(); + xbt_dynar_push(all_existing_models, &surf_cpu_model_pm); - sg_platf_postparse_add_cb(simgrid::surf::cpu_add_traces); + surf_cpu_model_vm = new simgrid::surf::CpuCas01Model(); + xbt_dynar_push(all_existing_models, &surf_cpu_model_vm); - simgrid::surf::Model *model_pm = surf_cpu_model_pm; - simgrid::surf::Model *model_vm = surf_cpu_model_vm; - xbt_dynar_push(all_existing_models, &model_pm); - xbt_dynar_push(all_existing_models, &model_vm); + simgrid::surf::on_postparse.connect([]() { + surf_cpu_model_pm->addTraces(); + }); } namespace simgrid { @@ -63,19 +63,7 @@ CpuCas01Model::CpuCas01Model() : simgrid::surf::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); @@ -99,16 +87,16 @@ CpuCas01Model::~CpuCas01Model() delete p_cpuRunningActionSetThatDoesNotNeedBeingChecked; } -Cpu *CpuCas01Model::createCpu(simgrid::Host *host, xbt_dynar_t speedPeak, +Cpu *CpuCas01Model::createCpu(simgrid::s4u::Host *host, xbt_dynar_t speedPeak, int pstate, double speedScale, tmgr_trace_t speedTrace, int core, - e_surf_resource_state_t state_initial, + int initiallyOn, tmgr_trace_t state_trace) { 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 *cpu = new CpuCas01(this, host, speedPeak, pstate, speedScale, speedTrace, core, state_initial, state_trace); + Cpu *cpu = new CpuCas01(this, host, speedPeak, pstate, speedScale, speedTrace, core, initiallyOn, state_trace); return cpu; } @@ -130,55 +118,45 @@ 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); - CpuCas01 *host = static_cast(sg_host_surfcpu(sg_host_by_name(elm))); + CpuCas01 *host = static_cast(sg_host_by_name(elm)->pimpl_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, host)); + host->p_stateEvent = future_evt_set->add_trace(trace, 0.0, host); } - xbt_dict_foreach(trace_connect_list_power, cursor, trace_name, elm) { + xbt_dict_foreach(trace_connect_list_host_speed, 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))); + CpuCas01 *host = static_cast(sg_host_by_name(elm)->pimpl_cpu); 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)); + host->p_speedEvent = future_evt_set->add_trace(trace, 0.0, host); } } /************ * Resource * ************/ -CpuCas01::CpuCas01(CpuCas01Model *model, simgrid::Host *host, xbt_dynar_t speedPeak, +CpuCas01::CpuCas01(CpuCas01Model *model, simgrid::s4u::Host *host, xbt_dynar_t speedPeak, int pstate, double speedScale, tmgr_trace_t speedTrace, int core, - e_surf_resource_state_t stateInitial, tmgr_trace_t stateTrace) + int initiallyOn, tmgr_trace_t stateTrace) : Cpu(model, host, - lmm_constraint_new(model->getMaxminSystem(), this, core * speedScale * xbt_dynar_get_as(speedPeak, pstate, double)), - core, xbt_dynar_get_as(speedPeak, pstate, double), speedScale, - stateInitial) { - p_speedEvent = NULL; - - // Copy the power peak array: - p_speedPeakList = xbt_dynar_new(sizeof(double), nullptr); - unsigned long n = xbt_dynar_length(speedPeak); - for (unsigned long i = 0; i != n; ++i) { - double value = xbt_dynar_get_as(speedPeak, i, double); - xbt_dynar_push(p_speedPeakList, &value); - } - - m_pstate = pstate; + 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", m_speedPeak, m_pstate); m_core = core; if (speedTrace) - p_speedEvent = tmgr_history_add_trace(history, speedTrace, 0.0, 0, this); + p_speedEvent = future_evt_set->add_trace(speedTrace, 0.0, this); if (stateTrace) - p_stateEvent = tmgr_history_add_trace(history, stateTrace, 0.0, 0, this); + p_stateEvent = future_evt_set->add_trace(stateTrace, 0.0, this); } CpuCas01::~CpuCas01() @@ -187,46 +165,22 @@ CpuCas01::~CpuCas01() xbt_dynar_free(&p_speedPeakList); } -void CpuCas01::setStateEvent(tmgr_trace_event_t stateEvent) -{ - p_stateEvent = stateEvent; -} - -void CpuCas01::setPowerEvent(tmgr_trace_event_t powerEvent) -{ - p_speedEvent = powerEvent; -} - xbt_dynar_t CpuCas01::getSpeedPeakList(){ return p_speedPeakList; } -int CpuCas01::getPState() -{ - return m_pstate; -} - 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; - - if (event_type == p_speedEvent) { - /* 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]"); +/** @brief take into account changes of speed (either load or max) */ +void CpuCas01::onSpeedChange() { + lmm_variable_t var = NULL; + lmm_element_t elem = NULL; - m_speedScale = value; lmm_update_constraint_bound(getModel()->getMaxminSystem(), getConstraint(), - m_core * m_speedScale * - m_speedPeak); - TRACE_surf_host_set_speed(date, getName(), - m_core * m_speedScale * - m_speedPeak); + m_core * m_speedScale * m_speedPeak); while ((var = lmm_get_var_from_cnst (getModel()->getMaxminSystem(), getConstraint(), &elem))) { CpuCas01Action *action = static_cast(lmm_variable_id(var)); @@ -235,20 +189,35 @@ void CpuCas01::updateState(tmgr_trace_event_t event_type, double value, double d action->getVariable(), m_speedScale * m_speedPeak); } - if (tmgr_trace_event_free(event_type)) - p_speedEvent = NULL; + + Cpu::onSpeedChange(); +} + +void CpuCas01::updateState(tmgr_trace_iterator_t event_type, double value, double date) +{ + lmm_variable_t var = NULL; + lmm_element_t elem = NULL; + + if (event_type == p_speedEvent) { + /* 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]"); + + m_speedScale = value; + onSpeedChange(); + + tmgr_trace_event_unref(&p_speedEvent); } else if (event_type == p_stateEvent) { - /* TODO (Hypervisor): do the same thing for constraint_core[i] */ + /* 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(); - setState(SURF_RESOURCE_OFF); + turnOff(); while ((var = lmm_get_var_from_cnst(getModel()->getMaxminSystem(), cnst, &elem))) { Action *action = static_cast(lmm_variable_id(var)); @@ -261,22 +230,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_speedScale * m_speedPeak, getConstraint()); + CpuCas01Action *action = new CpuCas01Action(getModel(), size, isOff(), + m_speedScale * m_speedPeak, getConstraint()); XBT_OUT(); return action; @@ -288,8 +255,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_speedScale * m_speedPeak, getConstraint()); + CpuCas01Action *action = new CpuCas01Action(getModel(), 1.0, isOff(), + m_speedScale * m_speedPeak, getConstraint()); // FIXME: sleep variables should not consume 1.0 in lmm_expand @@ -298,13 +265,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 @@ -317,39 +284,6 @@ CpuAction *CpuCas01::sleep(double duration) return action; } -double CpuCas01::getCurrentPowerPeak() -{ - return m_speedPeak; -} - -double CpuCas01::getPowerPeakAt(int pstate_index) -{ - xbt_dynar_t plist = p_speedPeakList; - 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_speedPeakList); -} - -void CpuCas01::setPstate(int pstate_index) -{ - xbt_dynar_t plist = p_speedPeakList; - 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_speedPeak = new_pstate; -} - -int CpuCas01::getPstate() -{ - return m_pstate; -} - /********** * Action * **********/ @@ -359,7 +293,6 @@ CpuCas01Action::CpuCas01Action(Model *model, double cost, bool failed, double sp 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();