X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5faf49cdf3f8ad8751317b857a6d3134fe07eda3..3af9dcb5714db015a7038a58701b2b453f52c6ca:/src/surf/cpu_cas01.cpp diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp index 68fba770c0..0ad4498b1e 100644 --- a/src/surf/cpu_cas01.cpp +++ b/src/surf/cpu_cas01.cpp @@ -11,13 +11,31 @@ #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_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); +} + /********* * Model * *********/ @@ -25,21 +43,28 @@ void surf_cpu_model_init_Cas01() { 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(); - xbt_dynar_push(model_list, &surf_cpu_model); + surf_cpu_model_pm = new CpuCas01Model(); + 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); + xbt_dynar_push(model_list, &model_pm); + xbt_dynar_push(model_list, &model_vm); } CpuCas01Model::CpuCas01Model() : CpuModel("cpu") { - CpuCas01ActionLmm action; + 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"); @@ -60,7 +85,7 @@ CpuCas01Model::CpuCas01Model() : CpuModel("cpu") } cpu_running_action_set_that_does_not_need_being_checked = - xbt_swag_new(xbt_swag_offset(action, p_stateHookup)); + xbt_swag_new(xbt_swag_offset(*action, p_stateHookup)); if (p_updateMechanism == UM_LAZY) { shareResources = &CpuCas01Model::shareResourcesLazy; @@ -79,12 +104,9 @@ CpuCas01Model::CpuCas01Model() : CpuModel("cpu") if (p_updateMechanism == 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(action, p_actionListHookup)); - //TOREPAIR: cpu_model->model_private->maxmin_system->m_keepTrack = cpu_model->model_private->modified_set; + p_modifiedSet = xbt_swag_new(xbt_swag_offset(*actionlmm, p_actionListHookup)); + p_maxminSystem->keep_track = p_modifiedSet; } - /* Define callbacks */ - //TODO sg_platf_host_add_cb(parse_cpu_init); - //TODO sg_platf_postparse_add_cb(cpu_add_traces_cpu); } CpuCas01Model::~CpuCas01Model() @@ -96,7 +118,7 @@ CpuCas01Model::~CpuCas01Model() xbt_heap_free(p_actionHeap); xbt_swag_free(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; @@ -106,6 +128,7 @@ 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, @@ -113,34 +136,31 @@ void CpuCas01Model::parseInit(sg_platf_host_cbarg_t host) host->state_trace, host->properties); } -CpuCas01LmmPtr CpuCas01Model::createResource(const char *name, double power_peak, double power_scale, + +CpuCas01LmmPtr CpuCas01Model::createResource(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) { - CpuCas01LmmPtr cpu = NULL; - + 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(power_peak > 0, "Power has to be >0"); xbt_assert(core > 0, "Invalid number of cores %d", core); - cpu = new CpuCas01Lmm(this, name, power_peak, power_scale, power_trace, core, state_initial, state_trace, cpu_properties); + cpu = new CpuCas01Lmm(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, this); - - return (CpuCas01LmmPtr) xbt_lib_get_elm_or_null(host_lib, name);; + return (CpuCas01LmmPtr) xbt_lib_get_elm_or_null(host_lib, name); } double CpuCas01Model::shareResourcesFull(double now) { - CpuCas01ActionLmm action; - Model::shareResourcesMaxMin(p_runningActionSet, - xbt_swag_offset(action, p_variable), + return Model::shareResourcesMaxMin(p_runningActionSet, p_maxminSystem, lmm_solve); - return 0; } void CpuCas01Model::addTraces() @@ -155,48 +175,69 @@ 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_by_name(elm); + CpuCas01LmmPtr 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_stateEvent = - tmgr_history_add_trace(history, trace, 0.0, 0, host); + tmgr_history_add_trace(history, trace, 0.0, 0, static_cast(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_by_name(elm); + CpuCas01LmmPtr host = dynamic_cast(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, host); + tmgr_history_add_trace(history, trace, 0.0, 0, static_cast(host)); } } /************ * Resource * ************/ -CpuCas01Lmm::CpuCas01Lmm(CpuCas01ModelPtr model, const char *name, double powerPeak, - double powerScale, tmgr_trace_t powerTrace, int core, +CpuCas01Lmm::CpuCas01Lmm(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) : - CpuLmm(model, name, properties) { - m_powerPeak = powerPeak; + xbt_dict_t properties) : + CpuLmm(model, name, properties), Resource(model, name, properties) { + m_powerPeak = xbt_dynar_get_as(powerPeak, pstate, double); + 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_powerScale = powerScale; m_core = core; p_stateCurrent = stateInitial; if (powerTrace) - p_powerEvent = tmgr_history_add_trace(history, powerTrace, 0.0, 0, this); + p_powerEvent = tmgr_history_add_trace(history, powerTrace, 0.0, 0, static_cast(this)); if (stateTrace) - p_stateEvent = tmgr_history_add_trace(history, stateTrace, 0.0, 0, this); + p_stateEvent = tmgr_history_add_trace(history, stateTrace, 0.0, 0, static_cast(this)); p_constraint = lmm_constraint_new(p_model->p_maxminSystem, this, m_core * m_powerScale * m_powerPeak); } +CpuCas01Lmm::~CpuCas01Lmm(){ + 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); + return; +} + bool CpuCas01Lmm::isUsed() { return lmm_constraint_used(p_model->p_maxminSystem, p_constraint); @@ -207,11 +248,9 @@ void CpuCas01Lmm::updateState(tmgr_trace_event_t event_type, double value, doubl lmm_variable_t var = NULL; lmm_element_t elem = NULL; - surf_watched_hosts(); - if (event_type == p_powerEvent) { m_powerScale = value; - lmm_update_constraint_bound(surf_cpu_model->p_maxminSystem, p_constraint, + lmm_update_constraint_bound(surf_cpu_model_pm->p_maxminSystem, p_constraint, m_core * m_powerScale * m_powerPeak); #ifdef HAVE_TRACING @@ -220,24 +259,27 @@ void CpuCas01Lmm::updateState(tmgr_trace_event_t event_type, double value, doubl m_powerPeak); #endif while ((var = lmm_get_var_from_cnst - (surf_cpu_model->p_maxminSystem, p_constraint, &elem))) { - CpuCas01ActionLmmPtr action = (CpuCas01ActionLmmPtr) lmm_variable_id(var); - lmm_update_variable_bound(surf_cpu_model->p_maxminSystem, + (surf_cpu_model_pm->p_maxminSystem, p_constraint, &elem))) { + CpuCas01ActionLmmPtr action = static_cast(static_cast(lmm_variable_id(var))); + + lmm_update_variable_bound(surf_cpu_model_pm->p_maxminSystem, action->p_variable, m_powerScale * m_powerPeak); } if (tmgr_trace_event_free(event_type)) p_powerEvent = NULL; } else if (event_type == p_stateEvent) { - if (value > 0) + if (value > 0) { + if(p_stateCurrent == SURF_RESOURCE_OFF) + xbt_dynar_push_as(host_that_restart, char*, (char *)m_name); p_stateCurrent = SURF_RESOURCE_ON; - else { + } else { lmm_constraint_t cnst = p_constraint; p_stateCurrent = SURF_RESOURCE_OFF; - while ((var = lmm_get_var_from_cnst(surf_cpu_model->p_maxminSystem, cnst, &elem))) { - ActionPtr action = (ActionPtr) lmm_variable_id(var); + while ((var = lmm_get_var_from_cnst(surf_cpu_model_pm->p_maxminSystem, cnst, &elem))) { + ActionLmmPtr action = static_cast(lmm_variable_id(var)); if (action->getState() == SURF_ACTION_RUNNING || action->getState() == SURF_ACTION_READY || @@ -257,37 +299,37 @@ void CpuCas01Lmm::updateState(tmgr_trace_event_t event_type, double value, doubl return; } -CpuActionPtr CpuCas01Lmm::execute(double size) +ActionPtr CpuCas01Lmm::execute(double size) { XBT_IN("(%s,%g)", m_name, size); - CpuCas01ActionLmmPtr action = new CpuCas01ActionLmm(surf_cpu_model, size, p_stateCurrent != SURF_RESOURCE_ON); + CpuCas01ActionLmmPtr action = new CpuCas01ActionLmm(surf_cpu_model_pm, size, p_stateCurrent != SURF_RESOURCE_ON); 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, action, + lmm_variable_new(surf_cpu_model_pm->p_maxminSystem, static_cast(action), action->m_priority, m_powerScale * m_powerPeak, 1); - if (surf_cpu_model->p_updateMechanism == UM_LAZY) { + if (surf_cpu_model_pm->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, + lmm_expand(surf_cpu_model_pm->p_maxminSystem, p_constraint, action->p_variable, 1.0); XBT_OUT(); return action; } -CpuActionPtr CpuCas01Lmm::sleep(double duration) +ActionPtr CpuCas01Lmm::sleep(double duration) { if (duration > 0) duration = MAX(duration, MAXMIN_PRECISION); XBT_IN("(%s,%g)", m_name, duration); - CpuCas01ActionLmmPtr action = (CpuCas01ActionLmmPtr) execute(1.0); + CpuCas01ActionLmmPtr action = dynamic_cast(execute(1.0)); // FIXME: sleep variables should not consume 1.0 in lmm_expand action->m_maxDuration = duration; @@ -295,28 +337,173 @@ CpuActionPtr CpuCas01Lmm::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 */ - xbt_swag_remove(action, action->p_stateSet); + xbt_swag_remove(static_cast(action), action->p_stateSet); action->p_stateSet = cpu_running_action_set_that_does_not_need_being_checked; - xbt_swag_insert(action, action->p_stateSet); + xbt_swag_insert(static_cast(action), action->p_stateSet); } - lmm_update_variable_weight(surf_cpu_model->p_maxminSystem, + lmm_update_variable_weight(surf_cpu_model_pm->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); + if (surf_cpu_model_pm->p_updateMechanism == UM_LAZY) { // remove action from the heap + action->heapRemove(surf_cpu_model_pm->p_actionHeap); // 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(action, surf_cpu_model->p_modifiedSet); + xbt_swag_insert_at_head(static_cast(action), surf_cpu_model_pm->p_modifiedSet); } XBT_OUT(); return action; } +xbt_dynar_t CpuCas01Lmm::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 (m_properties == NULL) + return NULL; + + char* all_power_values_str = (char*)xbt_dict_get_or_null(m_properties, "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", + m_name); + + /* 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 CpuCas01Lmm::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", m_name); + 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", + m_name); + + /* 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 CpuCas01Lmm::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 CpuCas01Lmm::getCurrentPowerPeak() +{ + return m_powerPeak; +} + +double CpuCas01Lmm::getPowerPeakAt(int pstate_index) +{ + xbt_dynar_t plist = p_powerPeakList; + xbt_assert((pstate_index <= xbt_dynar_length(plist)), "Invalid parameters (pstate index out of bounds)"); + + return xbt_dynar_get_as(plist, pstate_index, double); +} + +int CpuCas01Lmm::getNbPstates() +{ + return xbt_dynar_length(p_powerPeakList); +} + +void CpuCas01Lmm::setPowerPeakAt(int pstate_index) +{ + xbt_dynar_t plist = p_powerPeakList; + xbt_assert((pstate_index <= xbt_dynar_length(plist)), "Invalid parameters (pstate index out of bounds)"); + + double new_power_peak = xbt_dynar_get_as(plist, pstate_index, double); + m_pstate = pstate_index; + m_powerPeak = new_power_peak; +} + +double CpuCas01Lmm::getConsumedEnergy() +{ + return p_energy->total_energy; +} /********** * Action * **********/ +/** + * Update the CPU total energy for a finished action + * + */ +void CpuCas01ActionLmm::updateEnergy() +{ + CpuCas01LmmPtr cpu = static_cast(lmm_constraint_id(lmm_get_cnst_from_var + (p_model->p_maxminSystem, + p_variable, 0))); + if(cpu->p_energy->last_updated < surf_get_clock()) { + double load = lmm_constraint_get_usage(cpu->p_constraint) / cpu->m_powerPeak; + cpu->updateEnergy(load); + } +}