X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/13e0c316176dfe56c04b66d96b65a174e76d0549..3dbeba193df2e406bd9eff5be73c8bce0db0185e:/src/surf/cpu_interface.cpp diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp index a55374be5d..906e07e783 100644 --- a/src/surf/cpu_interface.cpp +++ b/src/surf/cpu_interface.cpp @@ -1,12 +1,20 @@ +/* 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); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu, surf, "Logging specific to the SURF cpu module"); +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; - /************* * Callbacks * *************/ @@ -16,22 +24,39 @@ CpuPtr getActionCpu(CpuActionPtr action) { (action->getModel()->getMaxminSystem(), action->getVariable(), 0))); } -surf_callback(void, CpuPtr) createCpuCallbacks; -surf_callback(void, CpuPtr) deleteCpuCallbacks; -surf_callback(void, CpuActionPtr) updateCpuActionCallbacks; + +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; + +void cpu_parse_init(sg_platf_host_cbarg_t host){ + surf_cpu_model_pm->createCpu( + 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 cpu_add_traces(){ + surf_cpu_model_pm->addTraces(); +} /********* * Model * *********/ - void CpuModel::updateActionsStateLazy(double now, double /*delta*/) { CpuActionPtr action; while ((xbt_heap_size(getActionHeap()) > 0) - && (double_equals(xbt_heap_maxkey(getActionHeap()), now))) { - action = static_cast(static_cast(xbt_heap_pop(getActionHeap()))); + && (double_equals(xbt_heap_maxkey(getActionHeap()), now, sg_surf_precision))) { + 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))); TRACE_surf_host_set_utilization(cpu->getName(), action->getCategory(), @@ -39,19 +64,15 @@ void CpuModel::updateActionsStateLazy(double now, double /*delta*/) action->getLastUpdate(), now - action->getLastUpdate()); } -#endif action->finish(); XBT_CDEBUG(surf_kernel, "Action %p finished", action); - surf_callback_emit(updateCpuActionCallbacks, action); - /* set the remains to 0 due to precision problems when updating the remaining amount */ action->setRemains(0); 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) @@ -72,7 +93,6 @@ void CpuModel::updateActionsStateLazy(double now, double /*delta*/) TRACE_last_timestamp_to_dump = smaller; } } -#endif return; } @@ -85,7 +105,6 @@ void CpuModel::updateActionsStateFull(double now, double delta) ; it != itend ; it=itNext) { ++itNext; action = static_cast(&*it); -#ifdef HAVE_TRACING if (TRACE_is_enabled()) { CpuPtr x = (CpuPtr) lmm_constraint_id(lmm_get_cnst_from_var (getMaxminSystem(), action->getVariable(), 0)); @@ -97,7 +116,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); @@ -106,7 +124,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); @@ -115,8 +133,6 @@ void CpuModel::updateActionsStateFull(double now, double delta) action->finish(); action->setState(SURF_ACTION_DONE); } - surf_callback_emit(updateCpuActionCallbacks, action); - //action->updateEnergy(); } return; @@ -127,7 +143,7 @@ void CpuModel::updateActionsStateFull(double now, double delta) ************/ Cpu::Cpu(){ - surf_callback_emit(createCpuCallbacks, this); + surf_callback_emit(cpuCreatedCallbacks, this); } Cpu::Cpu(ModelPtr model, const char *name, xbt_dict_t props, @@ -139,7 +155,7 @@ Cpu::Cpu(ModelPtr model, const char *name, xbt_dict_t props, , p_constraintCore(NULL) , p_constraintCoreId(NULL) { - surf_callback_emit(createCpuCallbacks, this); + surf_callback_emit(cpuCreatedCallbacks, this); } Cpu::Cpu(ModelPtr model, const char *name, xbt_dict_t props, @@ -149,7 +165,7 @@ Cpu::Cpu(ModelPtr model, const char *name, xbt_dict_t props, , m_powerPeak(powerPeak) , m_powerScale(powerScale) { - surf_callback_emit(createCpuCallbacks, this); + 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); @@ -170,7 +186,7 @@ Cpu::Cpu(ModelPtr model, const char *name, xbt_dict_t props, } Cpu::~Cpu(){ - surf_callback_emit(deleteCpuCallbacks, this); + surf_callback_emit(cpuDestructedCallbacks, this); if (p_constraintCoreId){ for (int i = 0; i < m_core; i++) { xbt_free(p_constraintCoreId[i]); @@ -181,6 +197,11 @@ Cpu::~Cpu(){ xbt_free(p_constraintCoreId); } +double Cpu::getCurrentPowerPeak() +{ + return m_powerPeak; +} + double Cpu::getSpeed(double load) { return load * m_powerPeak; @@ -197,6 +218,12 @@ int Cpu::getCore() return m_core; } +void Cpu::setState(e_surf_resource_state_t state) +{ + e_surf_resource_state_t old = Resource::getState(); + Resource::setState(state); + surf_callback_emit(cpuStateChangedCallbacks, this, old, state); +} /********** * Action * **********/ @@ -215,33 +242,20 @@ void CpuAction::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); - double_update(&(m_remains), m_lastValue * delta); + 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))); 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 CpuAction::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 @@ -307,6 +321,11 @@ void CpuAction::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){ + e_surf_action_state_t old = getState(); + Action::setState(state); + surf_callback_emit(cpuActionStateChangedCallbacks, this, old, state); +}