X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/13e0c316176dfe56c04b66d96b65a174e76d0549..3dbeba193df2e406bd9eff5be73c8bce0db0185e:/src/surf/cpu_cas01.cpp diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp index 1174ac282e..342c6e5264 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 @@ -6,7 +6,6 @@ #include "cpu_cas01.hpp" #include "cpu_ti.hpp" -#include "plugins/energy.hpp" #include "maxmin_private.hpp" #include "simgrid/sg_config.h" @@ -17,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); } /********* @@ -50,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); } @@ -114,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, @@ -139,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; } @@ -171,7 +149,7 @@ 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) { @@ -181,8 +159,7 @@ void CpuCas01Model::addTraces() 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)); } } @@ -203,16 +180,36 @@ CpuCas01::CpuCas01(CpuCas01ModelPtr model, const char *name, xbt_dynar_t powerPe 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(){ - xbt_dynar_free(&p_powerPeakList); + 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() @@ -230,19 +227,17 @@ 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 TRACE_surf_host_set_power(date, getName(), m_core * m_powerScale * 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); } @@ -253,15 +248,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 || @@ -286,7 +281,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(); @@ -296,10 +291,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()); @@ -314,14 +309,14 @@ 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(); @@ -362,12 +357,10 @@ void CpuCas01::setPowerPeakAt(int pstate_index) 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();