+/* 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 {
+
+simgrid::xbt::Extension<simgrid::Host, Cpu> Cpu::EXTENSION_ID;
+
+void Cpu::classInit()
+{
+ if (!EXTENSION_ID.valid())
+ EXTENSION_ID = simgrid::Host::extension_create<simgrid::surf::Cpu>();
+}
/*************
* Callbacks *
*************/
-CpuPtr getActionCpu(CpuActionPtr action) {
- return static_cast<CpuPtr>(lmm_constraint_id(lmm_get_cnst_from_var
+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, CpuPtr) cpuCreatedCallbacks;
-surf_callback(void, CpuPtr) cpuDestructedCallbacks;
-surf_callback(void, CpuPtr) cpuStateChangedCallbacks;
-surf_callback(void, CpuActionPtr) cpuActionStateChangedCallbacks;
+simgrid::surf::signal<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*/)
{
- CpuActionPtr action;
+ CpuAction *action;
while ((xbt_heap_size(getActionHeap()) > 0)
- && (double_equals(xbt_heap_maxkey(getActionHeap()), now))) {
- action = static_cast<CpuActionPtr>(static_cast<ActionPtr>(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->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<CpuActionPtr>(&*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)
{
- 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<CpuActionPtr>(&*it);
-#ifdef HAVE_TRACING
+ 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);
/************
* Resource *
************/
-
-Cpu::Cpu(){
- surf_callback_emit(cpuCreatedCallbacks, this);
+Cpu::Cpu()
+{
}
-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,
+ int core, double speedPeak, double speedScale,
+ e_surf_resource_state_t stateInitial)
+ : Resource(model, name, stateInitial)
, m_core(core)
- , m_powerPeak(powerPeak)
- , m_powerScale(powerScale)
- , p_constraintCore(NULL)
- , p_constraintCoreId(NULL)
+ , m_speedPeak(speedPeak)
+ , m_speedScale(speedScale)
{
- 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,
+ lmm_constraint_t constraint, int core, double speedPeak,
+ double speedScale, e_surf_resource_state_t stateInitial)
+ : Resource(model, name, constraint, stateInitial)
, m_core(core)
- , m_powerPeak(powerPeak)
- , m_powerScale(powerScale)
+ , m_speedPeak(speedPeak)
+ , m_speedScale(speedScale)
{
- 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);
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);
+ p_constraintCore[i] = lmm_constraint_new(model->getMaxminSystem(), p_constraintCoreId[i], m_speedScale * m_speedPeak);
}
}
}
-Cpu::~Cpu(){
- surf_callback_emit(cpuDestructedCallbacks, this);
+Cpu::Cpu(Model *model, const char *name,
+ lmm_constraint_t constraint, int core, double speedPeak, double speedScale)
+: Cpu(model, name, constraint, core, speedPeak, speedScale, SURF_RESOURCE_ON)
+{}
+
+Cpu::Cpu(Model *model, const char *name,
+ int core, double speedPeak, double speedScale)
+: Cpu(model, name, core, speedPeak, speedScale, SURF_RESOURCE_ON)
+{}
+
+Cpu::~Cpu()
+{
if (p_constraintCoreId){
for (int i = 0; i < m_core; i++) {
xbt_free(p_constraintCoreId[i]);
xbt_free(p_constraintCoreId);
}
+double Cpu::getCurrentPowerPeak()
+{
+ return m_speedPeak;
+}
+
double Cpu::getSpeed(double load)
{
- return load * m_powerPeak;
+ return load * m_speedPeak;
}
double Cpu::getAvailableSpeed()
{
/* number between 0 and 1 */
- return m_powerScale;
+ return m_speedScale;
}
int Cpu::getCore()
return m_core;
}
-void Cpu::setState(e_surf_resource_state_t state)
+void Cpu::plug(simgrid::Host* host)
{
- Resource::setState(state);
- surf_callback_emit(cpuStateChangedCallbacks, this);
+ if (this->m_host != nullptr)
+ xbt_die("Already plugged into host %s", host->getName().c_str());
+ host->extension_set(this);
+ this->m_host = host;
}
+
/**********
* Action *
**********/
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 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
* 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);
XBT_OUT();
}
+simgrid::surf::signal<void(simgrid::surf::CpuAction*, e_surf_action_state_t, e_surf_action_state_t)> CpuAction::onStateChange;
+
void CpuAction::setState(e_surf_action_state_t state){
+ e_surf_action_state_t old = getState();
Action::setState(state);
- surf_callback_emit(cpuActionStateChangedCallbacks, this);
+ onStateChange(this, old, state);
+}
+
+}
}
