X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/245ddc814c1b3a8ee9126f56123466d99bb523cd..90559b37332c0f396c09fd1c75326cfbdbbe5dc1:/src/surf/cpu_cas01.cpp diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp index 246b4f180f..0f52a6e215 100644 --- a/src/surf/cpu_cas01.cpp +++ b/src/surf/cpu_cas01.cpp @@ -8,7 +8,6 @@ #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"); @@ -32,10 +31,6 @@ void surf_cpu_model_init_Cas01() 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(); - }); } namespace simgrid { @@ -88,76 +83,38 @@ CpuCas01Model::~CpuCas01Model() } 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) + double speedScale, tmgr_trace_t speedTrace, int core, 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, initiallyOn, state_trace); + Cpu *cpu = new CpuCas01(this, host, speedPeak, speedScale, speedTrace, core, state_trace); return cpu; } -double CpuCas01Model::shareResourcesFull(double /*now*/) -{ - return Model::shareResourcesMaxMin(getRunningActionSet(), - p_maxminSystem, lmm_solve); -} - -void CpuCas01Model::addTraces() +double CpuCas01Model::next_occuring_event_full(double /*now*/) { - xbt_dict_cursor_t cursor = NULL; - char *trace_name, *elm; - static int called = 0; - if (called) - return; - called = 1; - - /* 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_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)); - } - - 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); - 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)); - } + return Model::shareResourcesMaxMin(getRunningActionSet(), p_maxminSystem, lmm_solve); } /************ * Resource * ************/ 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) + double speedScale, tmgr_trace_t speedTrace, int core, 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) { - p_speedEvent = NULL; + lmm_constraint_new(model->getMaxminSystem(), this, core * speedScale * xbt_dynar_get_as(speedPeak, 0/*pstate*/, double)), + speedPeak, core, xbt_dynar_get_as(speedPeak, 0/*pstate*/, double), speedScale) +{ - XBT_DEBUG("CPU create: peak=%f, pstate=%d", m_speedPeak, m_pstate); + XBT_DEBUG("CPU create: peak=%f, pstate=%d", p_speed.peak, m_pstate); m_core = core; if (speedTrace) - p_speedEvent = tmgr_history_add_trace(history, speedTrace, 0.0, 0, this); + p_speed.event = 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() @@ -166,16 +123,6 @@ 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; } @@ -187,38 +134,34 @@ bool CpuCas01::isUsed() /** @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_variable_t var = NULL; + lmm_element_t elem = NULL; lmm_update_constraint_bound(getModel()->getMaxminSystem(), getConstraint(), - m_core * m_speedScale * m_speedPeak); + m_core * p_speed.scale * p_speed.peak); 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); + p_speed.scale * p_speed.peak); } - Cpu::onSpeedChange(); + Cpu::onSpeedChange(); } -void CpuCas01::updateState(tmgr_trace_event_t event_type, double value, double date) +void CpuCas01::apply_event(tmgr_trace_iterator_t event, double value) { - lmm_variable_t var = NULL; - lmm_element_t elem = NULL; - - if (event_type == p_speedEvent) { + if (event == p_speed.event) { /* 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; + p_speed.scale = value; onSpeedChange(); - if (tmgr_trace_event_free(event_type)) - p_speedEvent = NULL; - } else if (event_type == p_stateEvent) { + tmgr_trace_event_unref(&p_speed.event); + } else if (event == 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]"); @@ -228,6 +171,9 @@ void CpuCas01::updateState(tmgr_trace_event_t event_type, double value, double d turnOn(); } else { lmm_constraint_t cnst = getConstraint(); + lmm_variable_t var = NULL; + lmm_element_t elem = NULL; + double date = surf_get_clock(); turnOff(); @@ -242,22 +188,19 @@ 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, isOff(), - m_speedScale * m_speedPeak, getConstraint()); + p_speed.scale * p_speed.peak, getConstraint()); XBT_OUT(); return action; @@ -270,7 +213,7 @@ CpuAction *CpuCas01::sleep(double duration) XBT_IN("(%s,%g)", getName(), duration); CpuCas01Action *action = new CpuCas01Action(getModel(), 1.0, isOff(), - m_speedScale * m_speedPeak, getConstraint()); + p_speed.scale * p_speed.peak, getConstraint()); // FIXME: sleep variables should not consume 1.0 in lmm_expand @@ -304,8 +247,8 @@ CpuAction *CpuCas01::sleep(double duration) 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)) + lmm_variable_new(model->getMaxminSystem(), this, + 1.0, speed, 1)) { if (model->getUpdateMechanism() == UM_LAZY) { m_indexHeap = -1;