X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c978b9fe22c4e00793169fbe9d5f22825b96f894..8d777265e12b0b9c5f13fecfc719474cdd214e9e:/src/surf/cpu_cas01.cpp diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp index 6b5f1b8fd9..8db9a0307f 100644 --- a/src/surf/cpu_cas01.cpp +++ b/src/surf/cpu_cas01.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2009-2011. 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 @@ -6,62 +6,43 @@ #include "cpu_cas01.hpp" #include "cpu_ti.hpp" -#include "surf.hpp" -#include "maxmin_private.h" +#include "maxmin_private.hpp" #include "simgrid/sg_config.h" +#include "src/surf/platform.hpp" -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)->parseInit(host); -} - -static void cpu_add_traces_cpu(){ - surf_cpu_model->addTraces(); -} - -static void cpu_define_callbacks() -{ - sg_platf_host_add_cb(parse_cpu_init); - sg_platf_postparse_add_cb(cpu_add_traces_cpu); -} /********* * Model * *********/ 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); + char *optim = xbt_cfg_get_string(_sg_cfg_set, "cpu/optim"); if (!strcmp(optim, "TI")) { surf_cpu_model_init_ti(); return; } - surf_cpu_model = new CpuCas01Model(); - cpu_define_callbacks(); - ModelPtr model = static_cast(surf_cpu_model); - xbt_dynar_push(model_list, &model); + surf_cpu_model_pm = new simgrid::surf::CpuCas01Model(); + xbt_dynar_push(all_existing_models, &surf_cpu_model_pm); + + surf_cpu_model_vm = new simgrid::surf::CpuCas01Model(); + xbt_dynar_push(all_existing_models, &surf_cpu_model_vm); + + simgrid::surf::on_postparse.connect([]() { + surf_cpu_model_pm->addTraces(); + }); } -CpuCas01Model::CpuCas01Model() : CpuModel("cpu") -{ - ActionPtr action; - ActionLmmPtr actionlmm; +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"); @@ -80,27 +61,14 @@ CpuCas01Model::CpuCas01Model() : CpuModel("cpu") xbt_die("Unsupported optimization (%s) for this model", optim); } - cpu_running_action_set_that_does_not_need_being_checked = - xbt_swag_new(xbt_swag_offset(*action, p_stateHookup)); - - if (p_updateMechanism == UM_LAZY) { - shareResources = &CpuCas01Model::shareResourcesLazy; - updateActionsState = &CpuCas01Model::updateActionsStateLazy; + p_cpuRunningActionSetThatDoesNotNeedBeingChecked = new ActionList(); - } else if (p_updateMechanism == UM_FULL) { - shareResources = &CpuCas01Model::shareResourcesFull; - updateActionsState = &CpuCas01Model::updateActionsStateFull; - } else - xbt_die("Invalid cpu update mechanism!"); + p_maxminSystem = lmm_system_new(m_selectiveUpdate); - if (!p_maxminSystem) { - p_maxminSystem = lmm_system_new(m_selectiveUpdate); - } - - if (p_updateMechanism == UM_LAZY) { + if (getUpdateMechanism() == 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(*actionlmm, p_actionListHookup)); + p_modifiedSet = new ActionLmmList(); p_maxminSystem->keep_track = p_modifiedSet; } } @@ -112,48 +80,29 @@ CpuCas01Model::~CpuCas01Model() if (p_actionHeap) xbt_heap_free(p_actionHeap); - xbt_swag_free(p_modifiedSet); - - surf_cpu_model = NULL; + delete p_modifiedSet; - xbt_swag_free(cpu_running_action_set_that_does_not_need_being_checked); - cpu_running_action_set_that_does_not_need_being_checked = NULL; -} + surf_cpu_model_pm = NULL; -void CpuCas01Model::parseInit(sg_platf_host_cbarg_t host) -{ - createResource(host->id, - host->power_peak, - host->power_scale, - host->power_trace, - host->core_amount, - host->initial_state, - host->state_trace, - host->properties); + delete p_cpuRunningActionSetThatDoesNotNeedBeingChecked; } -CpuCas01LmmPtr CpuCas01Model::createResource(const char *name, double power_peak, 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) { - 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); - xbt_lib_set(host_lib, name, SURF_CPU_LEVEL, static_cast(cpu)); - - return (CpuCas01LmmPtr) xbt_lib_get_elm_or_null(host_lib, 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 *cpu = new CpuCas01(this, host, speedPeak, pstate, speedScale, speedTrace, core, initiallyOn, state_trace); + return cpu; } -double CpuCas01Model::shareResourcesFull(double now) +double CpuCas01Model::shareResourcesFull(double /*now*/) { - return Model::shareResourcesMaxMin(p_runningActionSet, + return Model::shareResourcesMaxMin(getRunningActionSet(), p_maxminSystem, lmm_solve); } @@ -169,140 +118,146 @@ 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 = static_cast(surf_cpu_resource_priv(surf_cpu_resource_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->p_stateEvent = - tmgr_history_add_trace(history, trace, 0.0, 0, static_cast(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); - CpuCas01LmmPtr host = dynamic_cast(static_cast(surf_cpu_resource_priv(surf_cpu_resource_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->p_powerEvent = - tmgr_history_add_trace(history, trace, 0.0, 0, static_cast(host)); + host->p_speedEvent = future_evt_set->add_trace(trace, 0.0, host); } } /************ * Resource * ************/ -CpuCas01Lmm::CpuCas01Lmm(CpuCas01ModelPtr model, const char *name, double powerPeak, - 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), Resource(model, name, properties) { - m_powerPeak = powerPeak; - m_powerScale = powerScale; +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", m_speedPeak, m_pstate); + m_core = core; - p_stateCurrent = stateInitial; - if (powerTrace) - p_powerEvent = tmgr_history_add_trace(history, powerTrace, 0.0, 0, static_cast(this)); + if (speedTrace) + p_speedEvent = future_evt_set->add_trace(speedTrace, 0.0, this); if (stateTrace) - p_stateEvent = tmgr_history_add_trace(history, stateTrace, 0.0, 0, static_cast(this)); + p_stateEvent = future_evt_set->add_trace(stateTrace, 0.0, this); +} - p_constraint = lmm_constraint_new(p_model->p_maxminSystem, this, m_core * m_powerScale * m_powerPeak); +CpuCas01::~CpuCas01() +{ + if (getModel() == surf_cpu_model_pm) + xbt_dynar_free(&p_speedPeakList); } -bool CpuCas01Lmm::isUsed() +xbt_dynar_t CpuCas01::getSpeedPeakList(){ + return p_speedPeakList; +} + +bool CpuCas01::isUsed() { - return lmm_constraint_used(p_model->p_maxminSystem, p_constraint); + return lmm_constraint_used(getModel()->getMaxminSystem(), getConstraint()); +} + +/** @brief take into account changes of speed (either load or max) */ +void CpuCas01::onSpeedChange() { + lmm_variable_t var = NULL; + lmm_element_t elem = NULL; + + lmm_update_constraint_bound(getModel()->getMaxminSystem(), getConstraint(), + 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)); + + lmm_update_variable_bound(getModel()->getMaxminSystem(), + action->getVariable(), + m_speedScale * m_speedPeak); + } + + Cpu::onSpeedChange(); } -void CpuCas01Lmm::updateState(tmgr_trace_event_t event_type, double value, double date) +void CpuCas01::updateState(tmgr_trace_iterator_t event_type, double value, double date) { 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, - m_core * m_powerScale * - m_powerPeak); -#ifdef HAVE_TRACING - TRACE_surf_host_set_power(date, m_name, - m_core * m_powerScale * - m_powerPeak); -#endif - while ((var = lmm_get_var_from_cnst - (surf_cpu_model->p_maxminSystem, p_constraint, &elem))) { - CpuCas01ActionLmmPtr action = static_cast(static_cast(lmm_variable_id(var))); + 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]"); - lmm_update_variable_bound(surf_cpu_model->p_maxminSystem, - action->p_variable, - m_powerScale * m_powerPeak); - } - if (tmgr_trace_event_free(event_type)) - p_powerEvent = NULL; + m_speedScale = value; + onSpeedChange(); + + tmgr_trace_event_unref(&p_speedEvent); } else if (event_type == p_stateEvent) { - if (value > 0) - p_stateCurrent = SURF_RESOURCE_ON; - else { - lmm_constraint_t cnst = p_constraint; + /* 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(isOff()) + xbt_dynar_push_as(host_that_restart, char*, (char *)getName()); + turnOn(); + } else { + lmm_constraint_t cnst = getConstraint(); - p_stateCurrent = SURF_RESOURCE_OFF; + turnOff(); - while ((var = lmm_get_var_from_cnst(surf_cpu_model->p_maxminSystem, cnst, &elem))) { - ActionLmmPtr action = static_cast(lmm_variable_id(var)); + while ((var = lmm_get_var_from_cnst(getModel()->getMaxminSystem(), cnst, &elem))) { + Action *action = static_cast(lmm_variable_id(var)); if (action->getState() == SURF_ACTION_RUNNING || action->getState() == SURF_ACTION_READY || action->getState() == SURF_ACTION_NOT_IN_THE_SYSTEM) { - action->m_finish = date; + action->setFinishTime(date); action->setState(SURF_ACTION_FAILED); } } } - 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; } -ActionPtr CpuCas01Lmm::execute(double size) +CpuAction *CpuCas01::execution_start(double size) { - XBT_IN("(%s,%g)", m_name, size); - CpuCas01ActionLmmPtr action = new CpuCas01ActionLmm(surf_cpu_model, size, p_stateCurrent != SURF_RESOURCE_ON); + XBT_IN("(%s,%g)", getName(), size); + CpuCas01Action *action = new CpuCas01Action(getModel(), size, isOff(), + m_speedScale * m_speedPeak, getConstraint()); - 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, static_cast(action), - action->m_priority, - m_powerScale * m_powerPeak, 1); - if (surf_cpu_model->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, - action->p_variable, 1.0); XBT_OUT(); return action; } -ActionPtr CpuCas01Lmm::sleep(double duration) +CpuAction *CpuCas01::sleep(double duration) { if (duration > 0) - duration = MAX(duration, MAXMIN_PRECISION); + duration = MAX(duration, sg_surf_precision); + + XBT_IN("(%s,%g)", getName(), duration); + CpuCas01Action *action = new CpuCas01Action(getModel(), 1.0, isOff(), + m_speedScale * m_speedPeak, getConstraint()); - XBT_IN("(%s,%g)", m_name, duration); - CpuCas01ActionLmmPtr action = dynamic_cast(execute(1.0)); // FIXME: sleep variables should not consume 1.0 in lmm_expand action->m_maxDuration = duration; @@ -310,28 +265,41 @@ ActionPtr 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(static_cast(action), action->p_stateSet); - action->p_stateSet = cpu_running_action_set_that_does_not_need_being_checked; - xbt_swag_insert(static_cast(action), action->p_stateSet); + 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(surf_cpu_model->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); + lmm_update_variable_weight(getModel()->getMaxminSystem(), + 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 // 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(static_cast(action), surf_cpu_model->p_modifiedSet); + getModel()->getModifiedSet()->push_front(*action); } XBT_OUT(); return action; } - /********** * Action * **********/ +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, speed, 1)) +{ + if (model->getUpdateMechanism() == UM_LAZY) { + m_indexHeap = -1; + m_lastUpdate = surf_get_clock(); + m_lastValue = 0.0; + } + lmm_expand(model->getMaxminSystem(), constraint, getVariable(), 1.0); +} +} +}