X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a21681e5aca1a37efb2e9001e5055dec94c5de41..f9e6853d2c5b7b867211700bc12f0ee57f640b30:/src/surf/cpu_interface.cpp?ds=sidebyside diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp index fa64436210..736b29ee87 100644 --- a/src/surf/cpu_interface.cpp +++ b/src/surf/cpu_interface.cpp @@ -1,3 +1,9 @@ +/* Copyright (c) 2013-2014. 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" XBT_LOG_EXTERNAL_CATEGORY(surf_kernel); @@ -7,16 +13,31 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu, surf, CpuModelPtr surf_cpu_model_pm; CpuModelPtr surf_cpu_model_vm; +/************* + * Callbacks * + *************/ + +CpuPtr getActionCpu(CpuActionPtr 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) cpuStateChangedCallbacks; +surf_callback(void, CpuActionPtr) cpuActionStateChangedCallbacks; + /********* * Model * *********/ void CpuModel::updateActionsStateLazy(double now, double /*delta*/) { - CpuActionLmmPtr action; + CpuActionPtr action; while ((xbt_heap_size(getActionHeap()) > 0) && (double_equals(xbt_heap_maxkey(getActionHeap()), now))) { - action = dynamic_cast(static_cast(xbt_heap_pop(getActionHeap()))); + action = static_cast(static_cast(xbt_heap_pop(getActionHeap()))); XBT_CDEBUG(surf_kernel, "Something happened to action %p", action); #ifdef HAVE_TRACING if (TRACE_is_enabled()) { @@ -31,8 +52,6 @@ void CpuModel::updateActionsStateLazy(double now, double /*delta*/) action->finish(); XBT_CDEBUG(surf_kernel, "Action %p finished", action); - action->updateEnergy(); - /* set the remains to 0 due to precision problems when updating the remaining amount */ action->setRemains(0); action->setState(SURF_ACTION_DONE); @@ -46,7 +65,7 @@ void CpuModel::updateActionsStateLazy(double now, double /*delta*/) ActionListPtr actionSet = getRunningActionSet(); for(ActionList::iterator it(actionSet->begin()), itend(actionSet->end()) ; it != itend ; ++it) { - action = dynamic_cast(&*it); + action = static_cast(&*it); if (smaller < 0) { smaller = action->getLastUpdate(); continue; @@ -65,13 +84,13 @@ void CpuModel::updateActionsStateLazy(double now, double /*delta*/) void CpuModel::updateActionsStateFull(double now, double delta) { - CpuActionLmmPtr action = NULL; + CpuActionPtr action = NULL; ActionListPtr running_actions = getRunningActionSet(); for(ActionList::iterator it(running_actions->begin()), itNext=it, itend(running_actions->end()) ; it != itend ; it=itNext) { ++itNext; - action = dynamic_cast(&*it); + action = static_cast(&*it); #ifdef HAVE_TRACING if (TRACE_is_enabled()) { CpuPtr x = (CpuPtr) lmm_constraint_id(lmm_get_cnst_from_var @@ -93,7 +112,7 @@ void CpuModel::updateActionsStateFull(double now, double delta) action->updateMaxDuration(delta); - if ((action->getRemains() <= 0) && + if ((action->getRemainsNoUpdate() <= 0) && (lmm_get_variable_weight(action->getVariable()) > 0)) { action->finish(); action->setState(SURF_ACTION_DONE); @@ -102,7 +121,6 @@ void CpuModel::updateActionsStateFull(double now, double delta) action->finish(); action->setState(SURF_ACTION_DONE); } - action->updateEnergy(); } return; @@ -112,9 +130,60 @@ void CpuModel::updateActionsStateFull(double now, double delta) * Resource * ************/ -Cpu::Cpu(int core, double powerPeak, double powerScale) - : m_core(core), m_powerPeak(powerPeak), m_powerScale(powerScale) -{} +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) + , 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) + , 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); + + p_constraintCore = NULL; + p_constraintCoreId = NULL; + if (model->getUpdateMechanism() != UM_UNDEFINED) { + p_constraintCore = xbt_new(lmm_constraint_t, core); + p_constraintCoreId = xbt_new(void*, core); + + int i; + for (i = 0; i < core; i++) { + /* just for a unique id, never used as a string. */ + p_constraintCoreId[i] = bprintf("%s:%i", name, i); + p_constraintCore[i] = lmm_constraint_new(model->getMaxminSystem(), p_constraintCoreId[i], m_powerScale * m_powerPeak); + } + } +} + +Cpu::~Cpu(){ + surf_callback_emit(cpuDestructedCallbacks, this); + if (p_constraintCoreId){ + for (int i = 0; i < m_core; i++) { + xbt_free(p_constraintCoreId[i]); + } + xbt_free(p_constraintCore); + } + if (p_constraintCoreId) + xbt_free(p_constraintCoreId); +} double Cpu::getSpeed(double load) { @@ -132,45 +201,16 @@ int Cpu::getCore() return m_core; } -CpuLmm::CpuLmm(lmm_constraint_t constraint) -: ResourceLmm(constraint), p_constraintCore(NULL), p_constraintCoreId(NULL) -{} - -CpuLmm::CpuLmm(lmm_constraint_t constraint, int core, double powerPeak, double powerScale) - : ResourceLmm(constraint) - , Cpu(core, powerPeak, powerScale) +void Cpu::setState(e_surf_resource_state_t state) { - /* At now, we assume that a VM does not have a multicore CPU. */ - if (core > 1) - xbt_assert(getModel() == surf_cpu_model_pm); - - - p_constraintCore = xbt_new(lmm_constraint_t, core); - p_constraintCoreId = xbt_new(void*, core); - - int i; - for (i = 0; i < core; i++) { - /* just for a unique id, never used as a string. */ - p_constraintCoreId[i] = bprintf("%s:%i", getName(), i); - p_constraintCore[i] = lmm_constraint_new(getModel()->getMaxminSystem(), p_constraintCoreId[i], m_powerScale * m_powerPeak); - } + Resource::setState(state); + surf_callback_emit(cpuStateChangedCallbacks, this); } - -CpuLmm::~CpuLmm(){ - if (p_constraintCore){ - for (int i = 0; i < m_core; i++) { - xbt_free(p_constraintCoreId[i]); - } - xbt_free(p_constraintCore); - xbt_free(p_constraintCoreId); - } -} - /********** * Action * **********/ -void CpuActionLmm::updateRemainingLazy(double now) +void CpuAction::updateRemainingLazy(double now) { double delta = 0.0; @@ -184,7 +224,7 @@ void CpuActionLmm::updateRemainingLazy(double now) delta = now - m_lastUpdate; if (m_remains > 0) { - XBT_CDEBUG(surf_kernel, "Updating action(%p): remains was %lf, last_update was: %lf", this, m_remains, m_lastUpdate); + 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); #ifdef HAVE_TRACING @@ -193,24 +233,13 @@ void CpuActionLmm::updateRemainingLazy(double now) 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 %lf", this, m_remains); + XBT_CDEBUG(surf_kernel, "Updating action(%p): remains is now %f", this, m_remains); } m_lastUpdate = now; m_lastValue = lmm_variable_getvalue(getVariable()); } -void CpuActionLmm::setBound(double bound) -{ - XBT_IN("(%p,%g)", this, bound); - m_bound = bound; - lmm_update_variable_bound(getModel()->getMaxminSystem(), getVariable(), bound); - - if (getModel()->getUpdateMechanism() == UM_LAZY) - heapRemove(getModel()->getActionHeap()); - XBT_OUT(); -} - /* * * This function formulates a constraint problem that pins a given task to @@ -231,10 +260,9 @@ void CpuActionLmm::setBound(double bound) * action object does not have the information about the location where the * action is being executed. */ -void CpuActionLmm::setAffinity(CpuPtr _cpu, unsigned long mask) +void CpuAction::setAffinity(CpuPtr cpu, unsigned long mask) { lmm_variable_t var_obj = getVariable(); - CpuLmmPtr cpu = reinterpret_cast(_cpu); XBT_IN("(%p,%lx)", this, mask); { @@ -277,6 +305,10 @@ void CpuActionLmm::setAffinity(CpuPtr _cpu, unsigned long mask) if (cpu->getModel()->getUpdateMechanism() == UM_LAZY) { /* FIXME (hypervisor): Do we need to do something for the LAZY mode? */ } - XBT_OUT(); } + +void CpuAction::setState(e_surf_action_state_t state){ + Action::setState(state); + surf_callback_emit(cpuActionStateChangedCallbacks, this); +}