#define SURF_MODEL_CPUTI_H_
extern "C" {
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_ti, surf,
+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 void cpu_ti_action_update_index_heap(void *action, int i);
/*********
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]);
((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;
}
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 */
if (!power_trace) {
m_type = TRACE_FIXED;
m_value = value;
- XBT_DEBUG("No availabily trace. Constant value = %lf", value);
+ XBT_DEBUG("No availability trace. Constant value = %lf", value);
return;
}
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)
*************/
static void parse_cpu_ti_init(sg_platf_host_cbarg_t host){
- ((CpuTiModelPtr)surf_cpu_model)->parseInit(host);
+ ((CpuTiModelPtr)surf_cpu_model_pm)->parseInit(host);
}
static void add_traces_cpu_ti(){
- surf_cpu_model->addTraces();
+ surf_cpu_model_pm->addTraces();
}
static void cpu_ti_define_callbacks()
void surf_cpu_model_init_ti()
{
- xbt_assert(!surf_cpu_model,"CPU model already initialized. This should not happen.");
- surf_cpu_model = new CpuTiModel();
+ 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();
+
cpu_ti_define_callbacks();
- ModelPtr model = static_cast<ModelPtr>(surf_cpu_model);
- xbt_dynar_push(model_list, &model);
+ ModelPtr model_pm = static_cast<ModelPtr>(surf_cpu_model_pm);
+ ModelPtr model_vm = static_cast<ModelPtr>(surf_cpu_model_vm);
+ xbt_dynar_push(model_list, &model_pm);
+ xbt_dynar_push(model_list, &model_vm);
}
CpuTiModel::CpuTiModel() : CpuModel("cpu_ti")
{
- xbt_assert(!surf_cpu_model,"CPU model already initialized. This should not happen.");
- ActionPtr action;
- CpuTi cpu;
+ ActionPtr action = NULL;
+ CpuTiPtr cpu;
- cpu_ti_running_action_set_that_does_not_need_being_checked =
+ p_runningActionSetThatDoesNotNeedBeingChecked =
xbt_swag_new(xbt_swag_offset(*action, p_stateHookup));
- cpu_ti_modified_cpu =
- xbt_swag_new(xbt_swag_offset(cpu, p_modifiedCpuHookup));
+ p_modifiedCpu =
+ xbt_swag_new(xbt_swag_offset(*cpu, p_modifiedCpuHookup));
- cpu_ti_action_heap = xbt_heap_new(8, NULL);
- xbt_heap_set_update_callback(cpu_ti_action_heap,
+ p_tiActionHeap = xbt_heap_new(8, NULL);
+ xbt_heap_set_update_callback(p_tiActionHeap,
cpu_ti_action_update_index_heap);
}
xbt_lib_cursor_t cursor;
char *key;
- xbt_lib_foreach(host_lib, cursor, key, cpu){
- if(cpu[SURF_CPU_LEVEL])
- {
- CpuTiPtr CPU = dynamic_cast<CpuTiPtr>(static_cast<ResourcePtr>(cpu[SURF_CPU_LEVEL]));
- xbt_swag_free(CPU->p_actionSet);
- delete CPU->p_availTrace;
- }
- }
-
- surf_cpu_model = NULL;
+ surf_cpu_model_pm = NULL;
- 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);
+ xbt_swag_free(p_runningActionSetThatDoesNotNeedBeingChecked);
+ xbt_swag_free(p_modifiedCpu);
+ xbt_heap_free(p_tiActionHeap);
}
void CpuTiModel::parseInit(sg_platf_host_cbarg_t host)
{
createResource(host->id,
host->power_peak,
+ host->pstate,
host->power_scale,
host->power_trace,
host->core_amount,
}
CpuTiPtr CpuTiModel::createResource(const char *name,
- double powerPeak,
+ xbt_dynar_t powerPeak,
+ int pstate,
double powerScale,
tmgr_trace_t powerTrace,
int core,
tmgr_trace_t stateTrace,
xbt_dict_t cpuProperties)
{
- 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,
+ CpuTiPtr cpu = new CpuTi(this, name, powerPeak, pstate, powerScale, powerTrace,
core, stateInitial, stateTrace, cpuProperties);
xbt_lib_set(host_lib, name, SURF_CPU_LEVEL, static_cast<ResourcePtr>(cpu));
- return (CpuTiPtr) xbt_lib_get_elm_or_null(host_lib, name);
+ return cpu;
}
-CpuTiActionPtr CpuTiModel::createAction(double cost, bool failed)
+CpuTiActionPtr CpuTiModel::createAction(double /*cost*/, bool /*failed*/)
{
return NULL;//new CpuTiAction(this, cost, failed);
}
double min_action_duration = -1;
/* iterates over modified cpus to update share resources */
- xbt_swag_foreach_safe(_cpu, _cpu_next, cpu_ti_modified_cpu) {
+ xbt_swag_foreach_safe(_cpu, _cpu_next, p_modifiedCpu) {
static_cast<CpuTiPtr>(_cpu)->updateActionFinishDate(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)) {
+ CpuTiActionPtr action = (CpuTiActionPtr) xbt_heap_pop(p_tiActionHeap);
XBT_DEBUG("Action %p: finish", action);
action->m_finish = surf_get_clock();
/* set the remains to 0 due to precision problems when updating the remaining amount */
action->m_remains = 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());
}
}
/************
* Resource *
************/
-CpuTi::CpuTi(CpuTiModelPtr model, const char *name, double powerPeak,
- double powerScale, tmgr_trace_t powerTrace, int core,
+CpuTi::CpuTi(CpuTiModelPtr 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) :
- Resource(model, name, properties), Cpu(model, name, properties) {
+ xbt_dict_t properties)
+: Resource(model, name, properties)
+, Cpu(model, name, properties, core, 0, powerScale) {
+ p_powerEvent = NULL;
p_stateCurrent = stateInitial;
- m_powerPeak = powerPeak;
m_powerScale = powerScale;
m_core = core;
tmgr_trace_t empty_trace;
XBT_DEBUG("power scale %lf", powerScale);
p_availTrace = new CpuTiTgmr(powerTrace, powerScale);
- CpuTiActionPtr action;
+ CpuTiActionPtr action = NULL;
p_actionSet = xbt_swag_new(xbt_swag_offset(*action, p_cpuListHookup));
+ m_lastUpdate = 0;
+
+ xbt_dynar_get_cpy(powerPeak, 0, &m_powerPeak);
+ xbt_dynar_free(&powerPeak); /* kill memory leak */
+ m_pstate = pstate;
+ XBT_DEBUG("CPU create: peak=%f, pstate=%d", m_powerPeak, m_pstate);
+
p_modifiedCpuHookup.prev = 0;
p_modifiedCpuHookup.next = 0;
xbt_dynar_length(powerTrace->s_list.event_list) - 1, &val);
if (val.delta == 0) {
empty_trace = tmgr_empty_trace_new();
- p_powerEvent =
+ p_powerEvent =
tmgr_history_add_trace(history, empty_trace,
p_availTrace->m_lastTime, 0, static_cast<ResourcePtr>(this));
}
}
};
+CpuTi::~CpuTi(){
+delete p_availTrace;
+xbt_swag_free(p_actionSet);
+}
+
void CpuTi::updateState(tmgr_trace_event_t event_type,
double value, double date)
{
void *_action;
CpuTiActionPtr action;
- surf_watched_hosts();
-
if (event_type == p_powerEvent) {
tmgr_trace_t power_trace;
CpuTiTgmrPtr 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 %lf 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);
+ xbt_swag_insert(this, reinterpret_cast<CpuTiModelPtr>(p_model)->p_modifiedCpu);
power_trace = p_availTrace->p_powerTrace;
xbt_dynar_get_cpy(power_trace->s_list.event_list,
m_powerScale = val.value;
trace = new CpuTiTgmr(TRACE_FIXED, val.value);
- XBT_DEBUG("value %lf", val.value);
+ XBT_DEBUG("value %f", val.value);
p_availTrace = trace;
p_powerEvent = NULL;
} else if (event_type == p_stateEvent) {
- if (value > 0)
+ if (value > 0) {
+ if(p_stateCurrent == SURF_RESOURCE_OFF)
+ xbt_dynar_push_as(host_that_restart, char*, (char *)m_name);
p_stateCurrent = SURF_RESOURCE_ON;
- else {
+ } else {
p_stateCurrent = SURF_RESOURCE_OFF;
/* put all action running on cpu to failed */
action->setState(SURF_ACTION_FAILED);
if (action->m_indexHeap >= 0) {
CpuTiActionPtr heap_act = (CpuTiActionPtr)
- xbt_heap_remove(cpu_ti_action_heap, action->m_indexHeap);
+ xbt_heap_remove(reinterpret_cast<CpuTiModelPtr>(p_model)->p_tiActionHeap, action->m_indexHeap);
if (heap_act != action)
DIE_IMPOSSIBLE;
}
action = static_cast<CpuTiActionPtr>(_action);
/* action not running, skip it */
if (action->p_stateSet !=
- surf_cpu_model->p_runningActionSet)
+ surf_cpu_model_pm->p_runningActionSet)
continue;
/* bogus priority, skip it */
min_finish = -1;
/* action not running, skip it */
if (action->p_stateSet !=
- surf_cpu_model->p_runningActionSet)
+ surf_cpu_model_pm->p_runningActionSet)
continue;
/* verify if the action is really running on cpu */
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);
+ xbt_heap_remove(reinterpret_cast<CpuTiModelPtr>(p_model)->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(reinterpret_cast<CpuTiModelPtr>(p_model)->p_tiActionHeap, action, min_finish);
XBT_DEBUG
- ("Update finish time: Cpu(%s) Action: %p, Start Time: %lf Finish Time: %lf Max duration %lf",
+ ("Update finish time: Cpu(%s) Action: %p, Start Time: %f Finish Time: %f Max duration %f",
m_name, action, action->m_start,
action->m_finish,
action->m_maxDuration);
}
/* remove from modified cpu */
- xbt_swag_remove(this, cpu_ti_modified_cpu);
+ xbt_swag_remove(this, reinterpret_cast<CpuTiModelPtr>(p_model)->p_modifiedCpu);
}
bool CpuTi::isUsed()
/* calcule the surface */
area_total = p_availTrace->integrate(m_lastUpdate, now) * m_powerPeak;
- XBT_DEBUG("Flops total: %lf, Last update %lf", area_total,
+ XBT_DEBUG("Flops total: %f, Last update %f", area_total,
m_lastUpdate);
xbt_swag_foreach(_action, p_actionSet) {
double_update(&(action->m_remains),
area_total / (m_sumPriority *
action->m_priority));
- XBT_DEBUG("Update remaining action(%p) remaining %lf", action,
+ XBT_DEBUG("Update remaining action(%p) remaining %f", action,
action->m_remains);
}
m_lastUpdate = now;
action->p_cpu = this;
action->m_indexHeap = -1;
- xbt_swag_insert(this, cpu_ti_modified_cpu);
+ xbt_swag_insert(this, reinterpret_cast<CpuTiModelPtr>(p_model)->p_modifiedCpu);
xbt_swag_insert(action, p_actionSet);
/* Move to the *end* of the corresponding action set. This convention
is used to speed up update_resource_state */
xbt_swag_remove(static_cast<ActionPtr>(action), action->p_stateSet);
- action->p_stateSet = cpu_ti_running_action_set_that_does_not_need_being_checked;
+ action->p_stateSet = reinterpret_cast<CpuTiModelPtr>(p_model)->p_runningActionSetThatDoesNotNeedBeingChecked;
xbt_swag_insert(static_cast<ActionPtr>(action), action->p_stateSet);
}
XBT_OUT();
void CpuTiAction::setState(e_surf_action_state_t state)
{
Action::setState(state);
- xbt_swag_insert(p_cpu, cpu_ti_modified_cpu);
+ xbt_swag_insert(p_cpu, reinterpret_cast<CpuTiModelPtr>(p_model)->p_modifiedCpu);
}
int CpuTiAction::unref()
/* remove from action_set */
xbt_swag_remove(this, p_cpu->p_actionSet);
/* remove from heap */
- xbt_heap_remove(cpu_ti_action_heap, this->m_indexHeap);
- xbt_swag_insert(p_cpu, cpu_ti_modified_cpu);
+ xbt_heap_remove(reinterpret_cast<CpuTiModelPtr>(p_model)->p_tiActionHeap, this->m_indexHeap);
+ xbt_swag_insert(p_cpu, reinterpret_cast<CpuTiModelPtr>(p_model)->p_modifiedCpu);
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(p_cpu, cpu_ti_modified_cpu);
+ xbt_heap_remove(p_model->p_actionHeap, this->m_indexHeap);
+ xbt_swag_insert(p_cpu, reinterpret_cast<CpuTiModelPtr>(p_model)->p_modifiedCpu);
return;
}
XBT_IN("(%p)", this);
if (m_suspended != 2) {
m_suspended = 1;
- xbt_heap_remove(cpu_ti_action_heap, m_indexHeap);
- xbt_swag_insert(p_cpu, cpu_ti_modified_cpu);
+ xbt_heap_remove(p_model->p_actionHeap, m_indexHeap);
+ xbt_swag_insert(p_cpu, reinterpret_cast<CpuTiModelPtr>(p_model)->p_modifiedCpu);
}
XBT_OUT();
}
XBT_IN("(%p)", this);
if (m_suspended != 2) {
m_suspended = 0;
- xbt_swag_insert(p_cpu, cpu_ti_modified_cpu);
+ xbt_swag_insert(p_cpu, reinterpret_cast<CpuTiModelPtr>(p_model)->p_modifiedCpu);
}
XBT_OUT();
}
/* add in action heap */
if (m_indexHeap >= 0) {
CpuTiActionPtr heap_act = (CpuTiActionPtr)
- xbt_heap_remove(cpu_ti_action_heap, m_indexHeap);
+ xbt_heap_remove(p_model->p_actionHeap, m_indexHeap);
if (heap_act != this)
DIE_IMPOSSIBLE;
}
- xbt_heap_push(cpu_ti_action_heap, this, min_finish);
+ xbt_heap_push(p_model->p_actionHeap, this, min_finish);
XBT_OUT();
}
{
XBT_IN("(%p,%g)", this, priority);
m_priority = priority;
- xbt_swag_insert(p_cpu, cpu_ti_modified_cpu);
+ xbt_swag_insert(p_cpu, reinterpret_cast<CpuTiModelPtr>(p_model)->p_modifiedCpu);
XBT_OUT();
}
return m_remains;
}
-static void check() {
- CpuTiActionPtr cupAction = new CpuTiAction(NULL, 0, true);
-}
-
#endif /* SURF_MODEL_CPUTI_H_ */
