X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/290e19f26b10dc49485d7d7b06859edff32fd1e1..b23e1eb029a107cdc16abd13f0f4d3f0650f642a:/src/surf/cpu_cas01.cpp diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp index d5fb35574b..f24f51f281 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-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -12,16 +12,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_cas, surf_cpu, "Logging specific to the SURF CPU IMPROVED module"); -/************* - * CallBacks * - *************/ - -static void cpu_define_callbacks() -{ - sg_platf_host_add_cb(cpu_parse_init); - sg_platf_postparse_add_cb(cpu_add_traces); -} - /********* * Model * *********/ @@ -40,14 +30,15 @@ void surf_cpu_model_init_Cas01() surf_cpu_model_pm = new CpuCas01Model(); surf_cpu_model_vm = new CpuCas01Model(); - cpu_define_callbacks(); - 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); + sg_platf_postparse_add_cb(cpu_add_traces); + + Model *model_pm = surf_cpu_model_pm; + Model *model_vm = surf_cpu_model_vm; + xbt_dynar_push(all_existing_models, &model_pm); + xbt_dynar_push(all_existing_models, &model_vm); } -CpuCas01Model::CpuCas01Model() : CpuModel("cpu") +CpuCas01Model::CpuCas01Model() : 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"); @@ -105,24 +96,21 @@ CpuCas01Model::~CpuCas01Model() delete p_cpuRunningActionSetThatDoesNotNeedBeingChecked; } -CpuPtr CpuCas01Model::createCpu(const char *name, xbt_dynar_t power_peak, - int pstate, double power_scale, - tmgr_trace_t power_trace, int core, +Cpu *CpuCas01Model::createCpu(const char *name, xbt_dynar_t speedPeak, + int pstate, double speedScale, + tmgr_trace_t speedTrace, 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)), - "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?"); + Cpu *cpu = NULL; + sg_host_t host = sg_host_by_name(name); + 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); - xbt_lib_set(host_lib, name, SURF_CPU_LEVEL, cpu); - + cpu = new CpuCas01(this, name, speedPeak, pstate, speedScale, speedTrace, core, state_initial, state_trace, cpu_properties); + sg_host_surfcpu_register(host, cpu); return cpu; } @@ -144,7 +132,7 @@ 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); - CpuCas01Ptr host = static_cast(surf_cpu_resource_priv(surf_cpu_resource_by_name(elm))); + 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); @@ -154,7 +142,7 @@ void CpuCas01Model::addTraces() 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); - CpuCas01Ptr host = static_cast(surf_cpu_resource_priv(surf_cpu_resource_by_name(elm))); + 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); @@ -166,23 +154,31 @@ void CpuCas01Model::addTraces() /************ * Resource * ************/ -CpuCas01::CpuCas01(CpuCas01ModelPtr model, const char *name, xbt_dynar_t powerPeak, - int pstate, double powerScale, tmgr_trace_t powerTrace, int core, +CpuCas01::CpuCas01(CpuCas01Model *model, const char *name, xbt_dynar_t speedPeak, + int pstate, double speedScale, tmgr_trace_t speedTrace, 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; + 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; - XBT_DEBUG("CPU create: peak=%f, pstate=%d", m_powerPeak, m_pstate); + XBT_DEBUG("CPU create: peak=%f, pstate=%d", m_speedPeak, m_pstate); m_core = core; - setState(stateInitial); - if (powerTrace) - p_powerEvent = tmgr_history_add_trace(history, powerTrace, 0.0, 0, this); + if (speedTrace) + p_speedEvent = tmgr_history_add_trace(history, speedTrace, 0.0, 0, this); if (stateTrace) p_stateEvent = tmgr_history_add_trace(history, stateTrace, 0.0, 0, this); @@ -190,7 +186,7 @@ CpuCas01::CpuCas01(CpuCas01ModelPtr model, const char *name, xbt_dynar_t powerPe CpuCas01::~CpuCas01(){ if (getModel() == surf_cpu_model_pm) - xbt_dynar_free(&p_powerPeakList); + xbt_dynar_free(&p_speedPeakList); } void CpuCas01::setStateEvent(tmgr_trace_event_t stateEvent) @@ -200,11 +196,11 @@ void CpuCas01::setStateEvent(tmgr_trace_event_t stateEvent) void CpuCas01::setPowerEvent(tmgr_trace_event_t powerEvent) { - p_powerEvent = powerEvent; + p_speedEvent = powerEvent; } -xbt_dynar_t CpuCas01::getPowerPeakList(){ - return p_powerPeakList; +xbt_dynar_t CpuCas01::getSpeedPeakList(){ + return p_speedPeakList; } int CpuCas01::getPState() @@ -222,27 +218,27 @@ void CpuCas01::updateState(tmgr_trace_event_t event_type, double value, double d lmm_variable_t var = NULL; lmm_element_t elem = NULL; - if (event_type == p_powerEvent) { + if (event_type == p_speedEvent) { /* 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]"); + xbt_assert(m_core == 1, "FIXME: add speed scaling code also for constraint_core[i]"); - m_powerScale = value; + m_speedScale = 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 * m_speedScale * + m_speedPeak); + TRACE_surf_host_set_speed(date, getName(), + m_core * m_speedScale * + m_speedPeak); while ((var = lmm_get_var_from_cnst (getModel()->getMaxminSystem(), getConstraint(), &elem))) { - CpuCas01ActionPtr action = static_cast(lmm_variable_id(var)); + CpuCas01Action *action = static_cast(lmm_variable_id(var)); lmm_update_variable_bound(getModel()->getMaxminSystem(), action->getVariable(), - m_powerScale * m_powerPeak); + m_speedScale * m_speedPeak); } if (tmgr_trace_event_free(event_type)) - p_powerEvent = NULL; + p_speedEvent = NULL; } else if (event_type == 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]"); @@ -257,7 +253,7 @@ void CpuCas01::updateState(tmgr_trace_event_t event_type, double value, double d setState(SURF_RESOURCE_OFF); while ((var = lmm_get_var_from_cnst(getModel()->getMaxminSystem(), cnst, &elem))) { - ActionPtr action = static_cast(lmm_variable_id(var)); + Action *action = static_cast(lmm_variable_id(var)); if (action->getState() == SURF_ACTION_RUNNING || action->getState() == SURF_ACTION_READY || @@ -277,25 +273,25 @@ void CpuCas01::updateState(tmgr_trace_event_t event_type, double value, double d return; } -CpuActionPtr CpuCas01::execute(double size) +CpuAction *CpuCas01::execute(double size) { XBT_IN("(%s,%g)", getName(), size); - CpuCas01ActionPtr action = new CpuCas01Action(getModel(), size, getState() != SURF_RESOURCE_ON, - m_powerScale * m_powerPeak, getConstraint()); + CpuCas01Action *action = new CpuCas01Action(getModel(), size, getState() != SURF_RESOURCE_ON, + m_speedScale * m_speedPeak, getConstraint()); XBT_OUT(); return action; } -CpuActionPtr CpuCas01::sleep(double duration) +CpuAction *CpuCas01::sleep(double duration) { if (duration > 0) 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()); + CpuCas01Action *action = new CpuCas01Action(getModel(), 1.0, getState() != SURF_RESOURCE_ON, + m_speedScale * m_speedPeak, getConstraint()); // FIXME: sleep variables should not consume 1.0 in lmm_expand @@ -305,7 +301,7 @@ CpuActionPtr CpuCas01::sleep(double 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->p_stateSet = static_cast(getModel())->p_cpuRunningActionSetThatDoesNotNeedBeingChecked; + action->p_stateSet = static_cast(getModel())->p_cpuRunningActionSetThatDoesNotNeedBeingChecked; action->getStateSet()->push_back(*action); } @@ -325,12 +321,12 @@ CpuActionPtr CpuCas01::sleep(double duration) double CpuCas01::getCurrentPowerPeak() { - return m_powerPeak; + return m_speedPeak; } double CpuCas01::getPowerPeakAt(int pstate_index) { - xbt_dynar_t plist = p_powerPeakList; + 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); @@ -338,17 +334,17 @@ double CpuCas01::getPowerPeakAt(int pstate_index) int CpuCas01::getNbPstates() { - return xbt_dynar_length(p_powerPeakList); + return xbt_dynar_length(p_speedPeakList); } void CpuCas01::setPstate(int pstate_index) { - xbt_dynar_t plist = p_powerPeakList; + 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_powerPeak = new_pstate; + m_speedPeak = new_pstate; } int CpuCas01::getPstate() @@ -360,10 +356,10 @@ int CpuCas01::getPstate() * Action * **********/ -CpuCas01Action::CpuCas01Action(ModelPtr 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)) + 1.0, speed, 1)) { m_suspended = 0; if (model->getUpdateMechanism() == UM_LAZY) {