+/* 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,
"Logging specific to the SURF cpu module");
-CpuModelPtr surf_cpu_model_pm;
-CpuModelPtr surf_cpu_model_vm;
+int autoload_surf_cpu_model = 1;
+void_f_void_t surf_cpu_model_init_preparse = NULL;
+
+simgrid::surf::CpuModel *surf_cpu_model_pm;
+simgrid::surf::CpuModel *surf_cpu_model_vm;
+
+namespace simgrid {
+namespace surf {
+
+/*************
+ * Callbacks *
+ *************/
+
+Cpu *getActionCpu(CpuAction *action) {
+ return static_cast<Cpu*>(lmm_constraint_id(lmm_get_cnst_from_var
+ (action->getModel()->getMaxminSystem(),
+ action->getVariable(), 0)));
+}
+
+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 cpu_add_traces(){
+ surf_cpu_model_pm->addTraces();
+}
/*********
* Model *
void CpuModel::updateActionsStateLazy(double now, double /*delta*/)
{
- void *_action;
- CpuActionLmmPtr action;
+ CpuAction *action;
while ((xbt_heap_size(getActionHeap()) > 0)
- && (double_equals(xbt_heap_maxkey(getActionHeap()), now))) {
- action = dynamic_cast<CpuActionLmmPtr>(static_cast<ActionLmmPtr>(xbt_heap_pop(getActionHeap())));
+ && (double_equals(xbt_heap_maxkey(getActionHeap()), now, sg_surf_precision))) {
+ action = static_cast<CpuAction*>(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<CpuPtr>(lmm_constraint_id(lmm_get_cnst_from_var(getMaxminSystem(), action->getVariable(), 0)));
+ Cpu *cpu = static_cast<Cpu*>(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);
- action->updateEnergy();
-
/* 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)
double smaller = -1;
- xbt_swag_t actionSet = getRunningActionSet();
- xbt_swag_foreach(_action, actionSet) {
- action = dynamic_cast<CpuActionLmmPtr>(static_cast<ActionPtr>(_action));
+ ActionList *actionSet = getRunningActionSet();
+ for(ActionList::iterator it(actionSet->begin()), itend(actionSet->end())
+ ; it != itend ; ++it) {
+ action = static_cast<CpuAction*>(&*it);
if (smaller < 0) {
smaller = action->getLastUpdate();
continue;
TRACE_last_timestamp_to_dump = smaller;
}
}
-#endif
return;
}
void CpuModel::updateActionsStateFull(double now, double delta)
{
- void *_action, *_next_action;
- CpuActionLmmPtr action = NULL;
- xbt_swag_t running_actions = getRunningActionSet();
+ CpuAction *action = NULL;
+ ActionList *running_actions = getRunningActionSet();
- xbt_swag_foreach_safe(_action, _next_action, running_actions) {
- action = dynamic_cast<CpuActionLmmPtr>(static_cast<ActionPtr>(_action));
-#ifdef HAVE_TRACING
+ for(ActionList::iterator it(running_actions->begin()), itNext=it, itend(running_actions->end())
+ ; it != itend ; it=itNext) {
+ ++itNext;
+ action = static_cast<CpuAction*>(&*it);
if (TRACE_is_enabled()) {
- CpuPtr x = (CpuPtr) lmm_constraint_id(lmm_get_cnst_from_var
- (getMaxminSystem(), action->getVariable(), 0));
+ Cpu *x = static_cast<Cpu*> (lmm_constraint_id(lmm_get_cnst_from_var(getMaxminSystem(), action->getVariable(), 0)) );
TRACE_surf_host_set_utilization(x->getName(),
action->getCategory(),
delta);
TRACE_last_timestamp_to_dump = now - delta;
}
-#endif
action->updateRemains(lmm_variable_getvalue(action->getVariable()) * 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);
action->finish();
action->setState(SURF_ACTION_DONE);
}
- action->updateEnergy();
}
return;
/************
* Resource *
************/
-
-Cpu::Cpu(int core, double powerPeak, double powerScale)
- : m_core(core), m_powerPeak(powerPeak), m_powerScale(powerScale)
-{}
-
-double Cpu::getSpeed(double load)
+Cpu::Cpu()
{
- return load * m_powerPeak;
}
-double Cpu::getAvailableSpeed()
-{
-/* number between 0 and 1 */
- return m_powerScale;
-}
-int Cpu::getCore()
+Cpu::Cpu(Model *model, const char *name, xbt_dict_t props,
+ int core, double speedPeak, double speedScale,
+ e_surf_resource_state_t stateInitial)
+ : Resource(model, name, props, stateInitial)
+ , m_core(core)
+ , m_speedPeak(speedPeak)
+ , m_speedScale(speedScale)
{
- 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)
+Cpu::Cpu(Model *model, const char *name, xbt_dict_t props,
+ lmm_constraint_t constraint, int core, double speedPeak,
+ double speedScale, e_surf_resource_state_t stateInitial)
+ : Resource(model, name, props, constraint, stateInitial)
+ , m_core(core)
+ , m_speedPeak(speedPeak)
+ , m_speedScale(speedScale)
{
/* At now, we assume that a VM does not have a multicore CPU. */
if (core > 1)
- xbt_assert(getModel() == surf_cpu_model_pm);
-
+ xbt_assert(model == surf_cpu_model_pm);
- p_constraintCore = xbt_new(lmm_constraint_t, core);
- p_constraintCoreId = xbt_new(void*, core);
+ 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", getName(), i);
- p_constraintCore[i] = lmm_constraint_new(getModel()->getMaxminSystem(), p_constraintCoreId[i], m_powerScale * m_powerPeak);
+ 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_speedScale * m_speedPeak);
+ }
}
}
-CpuLmm::~CpuLmm(){
- if (p_constraintCore){
+Cpu::Cpu(Model *model, const char *name, xbt_dict_t props,
+ lmm_constraint_t constraint, int core, double speedPeak, double speedScale)
+: Cpu(model, name, props, constraint, core, speedPeak, speedScale, SURF_RESOURCE_ON)
+{}
+
+Cpu::Cpu(Model *model, const char *name, xbt_dict_t props,
+ int core, double speedPeak, double speedScale)
+: Cpu(model, name, props, core, speedPeak, speedScale, SURF_RESOURCE_ON)
+{}
+
+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);
- xbt_free(p_constraintCoreId);
}
+ if (p_constraintCoreId)
+ xbt_free(p_constraintCoreId);
+}
+
+double Cpu::getCurrentPowerPeak()
+{
+ return m_speedPeak;
+}
+
+double Cpu::getSpeed(double load)
+{
+ return load * m_speedPeak;
+}
+
+double Cpu::getAvailableSpeed()
+{
+/* number between 0 and 1 */
+ return m_speedScale;
+}
+
+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 *
**********/
-void CpuActionLmm::updateRemainingLazy(double now)
+void CpuAction::updateRemainingLazy(double now)
{
double delta = 0.0;
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<CpuPtr>(lmm_constraint_id(lmm_get_cnst_from_var(getModel()->getMaxminSystem(), getVariable(), 0)));
+ Cpu *cpu = static_cast<Cpu*>(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 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
* 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(Cpu *cpu, unsigned long mask)
{
lmm_variable_t var_obj = getVariable();
- CpuLmmPtr cpu = reinterpret_cast<CpuLmmPtr>(_cpu);
XBT_IN("(%p,%lx)", this, 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);
+}
+
+}
+}
