+/* 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_ti.hpp"
-//#include "solver.hpp"
#include "trace_mgr_private.h"
#include "xbt/heap.h"
#ifndef SURF_MODEL_CPUTI_H_
#define SURF_MODEL_CPUTI_H_
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surfpp_cpu_tii, surfpp,
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_ti, surf_cpu,
"Logging specific to the SURF CPU TRACE INTEGRATION module");
-static xbt_swag_t cpu_ti_running_action_set_that_does_not_need_being_checked;
-static xbt_swag_t cpu_ti_modified_cpu;
-static xbt_heap_t cpu_ti_action_heap;
-
-static CpuTiModelPtr surf_cpu_model = NULL;
-
-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);
- 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
ind = binarySearch(p_timePoints, a, 0, m_nbPoints - 1);
integral += p_integral[ind];
XBT_DEBUG
- ("a %lf ind %d integral %lf ind + 1 %lf ind %lf time +1 %lf time %lf",
+ ("a %f ind %d integral %f ind + 1 %f ind %f time +1 %f time %f",
a, ind, integral, p_integral[ind + 1], p_integral[ind],
p_timePoints[ind + 1], p_timePoints[ind]);
- double_update(&a_aux, p_timePoints[ind]);
+ double_update(&a_aux, p_timePoints[ind], sg_maxmin_precision*sg_surf_precision);
if (a_aux > 0)
integral +=
((p_integral[ind + 1] -
p_integral[ind]) / (p_timePoints[ind + 1] -
p_timePoints[ind])) * (a - p_timePoints[ind]);
- XBT_DEBUG("Integral a %lf = %lf", a, integral);
+ XBT_DEBUG("Integral a %f = %f", a, integral);
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
*
return (a + (amount / m_value));
}
- XBT_DEBUG("amount %lf total %lf", amount, m_total);
+ XBT_DEBUG("amount %f total %f", amount, m_total);
/* Reduce the problem to one where amount <= trace_total */
quotient = (int) (floor(amount / m_total));
reduced_amount = (m_total) * ((amount / m_total) -
floor(amount / m_total));
reduced_a = a - (m_lastTime) * (int) (floor(a / m_lastTime));
- XBT_DEBUG("Quotient: %d reduced_amount: %lf reduced_a: %lf", quotient,
+ XBT_DEBUG("Quotient: %d reduced_amount: %f reduced_a: %f", quotient,
reduced_amount, reduced_a);
/* Now solve for new_amount which is <= trace_total */
* It returns the date when the requested amount of flops is available
* \param trace Trace structure
* \param a Initial point
- * \param amount Amount of flops
+ * \param amount Amount of flops
* \return The date when amount is available.
*/
double CpuTiTrace::solveSimple(double a, double amount)
}
/**
-* \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;
unsigned int cpt;
+ p_trace = 0;
/* no availability file, fixed trace */
- if (!power_trace) {
+ if (!speedTrace) {
m_type = TRACE_FIXED;
m_value = value;
- XBT_DEBUG("No availabily trace. Constant value = %lf", value);
+ XBT_DEBUG("No availability trace. Constant value = %f", value);
return;
}
/* 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);
- XBT_DEBUG("Total integral %lf, last_time %lf ",
+ XBT_DEBUG("Total integral %f, last_time %f ",
m_total, m_lastTime);
}
/**
* \brief Binary search in array.
- * It returns the first point of the interval in which "a" is.
+ * It returns the first point of the interval in which "a" is.
* \param array Array
* \param a Value to search
* \param low Low bound to search in array
int mid;
do {
mid = low + (high - low) / 2;
- XBT_DEBUG("a %lf low %d high %d mid %d value %lf", a, low, high, mid,
+ XBT_DEBUG("a %f low %d high %d mid %d value %f", a, low, high, mid,
array[mid]);
if (array[mid] > a)
return low;
}
+}
+}
+
+/*************
+ * CallBacks *
+ *************/
+
+static void cpu_ti_define_callbacks()
+{
+ sg_platf_postparse_add_cb(simgrid::surf::cpu_add_traces);
+}
+
/*********
* Model *
*********/
-CpuTiModel::CpuTiModel() : CpuModel("cpu_ti")
+void surf_cpu_model_init_ti()
{
- xbt_assert(!surf_cpu_model,"CPU model already initialized. This should not happen.");
- surf_cpu_model = this;
- CpuTiAction action;
- CpuTi cpu;
-
- cpu_ti_running_action_set_that_does_not_need_being_checked =
- xbt_swag_new(xbt_swag_offset(action, p_stateHookup));
+ 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.");
- cpu_ti_modified_cpu =
- xbt_swag_new(xbt_swag_offset(cpu, p_modifiedCpuHookup));
+ surf_cpu_model_pm = new simgrid::surf::CpuTiModel();
+ surf_cpu_model_vm = new simgrid::surf::CpuTiModel();
- cpu_ti_action_heap = xbt_heap_new(8, NULL);
- xbt_heap_set_update_callback(cpu_ti_action_heap,
- cpu_ti_action_update_index_heap);
- /* Define callbacks */
- //TODO sg_platf_host_add_cb(parse_cpu_ti_init);
- //TODO sg_platf_postparse_add_cb(add_traces_cpu_ti);
-
- xbt_dynar_push(model_list, &surf_cpu_model);
+ cpu_ti_define_callbacks();
+ 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);
}
-CpuTiModel::~CpuTiModel()
-{
- void **cpu;
- xbt_lib_cursor_t cursor;
- char *key;
+namespace simgrid {
+namespace surf {
- xbt_lib_foreach(host_lib, cursor, key, cpu){
- if(cpu[SURF_CPU_LEVEL])
- {
- CpuTiPtr CPU = (CpuTiPtr) cpu[SURF_CPU_LEVEL];
- xbt_swag_free(CPU->p_actionSet);
- delete CPU->p_availTrace;
- }
- }
+CpuTiModel::CpuTiModel() : CpuModel()
+{
+ p_runningActionSetThatDoesNotNeedBeingChecked = new ActionList();
- delete surf_cpu_model;
- surf_cpu_model = NULL;
+ p_modifiedCpu = new CpuTiList();
- xbt_swag_free
- (cpu_ti_running_action_set_that_does_not_need_being_checked);
- xbt_swag_free(cpu_ti_modified_cpu);
- cpu_ti_running_action_set_that_does_not_need_being_checked = NULL;
- xbt_heap_free(cpu_ti_action_heap);
+ p_tiActionHeap = xbt_heap_new(8, NULL);
+ xbt_heap_set_update_callback(p_tiActionHeap,
+ cpu_ti_action_update_index_heap);
}
-void CpuTiModel::parseInit(sg_platf_host_cbarg_t host)
+CpuTiModel::~CpuTiModel()
{
- createResource(host->id,
- host->power_peak,
- host->power_scale,
- host->power_trace,
- host->core_amount,
- host->initial_state,
- host->state_trace,
- host->properties);
+ surf_cpu_model_pm = NULL;
+ delete p_runningActionSetThatDoesNotNeedBeingChecked;
+ delete p_modifiedCpu;
+ xbt_heap_free(p_tiActionHeap);
}
-CpuTiPtr CpuTiModel::createResource(const char *name,
- double powerPeak,
- double powerScale,
- tmgr_trace_t powerTrace,
+Cpu *CpuTiModel::createCpu(simgrid::Host *host,
+ xbt_dynar_t speedPeak,
+ int pstate,
+ double speedScale,
+ tmgr_trace_t speedTrace,
int core,
e_surf_resource_state_t stateInitial,
- tmgr_trace_t stateTrace,
- xbt_dict_t cpuProperties)
+ tmgr_trace_t stateTrace)
{
- tmgr_trace_t empty_trace;
- s_tmgr_event_t val;
- CpuTiActionPtr cpuAction;
xbt_assert(core==1,"Multi-core not handled with this model yet");
- xbt_assert(!surf_cpu_resource_priv(surf_cpu_resource_by_name(name)),
- "Host '%s' declared several times in the platform file",
- name);
- CpuTiPtr cpu = new CpuTi(this, name, powerPeak, powerScale, powerTrace,
- core, stateInitial, stateTrace, cpuProperties);
- xbt_lib_set(host_lib, name, SURF_CPU_LEVEL, cpu);
- return (CpuTiPtr) xbt_lib_get_elm_or_null(host_lib, name);
-}
-
-CpuTiActionPtr CpuTiModel::createAction(double cost, bool failed)
-{
- return NULL;//new CpuTiAction(this, cost, failed);
+ 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, stateInitial, stateTrace);
+ return cpu;
}
double CpuTiModel::shareResources(double now)
{
- void *_cpu, *_cpu_next;
double min_action_duration = -1;
/* iterates over modified cpus to update share resources */
- xbt_swag_foreach_safe(_cpu, _cpu_next, cpu_ti_modified_cpu) {
- ((CpuTiPtr)_cpu)->updateActionFinishDate(now);
+ for(CpuTiList::iterator it(p_modifiedCpu->begin()), itend(p_modifiedCpu->end())
+ ; it != itend ;) {
+ CpuTi *ti = &*it;
+ ++it;
+ ti->updateActionsFinishTime(now);
}
+
/* get the min next event if heap not empty */
- if (xbt_heap_size(cpu_ti_action_heap) > 0)
- min_action_duration = xbt_heap_maxkey(cpu_ti_action_heap) - now;
+ if (xbt_heap_size(p_tiActionHeap) > 0)
+ min_action_duration = xbt_heap_maxkey(p_tiActionHeap) - now;
- XBT_DEBUG("Share resources, min next event date: %lf", min_action_duration);
+ XBT_DEBUG("Share resources, min next event date: %f", min_action_duration);
return min_action_duration;
}
-void CpuTiModel::updateActionsState(double now, double delta)
+void CpuTiModel::updateActionsState(double now, double /*delta*/)
{
- while ((xbt_heap_size(cpu_ti_action_heap) > 0)
- && (xbt_heap_maxkey(cpu_ti_action_heap) <= now)) {
- CpuTiActionPtr action = (CpuTiActionPtr) xbt_heap_pop(cpu_ti_action_heap);
+ while ((xbt_heap_size(p_tiActionHeap) > 0)
+ && (xbt_heap_maxkey(p_tiActionHeap) <= now)) {
+ CpuTiAction *action = (CpuTiAction*) xbt_heap_pop(p_tiActionHeap);
XBT_DEBUG("Action %p: finish", action);
- action->m_finish = surf_get_clock();
+ action->finish();
/* set the remains to 0 due to precision problems when updating the remaining amount */
- action->m_remains = 0;
+ action->setRemains(0);
action->setState(SURF_ACTION_DONE);
- /* update remaining amout of all actions */
+ /* update remaining amount of all actions */
action->p_cpu->updateRemainingAmount(surf_get_clock());
}
}
/* 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);
- CpuTiPtr cpu = (CpuTiPtr) surf_cpu_resource_priv(surf_cpu_resource_by_name(elm));
+ CpuTi *cpu = static_cast<CpuTi*>(sg_host_by_name(elm)->p_cpu);
xbt_assert(cpu, "Host %s undefined", elm);
xbt_assert(trace, "Trace %s undefined", trace_name);
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);
- CpuTiPtr cpu = (CpuTiPtr) surf_cpu_resource_priv(surf_cpu_resource_by_name(elm));
+ CpuTi *cpu = static_cast<CpuTi*>(sg_host_by_name(elm)->p_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) {
if (val.delta == 0) {
tmgr_trace_t empty_trace;
empty_trace = tmgr_empty_trace_new();
- cpu->p_powerEvent =
+ cpu->p_speedEvent =
tmgr_history_add_trace(history, empty_trace,
cpu->p_availTrace->m_lastTime, 0, cpu);
}
/************
* Resource *
************/
-CpuTi::CpuTi(CpuTiModelPtr model, const char *name, double powerPeak,
- 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), p_stateCurrent(stateInitial) {
- m_powerPeak = powerPeak;
- m_powerScale = powerScale;
+CpuTi::CpuTi(CpuTiModel *model, simgrid::Host *host, xbt_dynar_t speedPeak,
+ int pstate, double speedScale, tmgr_trace_t speedTrace, int core,
+ e_surf_resource_state_t stateInitial, tmgr_trace_t stateTrace)
+ : Cpu(model, host, NULL, pstate, core, 0, speedScale, stateInitial)
+{
+ 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 %lf", powerScale);
- p_availTrace = new CpuTiTgmr(powerTrace, powerScale);
+
+ m_speedScale = speedScale;
+ p_availTrace = new CpuTiTgmr(speedTrace, speedScale);
+
+ p_actionSet = new ActionTiList();
+
+ 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) {
- // 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);
+
+ 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(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);
+ tmgr_trace_t empty_trace = tmgr_empty_trace_new();
+ p_speedEvent = tmgr_history_add_trace(history, empty_trace, p_availTrace->m_lastTime, 0, this);
}
}
-};
+}
+
+CpuTi::~CpuTi()
+{
+ modified(false);
+ delete p_availTrace;
+ delete p_actionSet;
+}
void CpuTi::updateState(tmgr_trace_event_t event_type,
double value, double date)
{
- void *_action;
- CpuTiActionPtr action;
+ CpuTiAction *action;
- surf_watched_hosts();
-
- if (event_type == p_powerEvent) {
- tmgr_trace_t power_trace;
- CpuTiTgmrPtr trace;
+ if (event_type == p_speedEvent) {
+ tmgr_trace_t speedTrace;
+ CpuTiTgmr *trace;
s_tmgr_event_t val;
- XBT_DEBUG("Finish trace date: %lf value %lf date %lf", surf_get_clock(),
+ XBT_DEBUG("Finish trace date: %f value %f date %f", surf_get_clock(),
value, date);
/* update remaining of actions and put in modified cpu swag */
updateRemainingAmount(date);
- xbt_swag_insert(this, cpu_ti_modified_cpu);
- 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);
+ modified(true);
+
+ 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 %lf", 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)
- p_stateCurrent = SURF_RESOURCE_ON;
- else {
- p_stateCurrent = SURF_RESOURCE_OFF;
+ if (value > 0) {
+ if(getState() == SURF_RESOURCE_OFF)
+ xbt_dynar_push_as(host_that_restart, char*, (char *)getName());
+ setState(SURF_RESOURCE_ON);
+ } else {
+ setState(SURF_RESOURCE_OFF);
/* put all action running on cpu to failed */
- xbt_swag_foreach(_action, p_actionSet) {
- action = (CpuTiActionPtr) _action;
+ for(ActionTiList::iterator it(p_actionSet->begin()), itend(p_actionSet->end())
+ ; it != itend ; ++it) {
+ action = &*it;
if (action->getState() == SURF_ACTION_RUNNING
|| action->getState() == SURF_ACTION_READY
|| action->getState() == SURF_ACTION_NOT_IN_THE_SYSTEM) {
- action->m_finish = date;
+ action->setFinishTime(date);
action->setState(SURF_ACTION_FAILED);
if (action->m_indexHeap >= 0) {
- CpuTiActionPtr heap_act = (CpuTiActionPtr)
- xbt_heap_remove(cpu_ti_action_heap, action->m_indexHeap);
+ CpuTiAction *heap_act = (CpuTiAction*)
+ xbt_heap_remove(static_cast<CpuTiModel*>(getModel())->p_tiActionHeap, action->m_indexHeap);
if (heap_act != action)
DIE_IMPOSSIBLE;
}
return;
}
-void CpuTi::updateActionFinishDate(double now)
+void CpuTi::updateActionsFinishTime(double now)
{
- void *_action;
- CpuTiActionPtr action;
+ 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);
- xbt_swag_foreach(_action, p_actionSet) {
- action = (CpuTiActionPtr) _action;
+ for(ActionTiList::iterator it(p_actionSet->begin()), itend(p_actionSet->end())
+ ; it != itend ; ++it) {
+ action = &*it;
/* action not running, skip it */
- if (action->p_stateSet !=
- surf_cpu_model->p_runningActionSet)
+ if (action->getStateSet() !=
+ surf_cpu_model_pm->getRunningActionSet())
continue;
/* bogus priority, skip it */
- if (action->m_priority <= 0)
+ if (action->getPriority() <= 0)
continue;
/* action suspended, skip it */
if (action->m_suspended != 0)
continue;
- sum_priority += 1.0 / action->m_priority;
+ sum_priority += 1.0 / action->getPriority();
}
m_sumPriority = sum_priority;
- xbt_swag_foreach(_action, p_actionSet) {
- action = (CpuTiActionPtr) _action;
+ for(ActionTiList::iterator it(p_actionSet->begin()), itend(p_actionSet->end())
+ ; it != itend ; ++it) {
+ action = &*it;
min_finish = -1;
/* action not running, skip it */
- if (action->p_stateSet !=
- surf_cpu_model->p_runningActionSet)
+ if (action->getStateSet() !=
+ surf_cpu_model_pm->getRunningActionSet())
continue;
/* verify if the action is really running on cpu */
- if (action->m_suspended == 0 && action->m_priority > 0) {
+ if (action->m_suspended == 0 && action->getPriority() > 0) {
/* total area needed to finish the action. Used in trace integration */
total_area =
- (action->m_remains) * sum_priority *
- action->m_priority;
+ (action->getRemains()) * sum_priority *
+ action->getPriority();
- total_area /= m_powerPeak;
+ total_area /= m_speedPeak;
- action->m_finish = p_availTrace->solve(now, total_area);
+ action->setFinishTime(p_availTrace->solve(now, total_area));
/* verify which event will happen before (max_duration or finish time) */
- if (action->m_maxDuration != NO_MAX_DURATION &&
- action->m_start + action->m_maxDuration < action->m_finish)
- min_finish = action->m_start + action->m_maxDuration;
+ if (action->getMaxDuration() != NO_MAX_DURATION &&
+ action->getStartTime() + action->getMaxDuration() < action->m_finish)
+ min_finish = action->getStartTime() + action->getMaxDuration();
else
min_finish = action->m_finish;
} else {
/* put the max duration time on heap */
- if (action->m_maxDuration != NO_MAX_DURATION)
- min_finish = action->m_start + action->m_maxDuration;
+ if (action->getMaxDuration() != NO_MAX_DURATION)
+ min_finish = action->getStartTime() + action->getMaxDuration();
}
/* add in action heap */
XBT_DEBUG("action(%p) index %d", action, action->m_indexHeap);
if (action->m_indexHeap >= 0) {
- CpuTiActionPtr heap_act = (CpuTiActionPtr)
- xbt_heap_remove(cpu_ti_action_heap, action->m_indexHeap);
+ CpuTiAction *heap_act = (CpuTiAction*)
+ xbt_heap_remove(static_cast<CpuTiModel*>(getModel())->p_tiActionHeap, action->m_indexHeap);
if (heap_act != action)
DIE_IMPOSSIBLE;
}
if (min_finish != NO_MAX_DURATION)
- xbt_heap_push(cpu_ti_action_heap, action, min_finish);
+ xbt_heap_push(static_cast<CpuTiModel*>(getModel())->p_tiActionHeap, action, min_finish);
XBT_DEBUG
- ("Update finish time: Cpu(%s) Action: %p, Start Time: %lf Finish Time: %lf Max duration %lf",
- m_name, action, action->m_start,
+ ("Update finish time: Cpu(%s) Action: %p, Start Time: %f Finish Time: %f Max duration %f",
+ getName(), action, action->getStartTime(),
action->m_finish,
- action->m_maxDuration);
+ action->getMaxDuration());
}
-/* remove from modified cpu */
- xbt_swag_remove(this, cpu_ti_modified_cpu);
+ /* remove from modified cpu */
+ modified(false);
}
-CpuTiModelPtr CpuTi::getModel()
-{
- return static_cast<CpuTiModelPtr>(p_model);
-};
-
bool CpuTi::isUsed()
{
- return xbt_swag_size(p_actionSet);
+ return !p_actionSet->empty();
}
-
-
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;
- void* _action;
- CpuTiActionPtr action;
+ CpuTiAction *action;
/* already updated */
if (m_lastUpdate >= now)
return;
-/* calcule the surface */
- area_total = p_availTrace->integrate(m_lastUpdate, now) * m_powerPeak;
- XBT_DEBUG("Flops total: %lf, Last update %lf", area_total,
+ /* 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);
- xbt_swag_foreach(_action, p_actionSet) {
- action = (CpuTiActionPtr) _action;
+ for(ActionTiList::iterator it(p_actionSet->begin()), itend(p_actionSet->end())
+ ; it != itend ; ++it) {
+ action = &*it;
/* action not running, skip it */
- if (action->p_stateSet !=
- getModel()->p_runningActionSet)
+ if (action->getStateSet() !=
+ getModel()->getRunningActionSet())
continue;
/* bogus priority, skip it */
- if (action->m_priority <= 0)
+ if (action->getPriority() <= 0)
continue;
/* action suspended, skip it */
continue;
/* action don't need update */
- if (action->m_start >= now)
+ if (action->getStartTime() >= now)
continue;
/* skip action that are finishing now */
continue;
/* update remaining */
- double_update(&(action->m_remains),
- area_total / (m_sumPriority *
- action->m_priority));
- XBT_DEBUG("Update remaining action(%p) remaining %lf", action,
+ action->updateRemains(area_total / (m_sumPriority * action->getPriority()));
+ XBT_DEBUG("Update remaining action(%p) remaining %f", action,
action->m_remains);
}
m_lastUpdate = now;
}
-CpuActionPtr CpuTi::execute(double size)
+CpuAction *CpuTi::execute(double size)
{
- XBT_IN("(%s,%g)", m_name, size);
- CpuTiActionPtr action = new CpuTiAction(surf_cpu_model, size, p_stateCurrent != SURF_RESOURCE_ON);
-
- action->p_cpu = this;
- action->m_indexHeap = -1;
+ XBT_IN("(%s,%g)", getName(), size);
+ CpuTiAction *action = new CpuTiAction(static_cast<CpuTiModel*>(getModel()), size, getState() != SURF_RESOURCE_ON, this);
- xbt_swag_insert(this, cpu_ti_modified_cpu);
-
- xbt_swag_insert(action, p_actionSet);
-
- action->m_suspended = 0; /* Should be useless because of the
- calloc but it seems to help valgrind... */
+ p_actionSet->push_back(*action);
XBT_OUT();
return action;
}
-CpuActionPtr CpuTi::sleep(double duration)
+CpuAction *CpuTi::sleep(double duration)
{
if (duration > 0)
- duration = MAX(duration, MAXMIN_PRECISION);
+ 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);
- XBT_IN("(%s,%g)", m_name, duration);
- CpuActionPtr action = execute(1.0);
action->m_maxDuration = duration;
action->m_suspended = 2;
if (duration == NO_MAX_DURATION) {
- /* Move to the *end* of the corresponding action set. This convention
- is used to speed up update_resource_state */
- xbt_swag_remove(action, action->p_stateSet);
- action->p_stateSet = cpu_ti_running_action_set_that_does_not_need_being_checked;
- xbt_swag_insert(action, action->p_stateSet);
+ /* Move to the *end* of the corresponding action set. This convention
+ is used to speed up update_resource_state */
+ action->getStateSet()->erase(action->getStateSet()->iterator_to(*action));
+ action->p_stateSet = static_cast<CpuTiModel*>(getModel())->p_runningActionSetThatDoesNotNeedBeingChecked;
+ action->getStateSet()->push_back(*action);
}
+
+ p_actionSet->push_back(*action);
+
XBT_OUT();
return action;
}
-void CpuTi::printCpuTiModel()
-{
- std::cout << getModel()->getName() << "<<plop"<< std::endl;
-};
+void CpuTi::modified(bool modified){
+ CpuTiList *modifiedCpu = static_cast<CpuTiModel*>(getModel())->p_modifiedCpu;
+ if (modified) {
+ if (!cpu_ti_hook.is_linked()) {
+ modifiedCpu->push_back(*this);
+ }
+ } else {
+ if (cpu_ti_hook.is_linked()) {
+ modifiedCpu->erase(modifiedCpu->iterator_to(*this));
+ }
+ }
+}
/**********
* Action *
**********/
-static void cpu_ti_action_update_index_heap(void *action, int i)
+
+CpuTiAction::CpuTiAction(CpuTiModel *model_, double cost, bool failed,
+ CpuTi *cpu)
+ : CpuAction(model_, cost, failed)
{
- ((CpuTiActionPtr)action)->updateIndexHeap(i);
+ p_cpu = cpu;
+ m_indexHeap = -1;
+ p_cpu->modified(true);
}
+
void CpuTiAction::updateIndexHeap(int i)
{
m_indexHeap = i;
void CpuTiAction::setState(e_surf_action_state_t state)
{
- Action::setState(state);
- xbt_swag_insert(surf_cpu_resource_priv(p_cpu), cpu_ti_modified_cpu);
+ CpuAction::setState(state);
+ p_cpu->modified(true);
}
int CpuTiAction::unref()
{
m_refcount--;
if (!m_refcount) {
- xbt_swag_remove(this, p_stateSet);
+ if (action_hook.is_linked())
+ getStateSet()->erase(getStateSet()->iterator_to(*this));
/* remove from action_set */
- xbt_swag_remove(this, ((CpuTiPtr)surf_cpu_resource_priv(p_cpu))->p_actionSet);
+ if (action_ti_hook.is_linked())
+ p_cpu->p_actionSet->erase(p_cpu->p_actionSet->iterator_to(*this));
/* remove from heap */
- xbt_heap_remove(cpu_ti_action_heap, this->m_indexHeap);
- xbt_swag_insert(surf_cpu_resource_priv(p_cpu), cpu_ti_modified_cpu);
+ xbt_heap_remove(static_cast<CpuTiModel*>(getModel())->p_tiActionHeap, this->m_indexHeap);
+ p_cpu->modified(true);
delete this;
return 1;
}
void CpuTiAction::cancel()
{
this->setState(SURF_ACTION_FAILED);
- xbt_heap_remove(cpu_ti_action_heap, this->m_indexHeap);
- xbt_swag_insert(surf_cpu_resource_priv(p_cpu), cpu_ti_modified_cpu);
+ xbt_heap_remove(getModel()->getActionHeap(), this->m_indexHeap);
+ p_cpu->modified(true);
return;
}
-void CpuTiAction::recycle()
-{
- DIE_IMPOSSIBLE;
-}
-
void CpuTiAction::suspend()
{
XBT_IN("(%p)", this);
if (m_suspended != 2) {
m_suspended = 1;
- xbt_heap_remove(cpu_ti_action_heap, m_indexHeap);
- xbt_swag_insert(surf_cpu_resource_priv(p_cpu), cpu_ti_modified_cpu);
+ xbt_heap_remove(getModel()->getActionHeap(), m_indexHeap);
+ p_cpu->modified(true);
}
XBT_OUT();
}
XBT_IN("(%p)", this);
if (m_suspended != 2) {
m_suspended = 0;
- xbt_swag_insert(surf_cpu_resource_priv(p_cpu), cpu_ti_modified_cpu);
+ p_cpu->modified(true);
}
XBT_OUT();
}
-bool CpuTiAction::isSuspended()
-{
- return m_suspended == 1;
-}
-
void CpuTiAction::setMaxDuration(double duration)
{
double min_finish;
m_maxDuration = duration;
if (duration >= 0)
- min_finish = (m_start + m_maxDuration) < m_finish ?
- (m_start + m_maxDuration) : m_finish;
+ min_finish = (getStartTime() + getMaxDuration()) < getFinishTime() ?
+ (getStartTime() + getMaxDuration()) : getFinishTime();
else
- min_finish = m_finish;
+ min_finish = getFinishTime();
/* add in action heap */
if (m_indexHeap >= 0) {
- CpuTiActionPtr heap_act = (CpuTiActionPtr)
- xbt_heap_remove(cpu_ti_action_heap, m_indexHeap);
+ CpuTiAction *heap_act = (CpuTiAction*)
+ xbt_heap_remove(getModel()->getActionHeap(), m_indexHeap);
if (heap_act != this)
DIE_IMPOSSIBLE;
}
- xbt_heap_push(cpu_ti_action_heap, this, min_finish);
+ xbt_heap_push(getModel()->getActionHeap(), this, min_finish);
XBT_OUT();
}
{
XBT_IN("(%p,%g)", this, priority);
m_priority = priority;
- xbt_swag_insert(surf_cpu_resource_priv(p_cpu), cpu_ti_modified_cpu);
+ p_cpu->modified(true);
XBT_OUT();
}
double CpuTiAction::getRemains()
{
XBT_IN("(%p)", this);
- ((CpuTiPtr)p_cpu)->updateRemainingAmount(surf_get_clock());
+ p_cpu->updateRemainingAmount(surf_get_clock());
XBT_OUT();
return m_remains;
}
-static void check() {
- CpuTiActionPtr cupAction = new CpuTiAction(NULL, 0, true);
+}
}
#endif /* SURF_MODEL_CPUTI_H_ */
-