X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f3ae712a1b95294052b6e8136d0f0f2d4b30e6eb..ae7bffe6655b934fc4a09ca1a34e10de5d8dd366:/src/surf/cpu_interface.cpp diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp index 1a08d36e34..0513ad6517 100644 --- a/src/surf/cpu_interface.cpp +++ b/src/surf/cpu_interface.cpp @@ -1,10 +1,11 @@ -/* Copyright (c) 2013-2014. The SimGrid Team. +/* Copyright (c) 2013-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ #include "cpu_interface.hpp" +#include "plugins/energy.hpp" XBT_LOG_EXTERNAL_CATEGORY(surf_kernel); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu, surf, @@ -13,63 +14,44 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu, surf, int autoload_surf_cpu_model = 1; void_f_void_t surf_cpu_model_init_preparse = NULL; -CpuModelPtr surf_cpu_model_pm; -CpuModelPtr surf_cpu_model_vm; +CpuModel *surf_cpu_model_pm; +CpuModel *surf_cpu_model_vm; /************* * Callbacks * *************/ -CpuPtr getActionCpu(CpuActionPtr action) { - return static_cast(lmm_constraint_id(lmm_get_cnst_from_var +Cpu *getActionCpu(CpuAction *action) { + return static_cast(lmm_constraint_id(lmm_get_cnst_from_var (action->getModel()->getMaxminSystem(), action->getVariable(), 0))); } -surf_callback(void, CpuPtr) cpuCreatedCallbacks; -surf_callback(void, CpuPtr) cpuDestructedCallbacks; -surf_callback(void, CpuPtr, e_surf_resource_state_t, e_surf_resource_state_t) cpuStateChangedCallbacks; -surf_callback(void, CpuActionPtr, e_surf_action_state_t, e_surf_action_state_t) cpuActionStateChangedCallbacks; +surf_callback(void, Cpu*) cpuCreatedCallbacks; +surf_callback(void, Cpu*) cpuDestructedCallbacks; +surf_callback(void, Cpu*, e_surf_resource_state_t, e_surf_resource_state_t) cpuStateChangedCallbacks; +surf_callback(void, CpuAction*, e_surf_action_state_t, e_surf_action_state_t) cpuActionStateChangedCallbacks; -void parse_cpu_init(sg_platf_host_cbarg_t host){ - surf_cpu_model_pm->parseInit(host); -} - -void add_traces_cpu(){ +void cpu_add_traces(){ surf_cpu_model_pm->addTraces(); } /********* * Model * *********/ -void CpuModel::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); -} - void CpuModel::updateActionsStateLazy(double now, double /*delta*/) { - CpuActionPtr action; + CpuAction *action; while ((xbt_heap_size(getActionHeap()) > 0) && (double_equals(xbt_heap_maxkey(getActionHeap()), now, sg_surf_precision))) { - action = static_cast(static_cast(xbt_heap_pop(getActionHeap()))); + action = static_cast(xbt_heap_pop(getActionHeap())); XBT_CDEBUG(surf_kernel, "Something happened to action %p", action); -#ifdef HAVE_TRACING if (TRACE_is_enabled()) { - CpuPtr cpu = static_cast(lmm_constraint_id(lmm_get_cnst_from_var(getMaxminSystem(), action->getVariable(), 0))); + Cpu *cpu = static_cast(lmm_constraint_id(lmm_get_cnst_from_var(getMaxminSystem(), action->getVariable(), 0))); TRACE_surf_host_set_utilization(cpu->getName(), action->getCategory(), lmm_variable_getvalue(action->getVariable()), action->getLastUpdate(), now - action->getLastUpdate()); } -#endif action->finish(); XBT_CDEBUG(surf_kernel, "Action %p finished", action); @@ -79,15 +61,14 @@ void CpuModel::updateActionsStateLazy(double now, double /*delta*/) action->setState(SURF_ACTION_DONE); action->heapRemove(getActionHeap()); //FIXME: strange call since action was already popped } -#ifdef HAVE_TRACING if (TRACE_is_enabled()) { //defining the last timestamp that we can safely dump to trace file //without losing the event ascending order (considering all CPU's) double smaller = -1; - ActionListPtr actionSet = getRunningActionSet(); + ActionList *actionSet = getRunningActionSet(); for(ActionList::iterator it(actionSet->begin()), itend(actionSet->end()) ; it != itend ; ++it) { - action = static_cast(&*it); + action = static_cast(&*it); if (smaller < 0) { smaller = action->getLastUpdate(); continue; @@ -100,23 +81,20 @@ void CpuModel::updateActionsStateLazy(double now, double /*delta*/) TRACE_last_timestamp_to_dump = smaller; } } -#endif return; } void CpuModel::updateActionsStateFull(double now, double delta) { - CpuActionPtr action = NULL; - ActionListPtr running_actions = getRunningActionSet(); + CpuAction *action = NULL; + ActionList *running_actions = getRunningActionSet(); for(ActionList::iterator it(running_actions->begin()), itNext=it, itend(running_actions->end()) ; it != itend ; it=itNext) { ++itNext; - action = static_cast(&*it); -#ifdef HAVE_TRACING + action = static_cast(&*it); if (TRACE_is_enabled()) { - CpuPtr x = (CpuPtr) lmm_constraint_id(lmm_get_cnst_from_var - (getMaxminSystem(), action->getVariable(), 0)); + Cpu *x = static_cast (lmm_constraint_id(lmm_get_cnst_from_var(getMaxminSystem(), action->getVariable(), 0)) ); TRACE_surf_host_set_utilization(x->getName(), action->getCategory(), @@ -125,7 +103,6 @@ void CpuModel::updateActionsStateFull(double now, double delta) delta); TRACE_last_timestamp_to_dump = now - delta; } -#endif action->updateRemains(lmm_variable_getvalue(action->getVariable()) * delta); @@ -153,29 +130,30 @@ void CpuModel::updateActionsStateFull(double now, double delta) ************/ Cpu::Cpu(){ - surf_callback_emit(cpuCreatedCallbacks, this); } -Cpu::Cpu(ModelPtr model, const char *name, xbt_dict_t props, - int core, double powerPeak, double powerScale) - : Resource(model, name, props) + +Cpu::Cpu(Model *model, const char *name, xbt_dict_t props, + int core, double powerPeak, double powerScale, + e_surf_resource_state_t stateInitial) + : Resource(model, name, props, stateInitial) , m_core(core) , m_powerPeak(powerPeak) , m_powerScale(powerScale) , p_constraintCore(NULL) , p_constraintCoreId(NULL) { - surf_callback_emit(cpuCreatedCallbacks, this); + } -Cpu::Cpu(ModelPtr model, const char *name, xbt_dict_t props, - lmm_constraint_t constraint, int core, double powerPeak, double powerScale) - : Resource(model, name, props, constraint) +Cpu::Cpu(Model *model, const char *name, xbt_dict_t props, + lmm_constraint_t constraint, int core, double powerPeak, + double powerScale, e_surf_resource_state_t stateInitial) + : Resource(model, name, props, constraint, stateInitial) , m_core(core) , m_powerPeak(powerPeak) , m_powerScale(powerScale) { - surf_callback_emit(cpuCreatedCallbacks, this); /* At now, we assume that a VM does not have a multicore CPU. */ if (core > 1) xbt_assert(model == surf_cpu_model_pm); @@ -195,6 +173,16 @@ Cpu::Cpu(ModelPtr model, const char *name, xbt_dict_t props, } } +Cpu::Cpu(Model *model, const char *name, xbt_dict_t props, + lmm_constraint_t constraint, int core, double powerPeak, double powerScale) +: Cpu(model, name, props, constraint, core, powerPeak, powerScale, SURF_RESOURCE_ON) +{} + +Cpu::Cpu(Model *model, const char *name, xbt_dict_t props, + int core, double powerPeak, double powerScale) +: Cpu(model, name, props, core, powerPeak, powerScale, SURF_RESOURCE_ON) +{} + Cpu::~Cpu(){ surf_callback_emit(cpuDestructedCallbacks, this); if (p_constraintCoreId){ @@ -234,6 +222,7 @@ void Cpu::setState(e_surf_resource_state_t state) Resource::setState(state); surf_callback_emit(cpuStateChangedCallbacks, this, old, state); } + /********** * Action * **********/ @@ -255,12 +244,10 @@ void CpuAction::updateRemainingLazy(double now) XBT_CDEBUG(surf_kernel, "Updating action(%p): remains was %f, last_update was: %f", this, m_remains, m_lastUpdate); double_update(&(m_remains), m_lastValue * delta, sg_maxmin_precision*sg_surf_precision); -#ifdef HAVE_TRACING if (TRACE_is_enabled()) { - CpuPtr cpu = static_cast(lmm_constraint_id(lmm_get_cnst_from_var(getModel()->getMaxminSystem(), getVariable(), 0))); + Cpu *cpu = static_cast(lmm_constraint_id(lmm_get_cnst_from_var(getModel()->getMaxminSystem(), getVariable(), 0))); TRACE_surf_host_set_utilization(cpu->getName(), getCategory(), m_lastValue, m_lastUpdate, now - m_lastUpdate); } -#endif XBT_CDEBUG(surf_kernel, "Updating action(%p): remains is now %f", this, m_remains); } @@ -288,7 +275,7 @@ void CpuAction::updateRemainingLazy(double now) * action object does not have the information about the location where the * action is being executed. */ -void CpuAction::setAffinity(CpuPtr cpu, unsigned long mask) +void CpuAction::setAffinity(Cpu *cpu, unsigned long mask) { lmm_variable_t var_obj = getVariable(); XBT_IN("(%p,%lx)", this, mask);