X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6de03ecc4e630732984a0673512a5d15fd75e270..eb9610fbdbfac640b40d9860ef98dfaa7aab6f55:/src/surf/cpu_cas01.cpp diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp index c746e9a836..564d49bc63 100644 --- a/src/surf/cpu_cas01.cpp +++ b/src/surf/cpu_cas01.cpp @@ -6,31 +6,12 @@ #include "cpu_cas01.hpp" #include "cpu_ti.hpp" -#include "plugins/energy.hpp" #include "maxmin_private.hpp" #include "simgrid/sg_config.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_cas, surf_cpu, "Logging specific to the SURF CPU IMPROVED module"); -/************* - * 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 * *********/ @@ -49,9 +30,11 @@ void surf_cpu_model_init_Cas01() 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); + sg_platf_host_add_cb(cpu_parse_init); + sg_platf_postparse_add_cb(cpu_add_traces); + + 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 +97,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, @@ -135,15 +105,16 @@ CpuPtr CpuCas01Model::createResource(const char *name, xbt_dynar_t power_peak, xbt_dict_t cpu_properties) { CpuPtr cpu = NULL; - xbt_assert(!surf_cpu_resource_priv(surf_cpu_resource_by_name(name)), + sg_host_t host = sg_host_by_name(name); + xbt_assert(!sg_host_surfcpu(host), "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)); + sg_host_surfcpu_set(host, cpu); return cpu; } @@ -166,22 +137,22 @@ 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); - CpuCas01Ptr host = static_cast(surf_cpu_resource_priv(surf_cpu_resource_by_name(elm))); + CpuCas01Ptr host = static_cast(sg_host_surfcpu(sg_host_by_name(elm))); 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, 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) { tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name); - CpuCas01Ptr host = static_cast(surf_cpu_resource_priv(surf_cpu_resource_by_name(elm))); + CpuCas01Ptr host = static_cast(sg_host_surfcpu(sg_host_by_name(elm))); 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, static_cast(host))); + host->setPowerEvent(tmgr_history_add_trace(history, trace, 0.0, 0, host)); } } @@ -204,10 +175,10 @@ CpuCas01::CpuCas01(CpuCas01ModelPtr model, const char *name, xbt_dynar_t powerPe m_core = core; 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(){ @@ -252,14 +223,12 @@ void CpuCas01::updateState(tmgr_trace_event_t event_type, double value, double d 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 (getModel()->getMaxminSystem(), getConstraint(), &elem))) { - CpuCas01ActionPtr action = static_cast(static_cast(lmm_variable_id(var))); + CpuCas01ActionPtr action = static_cast(lmm_variable_id(var)); lmm_update_variable_bound(getModel()->getMaxminSystem(), action->getVariable(), @@ -315,7 +284,7 @@ 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(getModel(), 1.0, getState() != SURF_RESOURCE_ON, @@ -365,14 +334,19 @@ int CpuCas01::getNbPstates() return xbt_dynar_length(p_powerPeakList); } -void CpuCas01::setPowerPeakAt(int pstate_index) +void CpuCas01::setPstate(int pstate_index) { xbt_dynar_t plist = p_powerPeakList; xbt_assert((pstate_index <= (int)xbt_dynar_length(plist)), "Invalid parameters (pstate index out of bounds)"); - double new_power_peak = xbt_dynar_get_as(plist, pstate_index, double); + double new_pstate = xbt_dynar_get_as(plist, pstate_index, double); m_pstate = pstate_index; - m_powerPeak = new_power_peak; + m_powerPeak = new_pstate; +} + +int CpuCas01::getPstate() +{ + return m_pstate; } /********** @@ -381,7 +355,7 @@ 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;