* under the terms of the license (GNU LGPL) which comes with this package. */
#include "cpu_ti.hpp"
-#include "trace_mgr_private.h"
#include "xbt/heap.h"
+#include "src/surf/trace_mgr.hpp"
+#include "src/surf/platform.hpp"
#ifndef SURF_MODEL_CPUTI_H_
#define SURF_MODEL_CPUTI_H_
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_ti, surf_cpu,
"Logging specific to the SURF CPU TRACE INTEGRATION module");
-static void cpu_ti_action_update_index_heap(void *action, int i);
+namespace simgrid {
+namespace surf {
+
+static inline
+void cpu_ti_action_update_index_heap(void *action, int i)
+{
+ ((simgrid::surf::CpuTiAction*)action)->updateIndexHeap(i);
+}
/*********
* Trace *
*********/
-CpuTiTrace::CpuTiTrace(tmgr_trace_t power_trace)
+CpuTiTrace::CpuTiTrace(tmgr_trace_t speedTrace)
{
s_tmgr_event_t val;
unsigned int cpt;
double time = 0;
int i = 0;
p_timePoints = (double*) xbt_malloc0(sizeof(double) *
- (xbt_dynar_length(power_trace->s_list.event_list) + 1));
+ (xbt_dynar_length(speedTrace->s_list.event_list) + 1));
p_integral = (double*) xbt_malloc0(sizeof(double) *
- (xbt_dynar_length(power_trace->s_list.event_list) + 1));
- m_nbPoints = xbt_dynar_length(power_trace->s_list.event_list) + 1;
- xbt_dynar_foreach(power_trace->s_list.event_list, cpt, val) {
+ (xbt_dynar_length(speedTrace->s_list.event_list) + 1));
+ m_nbPoints = xbt_dynar_length(speedTrace->s_list.event_list) + 1;
+ xbt_dynar_foreach(speedTrace->s_list.event_list, cpt, val) {
p_timePoints[i] = time;
p_integral[i] = integral;
integral += val.delta * val.value;
}
/**
- * \brief Auxiliary function to calculate the integral between a and b.
- * It simply calculates the integral at point a and b and returns the difference
- * between them.
+ * \brief Auxiliary function to compute the integral between a and b.
+ * It simply computes the integrals at point a and b and returns the difference between them.
* \param trace Trace structure
* \param a Initial point
* \param b Final point
}
/**
- * \brief Auxiliary function to calculate the integral at point a.
+ * \brief Auxiliary function to compute the integral at point a.
* \param trace Trace structure
* \param a point
* \return Integral
}
/**
-* \brief Calculate the time needed to execute "amount" on cpu.
+* \brief Computes the time needed to execute "amount" on cpu.
*
* Here, amount can span multiple trace periods
*
}
/**
-* \brief Auxiliary function to update the CPU power scale.
+* \brief Auxiliary function to update the CPU speed scale.
*
-* This function uses the trace structure to return the power scale at the determined time a.
-* \param trace Trace structure to search the updated power scale
+* This function uses the trace structure to return the speed scale at the determined time a.
+* \param trace Trace structure to search the updated speed scale
* \param a Time
-* \return CPU power scale
+* \return CPU speed scale
*/
double CpuTiTgmr::getPowerScale(double a)
{
reduced_a = a - floor(a / m_lastTime) * m_lastTime;
point = p_trace->binarySearch(p_trace->p_timePoints, reduced_a, 0,
p_trace->m_nbPoints - 1);
- xbt_dynar_get_cpy(p_powerTrace->s_list.event_list, point, &val);
+ xbt_dynar_get_cpy(p_speedTrace->s_list.event_list, point, &val);
return val.value;
}
/**
* \brief Creates a new integration trace from a tmgr_trace_t
*
-* \param power_trace CPU availability trace
-* \param value Percentage of CPU power available (useful to fixed tracing)
+* \param speedTrace CPU availability trace
+* \param value Percentage of CPU speed available (useful to fixed tracing)
* \param spacing Initial spacing
* \return Integration trace structure
*/
-CpuTiTgmr::CpuTiTgmr(tmgr_trace_t power_trace, double value)
+CpuTiTgmr::CpuTiTgmr(tmgr_trace_t speedTrace, double value)
{
double total_time = 0.0;
s_tmgr_event_t val;
p_trace = 0;
/* no availability file, fixed trace */
- if (!power_trace) {
+ if (!speedTrace) {
m_type = TRACE_FIXED;
m_value = value;
XBT_DEBUG("No availability trace. Constant value = %f", value);
}
/* only one point available, fixed trace */
- if (xbt_dynar_length(power_trace->s_list.event_list) == 1) {
- xbt_dynar_get_cpy(power_trace->s_list.event_list, 0, &val);
+ if (xbt_dynar_length(speedTrace->s_list.event_list) == 1) {
+ xbt_dynar_get_cpy(speedTrace->s_list.event_list, 0, &val);
m_type = TRACE_FIXED;
m_value = val.value;
return;
}
m_type = TRACE_DYNAMIC;
- p_powerTrace = power_trace;
+ p_speedTrace = speedTrace;
/* count the total time of trace file */
- xbt_dynar_foreach(power_trace->s_list.event_list, cpt, val) {
+ xbt_dynar_foreach(speedTrace->s_list.event_list, cpt, val) {
total_time += val.delta;
}
- p_trace = new CpuTiTrace(power_trace);
+ p_trace = new CpuTiTrace(speedTrace);
m_lastTime = total_time;
m_total = p_trace->integrateSimple(0, total_time);
return low;
}
+}
+}
+
/*************
* CallBacks *
*************/
static void cpu_ti_define_callbacks()
{
- sg_platf_host_add_cb(cpu_parse_init);
- sg_platf_postparse_add_cb(cpu_add_traces);
+ simgrid::surf::on_postparse.connect([]() {
+ surf_cpu_model_pm->addTraces();
+ });
}
/*********
xbt_assert(!surf_cpu_model_pm,"CPU model already initialized. This should not happen.");
xbt_assert(!surf_cpu_model_vm,"CPU model already initialized. This should not happen.");
- surf_cpu_model_pm = new CpuTiModel();
- surf_cpu_model_vm = new CpuTiModel();
+ surf_cpu_model_pm = new simgrid::surf::CpuTiModel();
+ surf_cpu_model_vm = new simgrid::surf::CpuTiModel();
cpu_ti_define_callbacks();
- Model *model_pm = static_cast<Model*>(surf_cpu_model_pm);
- Model *model_vm = static_cast<Model*>(surf_cpu_model_vm);
- xbt_dynar_push(model_list, &model_pm);
- xbt_dynar_push(model_list, &model_vm);
+ simgrid::surf::Model *model_pm = static_cast<simgrid::surf::Model*>(surf_cpu_model_pm);
+ simgrid::surf::Model *model_vm = static_cast<simgrid::surf::Model*>(surf_cpu_model_vm);
+ xbt_dynar_push(all_existing_models, &model_pm);
+ xbt_dynar_push(all_existing_models, &model_vm);
}
+namespace simgrid {
+namespace surf {
+
CpuTiModel::CpuTiModel() : CpuModel()
{
p_runningActionSetThatDoesNotNeedBeingChecked = new ActionList();
xbt_heap_free(p_tiActionHeap);
}
-Cpu *CpuTiModel::createCpu(const char *name,
- xbt_dynar_t powerPeak,
+Cpu *CpuTiModel::createCpu(simgrid::s4u::Host *host,
+ xbt_dynar_t speedPeak,
int pstate,
- double powerScale,
- tmgr_trace_t powerTrace,
+ double speedScale,
+ tmgr_trace_t speedTrace,
int core,
- e_surf_resource_state_t stateInitial,
- tmgr_trace_t stateTrace,
- xbt_dict_t cpuProperties)
+ int initiallyOn,
+ tmgr_trace_t stateTrace)
{
xbt_assert(core==1,"Multi-core not handled with this model yet");
- sg_host_t host = sg_host_by_name(name);
- xbt_assert(!sg_host_surfcpu(host),
- "Host '%s' declared several times in the platform file",
- name);
- xbt_assert(xbt_dynar_getfirst_as(powerPeak, double) > 0.0,
- "Power has to be >0.0. Did you forget to specify the mandatory power attribute?");
- CpuTi *cpu = new CpuTi(this, name, powerPeak, pstate, powerScale, powerTrace,
- core, stateInitial, stateTrace, cpuProperties);
- sg_host_surfcpu_set(host, cpu);
+ xbt_assert(xbt_dynar_getfirst_as(speedPeak, double) > 0.0,
+ "Speed has to be >0.0. Did you forget to specify the mandatory speed attribute?");
+ CpuTi *cpu = new CpuTi(this, host, speedPeak, pstate, speedScale, speedTrace,
+ core, initiallyOn, stateTrace);
return cpu;
}
/* connect all traces relative to hosts */
xbt_dict_foreach(trace_connect_list_host_avail, cursor, trace_name, elm) {
tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name);
- CpuTi *cpu = static_cast<CpuTi*>(sg_host_surfcpu(sg_host_by_name(elm)));
+ CpuTi *cpu = static_cast<CpuTi*>(sg_host_by_name(elm)->pimpl_cpu);
xbt_assert(cpu, "Host %s undefined", elm);
xbt_assert(trace, "Trace %s undefined", trace_name);
continue;
}
XBT_DEBUG("Add state trace: %s to CPU(%s)", trace_name, elm);
- cpu->p_stateEvent = tmgr_history_add_trace(history, trace, 0.0, 0, cpu);
+ cpu->p_stateEvent = future_evt_set->add_trace(trace, 0.0, 0, cpu);
}
xbt_dict_foreach(trace_connect_list_power, cursor, trace_name, elm) {
tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name);
- CpuTi *cpu = static_cast<CpuTi*>(sg_host_surfcpu(sg_host_by_name(elm)));
+ CpuTi *cpu = static_cast<CpuTi*>(sg_host_by_name(elm)->pimpl_cpu);
xbt_assert(cpu, "Host %s undefined", elm);
xbt_assert(trace, "Trace %s undefined", trace_name);
- XBT_DEBUG("Add power trace: %s to CPU(%s)", trace_name, elm);
+ XBT_DEBUG("Add speed trace: %s to CPU(%s)", trace_name, elm);
if (cpu->p_availTrace)
delete cpu->p_availTrace;
- cpu->p_availTrace = new CpuTiTgmr(trace, cpu->m_powerScale);
+ cpu->p_availTrace = new CpuTiTgmr(trace, cpu->m_speedScale);
/* add a fake trace event if periodicity == 0 */
if (trace && xbt_dynar_length(trace->s_list.event_list) > 1) {
xbt_dynar_get_cpy(trace->s_list.event_list,
xbt_dynar_length(trace->s_list.event_list) - 1, &val);
if (val.delta == 0) {
- tmgr_trace_t empty_trace;
- empty_trace = tmgr_empty_trace_new();
- cpu->p_powerEvent =
- tmgr_history_add_trace(history, empty_trace,
- cpu->p_availTrace->m_lastTime, 0, cpu);
+ cpu->p_speedEvent =
+ future_evt_set->add_trace(tmgr_empty_trace_new(), cpu->p_availTrace->m_lastTime, 0, cpu);
}
}
}
/************
* Resource *
************/
-CpuTi::CpuTi(CpuTiModel *model, const char *name, xbt_dynar_t powerPeak,
- int pstate, double powerScale, tmgr_trace_t powerTrace, int core,
- e_surf_resource_state_t stateInitial, tmgr_trace_t stateTrace,
- xbt_dict_t properties)
-: Cpu(model, name, properties, core, 0, powerScale)
-{
- p_powerEvent = NULL;
- setState(stateInitial);
- m_powerScale = powerScale;
+CpuTi::CpuTi(CpuTiModel *model, simgrid::s4u::Host *host, xbt_dynar_t speedPeak,
+ int pstate, double speedScale, tmgr_trace_t speedTrace, int core,
+ int initiallyOn, tmgr_trace_t stateTrace)
+ : Cpu(model, host, NULL, pstate, core, 0, speedScale, initiallyOn)
+{
+ xbt_assert(core==1,"Multi-core not handled by this model yet");
m_core = core;
- tmgr_trace_t empty_trace;
- s_tmgr_event_t val;
- xbt_assert(core==1,"Multi-core not handled with this model yet");
- XBT_DEBUG("power scale %f", powerScale);
- p_availTrace = new CpuTiTgmr(powerTrace, powerScale);
- p_actionSet = new ActionTiList();
+ m_speedScale = speedScale;
+ p_availTrace = new CpuTiTgmr(speedTrace, speedScale);
- m_lastUpdate = 0;
+ p_actionSet = new ActionTiList();
- xbt_dynar_get_cpy(powerPeak, 0, &m_powerPeak);
- xbt_dynar_free(&powerPeak); /* kill memory leak */
- XBT_DEBUG("CPU create: peak=%f", m_powerPeak);
+ xbt_dynar_get_cpy(speedPeak, 0, &m_speedPeak);
+ XBT_DEBUG("CPU create: peak=%f", m_speedPeak);
if (stateTrace)
- p_stateEvent = tmgr_history_add_trace(history, stateTrace, 0.0, 0, this);
- if (powerTrace && xbt_dynar_length(powerTrace->s_list.event_list) > 1) {
+ p_stateEvent = future_evt_set->add_trace(stateTrace, 0.0, 0, this);
+
+ if (speedTrace && xbt_dynar_length(speedTrace->s_list.event_list) > 1) {
+ s_tmgr_event_t val;
// add a fake trace event if periodicity == 0
- xbt_dynar_get_cpy(powerTrace->s_list.event_list,
- xbt_dynar_length(powerTrace->s_list.event_list) - 1, &val);
+ xbt_dynar_get_cpy(speedTrace->s_list.event_list,
+ xbt_dynar_length(speedTrace->s_list.event_list) - 1, &val);
if (val.delta == 0) {
- empty_trace = tmgr_empty_trace_new();
- p_powerEvent =
- tmgr_history_add_trace(history, empty_trace,
- p_availTrace->m_lastTime, 0, this);
+ p_speedEvent =
+ future_evt_set->add_trace(tmgr_empty_trace_new(), p_availTrace->m_lastTime, 0, this);
}
}
-};
+}
-CpuTi::~CpuTi(){
+CpuTi::~CpuTi()
+{
modified(false);
delete p_availTrace;
delete p_actionSet;
}
-void CpuTi::updateState(tmgr_trace_event_t event_type,
+void CpuTi::updateState(tmgr_trace_iterator_t event_type,
double value, double date)
{
CpuTiAction *action;
- if (event_type == p_powerEvent) {
- tmgr_trace_t power_trace;
+ if (event_type == p_speedEvent) {
+ tmgr_trace_t speedTrace;
CpuTiTgmr *trace;
s_tmgr_event_t val;
modified(true);
- power_trace = p_availTrace->p_powerTrace;
- xbt_dynar_get_cpy(power_trace->s_list.event_list,
- xbt_dynar_length(power_trace->s_list.event_list) - 1, &val);
+ speedTrace = p_availTrace->p_speedTrace;
+ xbt_dynar_get_cpy(speedTrace->s_list.event_list,
+ xbt_dynar_length(speedTrace->s_list.event_list) - 1, &val);
/* free old trace */
delete p_availTrace;
- m_powerScale = val.value;
+ m_speedScale = val.value;
trace = new CpuTiTgmr(TRACE_FIXED, val.value);
XBT_DEBUG("value %f", val.value);
p_availTrace = trace;
if (tmgr_trace_event_free(event_type))
- p_powerEvent = NULL;
+ p_speedEvent = NULL;
} else if (event_type == p_stateEvent) {
if (value > 0) {
- if(getState() == SURF_RESOURCE_OFF)
+ if(isOff())
xbt_dynar_push_as(host_that_restart, char*, (char *)getName());
- setState(SURF_RESOURCE_ON);
+ turnOn();
} else {
- setState(SURF_RESOURCE_OFF);
+ turnOff();
/* put all action running on cpu to failed */
for(ActionTiList::iterator it(p_actionSet->begin()), itend(p_actionSet->end())
CpuTiAction *action;
double sum_priority = 0.0, total_area, min_finish = -1;
-/* update remaning amount of actions */
-updateRemainingAmount(now);
+ /* update remaining amount of actions */
+ updateRemainingAmount(now);
for(ActionTiList::iterator it(p_actionSet->begin()), itend(p_actionSet->end())
; it != itend ; ++it) {
(action->getRemains()) * sum_priority *
action->getPriority();
- total_area /= m_powerPeak;
+ total_area /= m_speedPeak;
action->setFinishTime(p_availTrace->solve(now, total_area));
/* verify which event will happen before (max_duration or finish time) */
action->m_finish,
action->getMaxDuration());
}
-/* remove from modified cpu */
+ /* remove from modified cpu */
modified(false);
}
double CpuTi::getAvailableSpeed()
{
- m_powerScale = p_availTrace->getPowerScale(surf_get_clock());
+ m_speedScale = p_availTrace->getPowerScale(surf_get_clock());
return Cpu::getAvailableSpeed();
}
-/**
-* \brief Update the remaining amount of actions
-*
-* \param now Current time
-*/
+/** @brief Update the remaining amount of actions */
void CpuTi::updateRemainingAmount(double now)
{
double area_total;
if (m_lastUpdate >= now)
return;
-/* calcule the surface */
- area_total = p_availTrace->integrate(m_lastUpdate, now) * m_powerPeak;
+ /* compute the integration area */
+ area_total = p_availTrace->integrate(m_lastUpdate, now) * m_speedPeak;
XBT_DEBUG("Flops total: %f, Last update %f", area_total,
m_lastUpdate);
CpuAction *CpuTi::execute(double size)
{
XBT_IN("(%s,%g)", getName(), size);
- CpuTiAction *action = new CpuTiAction(static_cast<CpuTiModel*>(getModel()), size, getState() != SURF_RESOURCE_ON, this);
+ CpuTiAction *action = new CpuTiAction(static_cast<CpuTiModel*>(getModel()), size, isOff(), this);
p_actionSet->push_back(*action);
duration = MAX(duration, sg_surf_precision);
XBT_IN("(%s,%g)", getName(), duration);
- CpuTiAction *action = new CpuTiAction(static_cast<CpuTiModel*>(getModel()), 1.0, getState() != SURF_RESOURCE_ON, this);
+ CpuTiAction *action = new CpuTiAction(static_cast<CpuTiModel*>(getModel()), 1.0, isOff(), this);
action->m_maxDuration = duration;
action->m_suspended = 2;
* Action *
**********/
-static void cpu_ti_action_update_index_heap(void *action, int i)
-{
-((CpuTiAction*)action)->updateIndexHeap(i);
-}
-
CpuTiAction::CpuTiAction(CpuTiModel *model_, double cost, bool failed,
CpuTi *cpu)
: CpuAction(model_, cost, failed)
{
- m_suspended = 0; /* Should be useless because of the
- calloc but it seems to help valgrind... */
p_cpu = cpu;
m_indexHeap = -1;
p_cpu->modified(true);
XBT_OUT();
}
-bool CpuTiAction::isSuspended()
-{
- return m_suspended == 1;
-}
-
void CpuTiAction::setMaxDuration(double duration)
{
double min_finish;
return m_remains;
}
-#endif /* SURF_MODEL_CPUTI_H_ */
+}
+}
+#endif /* SURF_MODEL_CPUTI_H_ */
