X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c39f643b5bfb0e99887c209a94e49f841a2daae4..bfaf2a12439a9f5e03018d80b4c6ae89860ce2db:/src/surf/cpu_cas01.cpp diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp index a55976bcb2..81e46c7281 100644 --- a/src/surf/cpu_cas01.cpp +++ b/src/surf/cpu_cas01.cpp @@ -1,4 +1,4 @@ -/* 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 @@ -16,18 +16,10 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_cas, surf_cpu, * 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); } /********* @@ -49,8 +41,8 @@ void surf_cpu_model_init_Cas01() surf_cpu_model_vm = new CpuCas01Model(); cpu_define_callbacks(); - ModelPtr model_pm = static_cast(surf_cpu_model_pm); - ModelPtr model_vm = static_cast(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); } @@ -113,20 +105,7 @@ CpuCas01Model::~CpuCas01Model() 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, @@ -138,11 +117,11 @@ CpuPtr CpuCas01Model::createResource(const char *name, xbt_dynar_t power_peak, "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"); - xbt_assert(core > 0, "Invalid number of cores %d", core); + "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 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(cpu)); + xbt_lib_set(host_lib, name, SURF_CPU_LEVEL, cpu); return cpu; } @@ -170,18 +149,17 @@ void CpuCas01Model::addTraces() 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(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); - CpuCas01Ptr host = dynamic_cast(static_cast(surf_cpu_resource_priv(surf_cpu_resource_by_name(elm)))); + CpuCas01Ptr host = static_cast(surf_cpu_resource_priv(surf_cpu_resource_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, static_cast(host)); + host->setPowerEvent(tmgr_history_add_trace(history, trace, 0.0, 0, host)); } } @@ -199,30 +177,39 @@ CpuCas01::CpuCas01(CpuCas01ModelPtr model, const char *name, xbt_dynar_t powerPe p_powerPeakList = powerPeak; m_pstate = pstate; - p_energy = xbt_new(s_energy_cpu_cas01_t, 1); - p_energy->total_energy = 0; - p_energy->power_range_watts_list = getWattsRangeList(); - p_energy->last_updated = surf_get_clock(); - 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(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(this)); + p_stateEvent = tmgr_history_add_trace(history, stateTrace, 0.0, 0, this); } CpuCas01::~CpuCas01(){ - unsigned int iter; - xbt_dynar_t power_tuple = NULL; - xbt_dynar_foreach(p_energy->power_range_watts_list, iter, power_tuple) - xbt_dynar_free(&power_tuple); - xbt_dynar_free(&p_energy->power_range_watts_list); - xbt_dynar_free(&p_powerPeakList); - xbt_free(p_energy); + 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() @@ -240,7 +227,7 @@ void CpuCas01::updateState(tmgr_trace_event_t event_type, double value, double d 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 @@ -249,10 +236,10 @@ void CpuCas01::updateState(tmgr_trace_event_t event_type, double value, double d m_powerPeak); #endif while ((var = lmm_get_var_from_cnst - (surf_cpu_model_pm->getMaxminSystem(), getConstraint(), &elem))) { - CpuCas01ActionPtr action = static_cast(static_cast(lmm_variable_id(var))); + (getModel()->getMaxminSystem(), getConstraint(), &elem))) { + CpuCas01ActionPtr action = static_cast(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); } @@ -263,15 +250,15 @@ void CpuCas01::updateState(tmgr_trace_event_t event_type, double value, double d 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(lmm_variable_id(var)); if (action->getState() == SURF_ACTION_RUNNING || @@ -296,7 +283,7 @@ CpuActionPtr CpuCas01::execute(double size) { 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(); @@ -306,10 +293,10 @@ CpuActionPtr CpuCas01::execute(double size) 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()); @@ -324,119 +311,20 @@ CpuActionPtr CpuCas01::sleep(double duration) 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(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 - surf_cpu_model_pm->getModifiedSet()->push_front(*action); + getModel()->getModifiedSet()->push_front(*action); } XBT_OUT(); return action; } -xbt_dynar_t CpuCas01::getWattsRangeList() -{ - xbt_dynar_t power_range_list; - xbt_dynar_t power_tuple; - int i = 0, pstate_nb=0; - xbt_dynar_t current_power_values; - double min_power, max_power; - - if (getProperties() == NULL) - return NULL; - - char* all_power_values_str = (char*)xbt_dict_get_or_null(getProperties(), "power_per_state"); - - if (all_power_values_str == NULL) - return NULL; - - - power_range_list = xbt_dynar_new(sizeof(xbt_dynar_t), NULL); - xbt_dynar_t all_power_values = xbt_str_split(all_power_values_str, ","); - - pstate_nb = xbt_dynar_length(all_power_values); - for (i=0; i< pstate_nb; i++) - { - /* retrieve the power values associated with the current pstate */ - current_power_values = xbt_str_split(xbt_dynar_get_as(all_power_values, i, char*), ":"); - xbt_assert(xbt_dynar_length(current_power_values) > 1, - "Power properties incorrectly defined - could not retrieve min and max power values for host %s", - getName()); - - /* min_power corresponds to the idle power (cpu load = 0) */ - /* max_power is the power consumed at 100% cpu load */ - min_power = atof(xbt_dynar_get_as(current_power_values, 0, char*)); - max_power = atof(xbt_dynar_get_as(current_power_values, 1, char*)); - - power_tuple = xbt_dynar_new(sizeof(double), NULL); - xbt_dynar_push_as(power_tuple, double, min_power); - xbt_dynar_push_as(power_tuple, double, max_power); - - xbt_dynar_push_as(power_range_list, xbt_dynar_t, power_tuple); - xbt_dynar_free(¤t_power_values); - } - xbt_dynar_free(&all_power_values); - return power_range_list; -} - -/** - * Computes the power consumed by the host according to the current pstate and processor load - * - */ -double CpuCas01::getCurrentWattsValue(double cpu_load) -{ - xbt_dynar_t power_range_list = p_energy->power_range_watts_list; - - if (power_range_list == NULL) - { - XBT_DEBUG("No power range properties specified for host %s", getName()); - return 0; - } - xbt_assert(xbt_dynar_length(power_range_list) == xbt_dynar_length(p_powerPeakList), - "The number of power ranges in the properties does not match the number of pstates for host %s", - getName()); - - /* retrieve the power values associated with the current pstate */ - xbt_dynar_t current_power_values = xbt_dynar_get_as(power_range_list, m_pstate, xbt_dynar_t); - - /* min_power corresponds to the idle power (cpu load = 0) */ - /* max_power is the power consumed at 100% cpu load */ - double min_power = xbt_dynar_get_as(current_power_values, 0, double); - double max_power = xbt_dynar_get_as(current_power_values, 1, double); - double power_slope = max_power - min_power; - - double current_power = min_power + cpu_load * power_slope; - - XBT_DEBUG("[get_current_watts] min_power=%f, max_power=%f, slope=%f", min_power, max_power, power_slope); - XBT_DEBUG("[get_current_watts] Current power (watts) = %f, load = %f", current_power, cpu_load); - - return current_power; -} - -/** - * Updates the total energy consumed as the sum of the current energy and - * the energy consumed by the current action - */ -void CpuCas01::updateEnergy(double cpu_load) -{ - double start_time = p_energy->last_updated; - double finish_time = surf_get_clock(); - - XBT_DEBUG("[cpu_update_energy] action time interval=(%f-%f), current power peak=%f, current pstate=%d", - start_time, finish_time, m_powerPeak, m_pstate); - double current_energy = p_energy->total_energy; - double action_energy = getCurrentWattsValue(cpu_load)*(finish_time-start_time); - - p_energy->total_energy = current_energy + action_energy; - p_energy->last_updated = finish_time; - - XBT_DEBUG("[cpu_update_energy] old_energy_value=%f, action_energy_value=%f", current_energy, action_energy); -} - double CpuCas01::getCurrentPowerPeak() { return m_powerPeak; @@ -465,23 +353,16 @@ void CpuCas01::setPowerPeakAt(int pstate_index) m_powerPeak = new_power_peak; } -double CpuCas01::getConsumedEnergy() -{ - return p_energy->total_energy; -} - /********** * Action * **********/ 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(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(); @@ -489,20 +370,3 @@ CpuCas01Action::CpuCas01Action(ModelPtr model, double cost, bool failed, double } lmm_expand(model->getMaxminSystem(), constraint, getVariable(), 1.0); } - - -/** - * Update the CPU total energy for a finished action - * - */ -void CpuCas01Action::updateEnergy() -{ - CpuCas01Ptr cpu = static_cast(lmm_constraint_id(lmm_get_cnst_from_var - (getModel()->getMaxminSystem(), - getVariable(), 0))); - - if(cpu->p_energy->last_updated < surf_get_clock()) { - double load = lmm_constraint_get_usage(cpu->getConstraint()) / cpu->m_powerPeak; - cpu->updateEnergy(load); - } -}