X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b35d70d6818026204833410d2e3917252fa35127..1bd3b1e9e02dd5662a771c1b382cfa1d1d9a2e08:/src/surf/cpu_cas01.cpp?ds=sidebyside diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp index d2fb281be5..676e7060d7 100644 --- a/src/surf/cpu_cas01.cpp +++ b/src/surf/cpu_cas01.cpp @@ -8,6 +8,7 @@ #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,7 +33,9 @@ void surf_cpu_model_init_Cas01() surf_cpu_model_vm = new simgrid::surf::CpuCas01Model(); xbt_dynar_push(all_existing_models, &surf_cpu_model_vm); - sg_platf_postparse_add_cb(simgrid::surf::cpu_add_traces); + simgrid::surf::on_postparse.connect([]() { + surf_cpu_model_pm->addTraces(); + }); } namespace simgrid { @@ -84,16 +87,16 @@ CpuCas01Model::~CpuCas01Model() delete p_cpuRunningActionSetThatDoesNotNeedBeingChecked; } -Cpu *CpuCas01Model::createCpu(simgrid::Host *host, xbt_dynar_t speedPeak, +Cpu *CpuCas01Model::createCpu(simgrid::s4u::Host *host, xbt_dynar_t speedPeak, int pstate, double speedScale, tmgr_trace_t speedTrace, int core, - e_surf_resource_state_t state_initial, + int initiallyOn, 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, state_initial, state_trace); + Cpu *cpu = new CpuCas01(this, host, speedPeak, pstate, speedScale, speedTrace, core, initiallyOn, state_trace); return cpu; } @@ -115,46 +118,46 @@ 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); - CpuCas01 *host = static_cast(sg_host_by_name(elm)->p_cpu); + 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)); + host->setStateEvent(future_evt_set->add_trace(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)->p_cpu); + 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)); + host->setPowerEvent(future_evt_set->add_trace(trace, 0.0, 0, host)); } } /************ * Resource * ************/ -CpuCas01::CpuCas01(CpuCas01Model *model, simgrid::Host *host, xbt_dynar_t speedPeak, +CpuCas01::CpuCas01(CpuCas01Model *model, simgrid::s4u::Host *host, xbt_dynar_t speedPeak, int pstate, double speedScale, tmgr_trace_t speedTrace, int core, - e_surf_resource_state_t stateInitial, tmgr_trace_t stateTrace) + 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, - stateInitial) { + initiallyOn) { p_speedEvent = NULL; XBT_DEBUG("CPU create: peak=%f, pstate=%d", m_speedPeak, m_pstate); m_core = core; if (speedTrace) - p_speedEvent = tmgr_history_add_trace(history, speedTrace, 0.0, 0, this); + p_speedEvent = future_evt_set->add_trace(speedTrace, 0.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, 0, this); } CpuCas01::~CpuCas01() @@ -163,12 +166,12 @@ CpuCas01::~CpuCas01() xbt_dynar_free(&p_speedPeakList); } -void CpuCas01::setStateEvent(tmgr_trace_event_t stateEvent) +void CpuCas01::setStateEvent(tmgr_trace_iterator_t stateEvent) { p_stateEvent = stateEvent; } -void CpuCas01::setPowerEvent(tmgr_trace_event_t powerEvent) +void CpuCas01::setPowerEvent(tmgr_trace_iterator_t powerEvent) { p_speedEvent = powerEvent; } @@ -201,14 +204,14 @@ void CpuCas01::onSpeedChange() { Cpu::onSpeedChange(); } -void CpuCas01::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; 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]"); + /* 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; onSpeedChange(); @@ -216,17 +219,17 @@ void CpuCas01::updateState(tmgr_trace_event_t event_type, double value, double d if (tmgr_trace_event_free(event_type)) p_speedEvent = NULL; } else if (event_type == p_stateEvent) { - /* TODO (Hypervisor): do the same thing for constraint_core[i] */ + /* 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(getState() == SURF_RESOURCE_OFF) + if(isOff()) xbt_dynar_push_as(host_that_restart, char*, (char *)getName()); - setState(SURF_RESOURCE_ON); + turnOn(); } else { lmm_constraint_t cnst = getConstraint(); - setState(SURF_RESOURCE_OFF); + turnOff(); while ((var = lmm_get_var_from_cnst(getModel()->getMaxminSystem(), cnst, &elem))) { Action *action = static_cast(lmm_variable_id(var)); @@ -253,8 +256,8 @@ CpuAction *CpuCas01::execute(double size) { XBT_IN("(%s,%g)", getName(), size); - CpuCas01Action *action = new CpuCas01Action(getModel(), size, getState() != SURF_RESOURCE_ON, - m_speedScale * m_speedPeak, getConstraint()); + CpuCas01Action *action = new CpuCas01Action(getModel(), size, isOff(), + m_speedScale * m_speedPeak, getConstraint()); XBT_OUT(); return action; @@ -266,8 +269,8 @@ CpuAction *CpuCas01::sleep(double duration) duration = MAX(duration, sg_surf_precision); XBT_IN("(%s,%g)", getName(), duration); - CpuCas01Action *action = new CpuCas01Action(getModel(), 1.0, getState() != SURF_RESOURCE_ON, - m_speedScale * m_speedPeak, getConstraint()); + CpuCas01Action *action = new CpuCas01Action(getModel(), 1.0, isOff(), + m_speedScale * m_speedPeak, getConstraint()); // FIXME: sleep variables should not consume 1.0 in lmm_expand @@ -276,13 +279,13 @@ CpuAction *CpuCas01::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 */ - action->getStateSet()->erase(action->getStateSet()->iterator_to(*action)); + 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(getModel()->getMaxminSystem(), - action->getVariable(), 0.0); + 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