-/* $Id$ */
-
-/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */
+/* Copyright (c) 2009, 2010. 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_private.h"
#include "xbt/heap.h"
-
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_ti, surf,
"Logging specific to the SURF CPU TRACE INTEGRATION module");
-static xbt_swag_t cpu_ti_running_action_set_that_does_not_need_being_checked = NULL;
+static xbt_swag_t
+ cpu_ti_running_action_set_that_does_not_need_being_checked = NULL;
static xbt_swag_t cpu_ti_modified_cpu = NULL;
static xbt_heap_t cpu_ti_action_heap;
/* prototypes of new trace functions */
-static double surf_cpu_ti_integrate_trace(surf_cpu_ti_tgmr_t trace, double a,
- double b);
+static double surf_cpu_ti_integrate_trace(surf_cpu_ti_tgmr_t trace,
+ double a, double b);
static double surf_cpu_ti_solve_trace(surf_cpu_ti_tgmr_t trace, double a,
- double amount);
-static double surf_cpu_ti_solve_trace_somewhat_simple(surf_cpu_ti_tgmr_t trace,
- double a, double amount);
+ double amount);
+static double surf_cpu_ti_solve_trace_somewhat_simple(surf_cpu_ti_tgmr_t
+ trace, double a,
+ double amount);
static void surf_cpu_ti_free_tmgr(surf_cpu_ti_tgmr_t trace);
static double surf_cpu_ti_integrate_trace_simple(surf_cpu_ti_trace_t trace,
- double a, double b);
-static double surf_cpu_ti_integrate_trace_simple_point(surf_cpu_ti_trace_t trace,
- double a);
-static double surf_cpu_ti_solve_trace_simple(surf_cpu_ti_trace_t trace, double a,
- double amount);
-static int surf_cpu_ti_binary_search(double *array, double a, int low, int high);
+ double a, double b);
+static double surf_cpu_ti_integrate_trace_simple_point(surf_cpu_ti_trace_t
+ trace, double a);
+static double surf_cpu_ti_solve_trace_simple(surf_cpu_ti_trace_t trace,
+ double a, double amount);
+static int surf_cpu_ti_binary_search(double *array, double a, int low,
+ int high);
/* end prototypes */
static void surf_cpu_ti_free_trace(surf_cpu_ti_trace_t trace)
int i = 0;
trace = xbt_new0(s_surf_cpu_ti_trace_t, 1);
trace->time_points =
- xbt_malloc0(sizeof(double) *
- (xbt_dynar_length(power_trace->event_list) + 1));
+ xbt_malloc0(sizeof(double) *
+ (xbt_dynar_length(power_trace->event_list) + 1));
trace->integral =
- xbt_malloc0(sizeof(double) *
- (xbt_dynar_length(power_trace->event_list) + 1));
+ xbt_malloc0(sizeof(double) *
+ (xbt_dynar_length(power_trace->event_list) + 1));
trace->nb_points = xbt_dynar_length(power_trace->event_list);
xbt_dynar_foreach(power_trace->event_list, cpt, val) {
trace->time_points[i] = time;
if (!power_trace) {
trace->type = TRACE_FIXED;
trace->value = value;
- DEBUG1("No availabily trace. Constant value = %lf", value);
+ XBT_DEBUG("No availabily trace. Constant value = %lf", value);
return trace;
}
}
trace->trace = surf_cpu_ti_trace_new(power_trace);
trace->last_time = total_time;
- trace->total = surf_cpu_ti_integrate_trace_simple(trace->trace, 0, total_time);
+ trace->total =
+ surf_cpu_ti_integrate_trace_simple(trace->trace, 0, total_time);
- DEBUG2("Total integral %lf, last_time %lf ",
+ XBT_DEBUG("Total integral %lf, last_time %lf ",
trace->total, trace->last_time);
return trace;
}
-static cpu_ti_t cpu_ti_new(char *name, double power_peak,
- double power_scale,
- tmgr_trace_t power_trace,
- e_surf_resource_state_t state_initial,
- tmgr_trace_t state_trace, xbt_dict_t cpu_properties)
+static void* cpu_ti_create_resource(const char *name, double power_peak,
+ double power_scale,
+ tmgr_trace_t power_trace,
+ int core,
+ e_surf_resource_state_t state_initial,
+ tmgr_trace_t state_trace,
+ xbt_dict_t cpu_properties)
{
tmgr_trace_t empty_trace;
s_tmgr_event_t val;
- cpu_ti_t cpu = xbt_new0(s_cpu_ti_t, 1);
+ cpu_ti_t cpu = NULL;
s_surf_action_cpu_ti_t ti_action;
- xbt_assert1(!surf_model_resource_by_name(surf_cpu_model, name),
- "Host '%s' declared several times in the platform file", name);
- cpu->action_set = xbt_swag_new(xbt_swag_offset(ti_action, cpu_list_hookup));
- cpu->generic_resource.model = surf_cpu_model;
- cpu->generic_resource.name = name;
- cpu->generic_resource.properties = cpu_properties;
+ xbt_assert(core==1,"Multi-core not handled with this model yet");
+ xbt_assert(!surf_cpu_resource_by_name(name),
+ "Host '%s' declared several times in the platform file",
+ name);
+ xbt_assert(core==1,"Multi-core not handled with this model yet");
+ cpu = (cpu_ti_t) surf_resource_new(sizeof(s_cpu_ti_t),
+ surf_cpu_model, name,cpu_properties);
+ cpu->action_set =
+ xbt_swag_new(xbt_swag_offset(ti_action, cpu_list_hookup));
cpu->power_peak = power_peak;
- xbt_assert0(cpu->power_peak > 0, "Power has to be >0");
- DEBUG1("power scale %lf", power_scale);
+ xbt_assert(cpu->power_peak > 0, "Power has to be >0");
+ XBT_DEBUG("power scale %lf", power_scale);
cpu->power_scale = power_scale;
cpu->avail_trace = cpu_ti_parse_trace(power_trace, power_scale);
cpu->state_current = state_initial;
if (state_trace)
cpu->state_event =
- tmgr_history_add_trace(history, state_trace, 0.0, 0, cpu);
+ tmgr_history_add_trace(history, state_trace, 0.0, 0, cpu);
if (power_trace && xbt_dynar_length(power_trace->event_list) > 1) {
/* add a fake trace event if periodicity == 0 */
xbt_dynar_get_cpy(power_trace->event_list,
if (val.delta == 0) {
empty_trace = tmgr_empty_trace_new();
cpu->power_event =
- tmgr_history_add_trace(history, empty_trace,
- cpu->avail_trace->last_time, 0, cpu);
+ tmgr_history_add_trace(history, empty_trace,
+ cpu->avail_trace->last_time, 0, cpu);
}
}
- xbt_dict_set(surf_model_resource_set(surf_cpu_model), name, cpu,
- surf_resource_free);
+ xbt_lib_set(host_lib, name, SURF_CPU_LEVEL, cpu);
return cpu;
}
-static void parse_cpu_ti_init(void)
+static void parse_cpu_ti_init(surf_parsing_host_arg_t host)
{
- double power_peak = 0.0;
- double power_scale = 0.0;
- tmgr_trace_t power_trace = NULL;
- e_surf_resource_state_t state_initial = SURF_RESOURCE_OFF;
- tmgr_trace_t state_trace = NULL;
-
- power_peak = get_cpu_power(A_surfxml_host_power);
- surf_parse_get_double(&power_scale, A_surfxml_host_availability);
- power_trace = tmgr_trace_new(A_surfxml_host_availability_file);
-
- xbt_assert0((A_surfxml_host_state == A_surfxml_host_state_ON) ||
- (A_surfxml_host_state == A_surfxml_host_state_OFF),
- "Invalid state");
- if (A_surfxml_host_state == A_surfxml_host_state_ON)
- state_initial = SURF_RESOURCE_ON;
- if (A_surfxml_host_state == A_surfxml_host_state_OFF)
- state_initial = SURF_RESOURCE_OFF;
- state_trace = tmgr_trace_new(A_surfxml_host_state_file);
-
- current_property_set = xbt_dict_new();
- cpu_ti_new(xbt_strdup(A_surfxml_host_id), power_peak, power_scale,
- power_trace, state_initial, state_trace, current_property_set);
+ cpu_ti_create_resource(host->V_host_id,
+ host->V_host_power_peak,
+ host->V_host_power_scale,
+ host->V_host_power_trace,
+ host->V_host_core,
+ host->V_host_state_initial,
+ host->V_host_state_trace,
+ current_property_set);
+ current_property_set = NULL;
}
/* connect all traces relative to hosts */
xbt_dict_foreach(trace_connect_list_host_avail, cursor, trace_name, elm) {
tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name);
- cpu_ti_t cpu = surf_model_resource_by_name(surf_cpu_model, elm);
+ cpu_ti_t cpu = surf_cpu_resource_by_name(elm);
- xbt_assert1(cpu, "Host %s undefined", elm);
- xbt_assert1(trace, "Trace %s undefined", trace_name);
+ xbt_assert(cpu, "Host %s undefined", elm);
+ xbt_assert(trace, "Trace %s undefined", trace_name);
if (cpu->state_event) {
- DEBUG1("Trace already configured for this CPU(%s), ignoring it", elm);
+ XBT_DEBUG("Trace already configured for this CPU(%s), ignoring it",
+ elm);
continue;
}
- DEBUG2("Add state trace: %s to CPU(%s)", trace_name, elm);
+ XBT_DEBUG("Add state trace: %s to CPU(%s)", trace_name, elm);
cpu->state_event = tmgr_history_add_trace(history, trace, 0.0, 0, cpu);
}
xbt_dict_foreach(trace_connect_list_power, cursor, trace_name, elm) {
tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name);
- cpu_ti_t cpu = surf_model_resource_by_name(surf_cpu_model, elm);
+ cpu_ti_t cpu = surf_cpu_resource_by_name(elm);
- xbt_assert1(cpu, "Host %s undefined", elm);
- xbt_assert1(trace, "Trace %s undefined", trace_name);
+ xbt_assert(cpu, "Host %s undefined", elm);
+ xbt_assert(trace, "Trace %s undefined", trace_name);
- DEBUG2("Add power trace: %s to CPU(%s)", trace_name, elm);
+ XBT_DEBUG("Add power trace: %s to CPU(%s)", trace_name, elm);
if (cpu->avail_trace)
surf_cpu_ti_free_tmgr(cpu->avail_trace);
tmgr_trace_t empty_trace;
empty_trace = tmgr_empty_trace_new();
cpu->power_event =
- tmgr_history_add_trace(history, empty_trace,
- cpu->avail_trace->last_time, 0, cpu);
+ tmgr_history_add_trace(history, empty_trace,
+ cpu->avail_trace->last_time, 0, cpu);
}
}
}
}
-static void cpu_ti_define_callbacks(const char *file)
+static void cpu_ti_define_callbacks()
{
- surf_parse_reset_parser();
- surfxml_add_callback(STag_surfxml_host_cb_list, parse_cpu_ti_init);
+ surf_parse_host_add_cb(parse_cpu_ti_init);
surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_traces_cpu_ti);
}
/* remove from action_set */
xbt_swag_remove(action, ACTION_GET_CPU(action)->action_set);
/* remove from heap */
- xbt_heap_remove(cpu_ti_action_heap, ((surf_action_cpu_ti_t) action)->index_heap);
+ xbt_heap_remove(cpu_ti_action_heap,
+ ((surf_action_cpu_ti_t) action)->index_heap);
xbt_swag_insert(ACTION_GET_CPU(action), cpu_ti_modified_cpu);
- free(action);
+ surf_action_free(&action);
return 1;
}
return 0;
static void cpu_ti_action_cancel(surf_action_t action)
{
surf_action_state_set(action, SURF_ACTION_FAILED);
- xbt_heap_remove(cpu_ti_action_heap, ((surf_action_cpu_ti_t) action)->index_heap);
+ xbt_heap_remove(cpu_ti_action_heap,
+ ((surf_action_cpu_ti_t) action)->index_heap);
xbt_swag_insert(ACTION_GET_CPU(action), cpu_ti_modified_cpu);
return;
}
static void cpu_ti_action_state_set(surf_action_t action,
- e_surf_action_state_t state)
+ e_surf_action_state_t state)
{
surf_action_state_set(action, state);
xbt_swag_insert(ACTION_GET_CPU(action), cpu_ti_modified_cpu);
/* calcule the surface */
area_total =
- surf_cpu_ti_integrate_trace(cpu->avail_trace, cpu->last_update,
- now) * cpu->power_peak;
- DEBUG2("Flops total: %lf, Last update %lf", area_total, cpu->last_update);
+ surf_cpu_ti_integrate_trace(cpu->avail_trace, cpu->last_update,
+ now) * cpu->power_peak;
+ XBT_DEBUG("Flops total: %lf, Last update %lf", area_total,
+ cpu->last_update);
xbt_swag_foreach(action, cpu->action_set) {
/* action not running, skip it */
double_update(&(GENERIC_ACTION(action).remains),
area_total / (cpu->sum_priority *
GENERIC_ACTION(action).priority));
- DEBUG2("Update remaining action(%p) remaining %lf", action,
+ XBT_DEBUG("Update remaining action(%p) remaining %lf", action,
GENERIC_ACTION(action).remains);
}
cpu->last_update = now;
if (action->suspended == 0 && GENERIC_ACTION(action).priority > 0) {
/* total area needed to finish the action. Used in trace integration */
total_area =
- (GENERIC_ACTION(action).remains) * sum_priority *
- GENERIC_ACTION(action).priority;
+ (GENERIC_ACTION(action).remains) * sum_priority *
+ GENERIC_ACTION(action).priority;
total_area /= cpu->power_peak;
GENERIC_ACTION(action).finish =
- surf_cpu_ti_solve_trace(cpu->avail_trace, now, total_area);
+ surf_cpu_ti_solve_trace(cpu->avail_trace, now, total_area);
/* verify which event will happen before (max_duration or finish time) */
if ((GENERIC_ACTION(action).max_duration != NO_MAX_DURATION) &&
(GENERIC_ACTION(action).start +
GENERIC_ACTION(action).max_duration <
GENERIC_ACTION(action).finish))
min_finish = GENERIC_ACTION(action).start +
- GENERIC_ACTION(action).max_duration;
+ GENERIC_ACTION(action).max_duration;
else
min_finish = GENERIC_ACTION(action).finish;
} else {
/* put the max duration time on heap */
if (GENERIC_ACTION(action).max_duration != NO_MAX_DURATION)
min_finish =
- (GENERIC_ACTION(action).start +
- GENERIC_ACTION(action).max_duration);
+ (GENERIC_ACTION(action).start +
+ GENERIC_ACTION(action).max_duration);
}
/* add in action heap */
- DEBUG2("action(%p) index %d", action, action->index_heap);
+ XBT_DEBUG("action(%p) index %d", action, action->index_heap);
if (action->index_heap >= 0) {
surf_action_cpu_ti_t heap_act =
- xbt_heap_remove(cpu_ti_action_heap, action->index_heap);
+ xbt_heap_remove(cpu_ti_action_heap, action->index_heap);
if (heap_act != action)
DIE_IMPOSSIBLE;
}
if (min_finish != NO_MAX_DURATION)
xbt_heap_push(cpu_ti_action_heap, action, min_finish);
- DEBUG5
- ("Update finish time: Cpu(%s) Action: %p, Start Time: %lf Finish Time: %lf Max duration %lf",
- cpu->generic_resource.name, action, GENERIC_ACTION(action).start,
- GENERIC_ACTION(action).finish, GENERIC_ACTION(action).max_duration);
+ XBT_DEBUG
+ ("Update finish time: Cpu(%s) Action: %p, Start Time: %lf Finish Time: %lf Max duration %lf",
+ cpu->generic_resource.name, action, GENERIC_ACTION(action).start,
+ GENERIC_ACTION(action).finish,
+ GENERIC_ACTION(action).max_duration);
}
/* remove from modified cpu */
xbt_swag_remove(cpu, cpu_ti_modified_cpu);
if (xbt_heap_size(cpu_ti_action_heap) > 0)
min_action_duration = xbt_heap_maxkey(cpu_ti_action_heap) - now;
- DEBUG1("Share resources, min next event date: %lf", min_action_duration);
+ XBT_DEBUG("Share resources, min next event date: %lf", min_action_duration);
return min_action_duration;
}
while ((xbt_heap_size(cpu_ti_action_heap) > 0)
&& (xbt_heap_maxkey(cpu_ti_action_heap) <= now)) {
action = xbt_heap_pop(cpu_ti_action_heap);
- DEBUG1("Action %p: finish", action);
+ XBT_DEBUG("Action %p: finish", action);
GENERIC_ACTION(action).finish = surf_get_clock();
/* set the remains to 0 due to precision problems when updating the remaining amount */
GENERIC_ACTION(action).remains = 0;
}
static void cpu_ti_update_resource_state(void *id,
- tmgr_trace_event_t event_type,
- double value, double date)
+ tmgr_trace_event_t event_type,
+ double value, double date)
{
cpu_ti_t cpu = id;
surf_action_cpu_ti_t action;
surf_cpu_ti_tgmr_t trace;
s_tmgr_event_t val;
- DEBUG3("Finish trace date: %lf value %lf date %lf", surf_get_clock(),
+ XBT_DEBUG("Finish trace date: %lf value %lf date %lf", surf_get_clock(),
value, date);
/* update remaining of actions and put in modified cpu swag */
cpu_ti_update_remaining_amount(cpu, date);
trace = xbt_new0(s_surf_cpu_ti_tgmr_t, 1);
trace->type = TRACE_FIXED;
trace->value = val.value;
- DEBUG1("value %lf", val.value);
+ XBT_DEBUG("value %lf", val.value);
cpu->avail_trace = trace;
|| surf_action_state_get((surf_action_t) action) ==
SURF_ACTION_NOT_IN_THE_SYSTEM) {
action->generic_action.finish = date;
- cpu_ti_action_state_set((surf_action_t) action, SURF_ACTION_FAILED);
+ cpu_ti_action_state_set((surf_action_t) action,
+ SURF_ACTION_FAILED);
if (action->index_heap >= 0) {
surf_action_cpu_ti_t heap_act =
- xbt_heap_remove(cpu_ti_action_heap, action->index_heap);
+ xbt_heap_remove(cpu_ti_action_heap, action->index_heap);
if (heap_act != action)
DIE_IMPOSSIBLE;
}
if (tmgr_trace_event_free(event_type))
cpu->state_event = NULL;
} else {
- CRITICAL0("Unknown event ! \n");
+ XBT_CRITICAL("Unknown event ! \n");
xbt_abort();
}
surf_action_cpu_ti_t action = NULL;
cpu_ti_t CPU = cpu;
- XBT_IN2("(%s,%g)", surf_resource_name(CPU), size);
+ XBT_IN("(%s,%g)", surf_resource_name(CPU), size);
action =
- surf_action_new(sizeof(s_surf_action_cpu_ti_t), size, surf_cpu_model,
- CPU->state_current != SURF_RESOURCE_ON);
+ surf_action_new(sizeof(s_surf_action_cpu_ti_t), size, surf_cpu_model,
+ CPU->state_current != SURF_RESOURCE_ON);
action->cpu = cpu;
action->index_heap = -1;
action->suspended = 0; /* Should be useless because of the
calloc but it seems to help valgrind... */
- XBT_OUT;
+ XBT_OUT();
return (surf_action_t) action;
}
if (duration > 0)
duration = MAX(duration, MAXMIN_PRECISION);
- XBT_IN2("(%s,%g)", surf_resource_name(cpu), duration);
+ XBT_IN("(%s,%g)", surf_resource_name(cpu), duration);
action = (surf_action_cpu_ti_t) cpu_ti_execute(cpu, 1.0);
action->generic_action.max_duration = duration;
action->suspended = 2;
is used to speed up update_resource_state */
xbt_swag_remove(action, ((surf_action_t) action)->state_set);
((surf_action_t) action)->state_set =
- cpu_ti_running_action_set_that_does_not_need_being_checked;
+ cpu_ti_running_action_set_that_does_not_need_being_checked;
xbt_swag_insert(action, ((surf_action_t) action)->state_set);
}
- XBT_OUT;
+ XBT_OUT();
return (surf_action_t) action;
}
static void cpu_ti_action_suspend(surf_action_t action)
{
- XBT_IN1("(%p)", action);
+ XBT_IN("(%p)", action);
if (((surf_action_cpu_ti_t) action)->suspended != 2) {
((surf_action_cpu_ti_t) action)->suspended = 1;
- xbt_heap_remove(cpu_ti_action_heap, ((surf_action_cpu_ti_t) action)->index_heap);
+ xbt_heap_remove(cpu_ti_action_heap,
+ ((surf_action_cpu_ti_t) action)->index_heap);
xbt_swag_insert(ACTION_GET_CPU(action), cpu_ti_modified_cpu);
}
- XBT_OUT;
+ XBT_OUT();
}
static void cpu_ti_action_resume(surf_action_t action)
{
- XBT_IN1("(%p)", action);
+ XBT_IN("(%p)", action);
if (((surf_action_cpu_ti_t) action)->suspended != 2) {
((surf_action_cpu_ti_t) action)->suspended = 0;
xbt_swag_insert(ACTION_GET_CPU(action), cpu_ti_modified_cpu);
}
- XBT_OUT;
+ XBT_OUT();
}
static int cpu_ti_action_is_suspended(surf_action_t action)
return (((surf_action_cpu_ti_t) action)->suspended == 1);
}
-static void cpu_ti_action_set_max_duration(surf_action_t action, double duration)
+static void cpu_ti_action_set_max_duration(surf_action_t action,
+ double duration)
{
surf_action_cpu_ti_t ACT = (surf_action_cpu_ti_t) action;
double min_finish;
- XBT_IN2("(%p,%g)", action, duration);
+ XBT_IN("(%p,%g)", action, duration);
action->max_duration = duration;
if (duration >= 0)
min_finish =
- (action->start + action->max_duration) <
- action->finish ? (action->start +
- action->max_duration) : action->finish;
+ (action->start + action->max_duration) <
+ action->finish ? (action->start +
+ action->max_duration) : action->finish;
else
min_finish = action->finish;
/* add in action heap */
if (ACT->index_heap >= 0) {
surf_action_cpu_ti_t heap_act =
- xbt_heap_remove(cpu_ti_action_heap, ACT->index_heap);
+ xbt_heap_remove(cpu_ti_action_heap, ACT->index_heap);
if (heap_act != ACT)
DIE_IMPOSSIBLE;
}
xbt_heap_push(cpu_ti_action_heap, ACT, min_finish);
- XBT_OUT;
+ XBT_OUT();
}
-static void cpu_ti_action_set_priority(surf_action_t action, double priority)
+static void cpu_ti_action_set_priority(surf_action_t action,
+ double priority)
{
- XBT_IN2("(%p,%g)", action, priority);
+ XBT_IN("(%p,%g)", action, priority);
action->priority = priority;
xbt_swag_insert(ACTION_GET_CPU(action), cpu_ti_modified_cpu);
- XBT_OUT;
+ XBT_OUT();
}
static double cpu_ti_action_get_remains(surf_action_t action)
{
- XBT_IN1("(%p)", action);
- cpu_ti_update_remaining_amount((cpu_ti_t) ((surf_action_cpu_ti_t) action)->cpu,
- surf_get_clock());
+ XBT_IN("(%p)", action);
+ cpu_ti_update_remaining_amount((cpu_ti_t)
+ ((surf_action_cpu_ti_t) action)->cpu,
+ surf_get_clock());
return action->remains;
- XBT_OUT;
+ XBT_OUT();
}
static e_surf_resource_state_t cpu_ti_get_state(void *cpu)
* \param a Time
* \return CPU power scale
*/
-static double surf_cpu_ti_get_power_scale(surf_cpu_ti_tgmr_t trace, double a)
+static double surf_cpu_ti_get_power_scale(surf_cpu_ti_tgmr_t trace,
+ double a)
{
double reduced_a;
int point;
reduced_a = a - floor(a / trace->last_time) * trace->last_time;
point =
- surf_cpu_ti_binary_search(trace->trace->time_points, reduced_a, 0,
- trace->trace->nb_points - 1);
- xbt_dynar_get_cpy(trace->power_trace->event_list, 0, &val);
+ surf_cpu_ti_binary_search(trace->trace->time_points, reduced_a, 0,
+ trace->trace->nb_points - 1);
+ xbt_dynar_get_cpy(trace->power_trace->event_list, point, &val);
return val.value;
}
{
cpu_ti_t CPU = cpu;
CPU->power_scale =
- surf_cpu_ti_get_power_scale(CPU->avail_trace, surf_get_clock());
+ surf_cpu_ti_get_power_scale(CPU->avail_trace, surf_get_clock());
/* number between 0 and 1 */
return CPU->power_scale;
}
static void cpu_ti_finalize(void)
{
- void *cpu;
- xbt_dict_cursor_t cursor;
+ void **cpu;
+ xbt_lib_cursor_t cursor;
char *key;
- xbt_dict_foreach(surf_model_resource_set(surf_cpu_model), cursor, key, cpu) {
- cpu_ti_t CPU = cpu;
- xbt_swag_free(CPU->action_set);
- surf_cpu_ti_free_tmgr(CPU->avail_trace);
+
+ xbt_lib_foreach(host_lib, cursor, key, cpu){
+ if(cpu[SURF_CPU_LEVEL])
+ {
+ cpu_ti_t CPU = cpu[SURF_CPU_LEVEL];
+ xbt_swag_free(CPU->action_set);
+ surf_cpu_ti_free_tmgr(CPU->avail_trace);
+ }
}
surf_model_exit(surf_cpu_model);
surf_cpu_model = NULL;
- xbt_swag_free(cpu_ti_running_action_set_that_does_not_need_being_checked);
+ 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);
surf_cpu_model = surf_model_init();
cpu_ti_running_action_set_that_does_not_need_being_checked =
- xbt_swag_new(xbt_swag_offset(action, state_hookup));
+ xbt_swag_new(xbt_swag_offset(action, state_hookup));
- cpu_ti_modified_cpu = xbt_swag_new(xbt_swag_offset(cpu, modified_cpu_hookup));
+ cpu_ti_modified_cpu =
+ xbt_swag_new(xbt_swag_offset(cpu, modified_cpu_hookup));
surf_cpu_model->name = "CPU_TI";
surf_cpu_model->model_private->resource_used = cpu_ti_resource_used;
surf_cpu_model->model_private->share_resources = cpu_ti_share_resources;
- surf_cpu_model->model_private->update_actions_state = cpu_ti_update_actions_state;
+ surf_cpu_model->model_private->update_actions_state =
+ cpu_ti_update_actions_state;
surf_cpu_model->model_private->update_resource_state =
- cpu_ti_update_resource_state;
+ cpu_ti_update_resource_state;
surf_cpu_model->model_private->finalize = cpu_ti_finalize;
surf_cpu_model->suspend = cpu_ti_action_suspend;
surf_cpu_model->extension.cpu.get_state = cpu_ti_get_state;
surf_cpu_model->extension.cpu.get_speed = cpu_ti_get_speed;
- surf_cpu_model->extension.cpu.get_available_speed = cpu_ti_get_available_speed;
+ surf_cpu_model->extension.cpu.get_available_speed =
+ cpu_ti_get_available_speed;
+ surf_cpu_model->extension.cpu.create_resource = cpu_ti_create_resource;
+ surf_cpu_model->extension.cpu.add_traces = add_traces_cpu_ti;
cpu_ti_action_heap = xbt_heap_new(8, NULL);
- xbt_heap_set_update_callback(cpu_ti_action_heap, cpu_ti_action_update_index_heap);
+ xbt_heap_set_update_callback(cpu_ti_action_heap,
+ cpu_ti_action_update_index_heap);
}
-void surf_cpu_model_init_ti(const char *filename)
+void surf_cpu_model_init_ti()
{
if (surf_cpu_model)
return;
surf_cpu_ti_model_init_internal();
- cpu_ti_define_callbacks(filename);
+ cpu_ti_define_callbacks();
xbt_dynar_push(model_list, &surf_cpu_model);
}
* \param b End of interval
* \return the integrate value. -1 if an error occurs.
*/
-static double surf_cpu_ti_integrate_trace(surf_cpu_ti_tgmr_t trace, double a,
- double b)
+static double surf_cpu_ti_integrate_trace(surf_cpu_ti_tgmr_t trace,
+ double a, double b)
{
double first_chunk;
double middle_chunk;
int a_index, b_index;
if ((a < 0.0) || (a > b)) {
- CRITICAL2
- ("Error, invalid integration interval [%.2f,%.2f]. You probably have a task executing with negative computation amount. Check your code.",
- a, b);
+ XBT_CRITICAL
+ ("Error, invalid integration interval [%.2f,%.2f]. You probably have a task executing with negative computation amount. Check your code.",
+ a, b);
xbt_abort();
}
if (a == b)
if (a_index > b_index) { /* Same chunk */
return surf_cpu_ti_integrate_trace_simple(trace->trace,
- a - (a_index -
- 1) * trace->last_time,
- b - (b_index) * trace->last_time);
+ a - (a_index -
+ 1) * trace->last_time,
+ b -
+ (b_index) *
+ trace->last_time);
}
first_chunk = surf_cpu_ti_integrate_trace_simple(trace->trace,
- a - (a_index -
- 1) * trace->last_time,
- trace->last_time);
+ a - (a_index -
+ 1) *
+ trace->last_time,
+ trace->last_time);
middle_chunk = (b_index - a_index) * trace->total;
last_chunk = surf_cpu_ti_integrate_trace_simple(trace->trace,
- 0.0,
- b -
- (b_index) * trace->last_time);
+ 0.0,
+ b -
+ (b_index) *
+ trace->last_time);
- DEBUG3("first_chunk=%.2f middle_chunk=%.2f last_chunk=%.2f\n",
+ XBT_DEBUG("first_chunk=%.2f middle_chunk=%.2f last_chunk=%.2f\n",
first_chunk, middle_chunk, last_chunk);
return (first_chunk + middle_chunk + last_chunk);
* \return Integral
*/
static double surf_cpu_ti_integrate_trace_simple(surf_cpu_ti_trace_t trace,
- double a, double b)
+ double a, double b)
{
return surf_cpu_ti_integrate_trace_simple_point(trace,
- b) -
- surf_cpu_ti_integrate_trace_simple_point(trace, a);
+ b) -
+ surf_cpu_ti_integrate_trace_simple_point(trace, a);
}
/**
* \param a point
* \return Integral
*/
-static double surf_cpu_ti_integrate_trace_simple_point(surf_cpu_ti_trace_t trace,
- double a)
+static double surf_cpu_ti_integrate_trace_simple_point(surf_cpu_ti_trace_t
+ trace, double a)
{
double integral = 0;
int ind;
double a_aux = a;
ind =
- surf_cpu_ti_binary_search(trace->time_points, a, 0, trace->nb_points - 1);
+ surf_cpu_ti_binary_search(trace->time_points, a, 0,
+ trace->nb_points - 1);
integral += trace->integral[ind];
- DEBUG7("a %lf ind %d integral %lf ind + 1 %lf ind %lf time +1 %lf time %lf",
- a, ind, integral, trace->integral[ind + 1], trace->integral[ind],
- trace->time_points[ind + 1], trace->time_points[ind]);
+ XBT_DEBUG
+ ("a %lf ind %d integral %lf ind + 1 %lf ind %lf time +1 %lf time %lf",
+ a, ind, integral, trace->integral[ind + 1], trace->integral[ind],
+ trace->time_points[ind + 1], trace->time_points[ind]);
double_update(&a_aux, trace->time_points[ind]);
if (a_aux > 0)
integral +=
- ((trace->integral[ind + 1] -
- trace->integral[ind]) / (trace->time_points[ind + 1] -
- trace->time_points[ind])) * (a -
- trace->
- time_points
- [ind]);
- DEBUG2("Integral a %lf = %lf", a, integral);
+ ((trace->integral[ind + 1] -
+ trace->integral[ind]) / (trace->time_points[ind + 1] -
+ trace->time_points[ind])) * (a -
+ trace->
+ time_points
+ [ind]);
+ XBT_DEBUG("Integral a %lf = %lf", a, integral);
return integral;
}
* \return End time
*/
static double surf_cpu_ti_solve_trace(surf_cpu_ti_tgmr_t trace, double a,
- double amount)
+ double amount)
{
int quotient;
double reduced_b;
/* Sanity checks */
if ((a < 0.0) || (amount < 0.0)) {
- CRITICAL2
- ("Error, invalid parameters [a = %.2f, amount = %.2f]. You probably have a task executing with negative computation amount. Check your code.",
- a, amount);
+ XBT_CRITICAL
+ ("Error, invalid parameters [a = %.2f, amount = %.2f]. You probably have a task executing with negative computation amount. Check your code.",
+ a, amount);
xbt_abort();
}
return (a + (amount / trace->value));
}
- DEBUG2("amount %lf total %lf", amount, trace->total);
+ XBT_DEBUG("amount %lf total %lf", amount, trace->total);
/* Reduce the problem to one where amount <= trace_total */
quotient = (int) (floor(amount / trace->total));
reduced_amount = (trace->total) * ((amount / trace->total) -
floor(amount / trace->total));
reduced_a = a - (trace->last_time) * (int) (floor(a / trace->last_time));
- DEBUG3("Quotient: %d reduced_amount: %lf reduced_a: %lf", quotient,
+ XBT_DEBUG("Quotient: %d reduced_amount: %lf reduced_a: %lf", quotient,
reduced_amount, reduced_a);
/* Now solve for new_amount which is <= trace_total */
fprintf(stderr,"reduced_amount = %.2f\n",reduced_amount);
*/
reduced_b =
- surf_cpu_ti_solve_trace_somewhat_simple(trace, reduced_a, reduced_amount);
+ surf_cpu_ti_solve_trace_somewhat_simple(trace, reduced_a,
+ reduced_amount);
/* Re-map to the original b and amount */
b = (trace->last_time) * (int) (floor(a / trace->last_time)) +
- (quotient * trace->last_time) + reduced_b;
+ (quotient * trace->last_time) + reduced_b;
return b;
}
* and a <=trace->last_time
*
*/
-static double surf_cpu_ti_solve_trace_somewhat_simple(surf_cpu_ti_tgmr_t trace,
- double a, double amount)
+static double surf_cpu_ti_solve_trace_somewhat_simple(surf_cpu_ti_tgmr_t
+ trace, double a,
+ double amount)
{
double amount_till_end;
double b;
- DEBUG2("Solve integral: [%.2f, amount=%.2f]", a, amount);
- amount_till_end = surf_cpu_ti_integrate_trace(trace, a, trace->last_time);
+ XBT_DEBUG("Solve integral: [%.2f, amount=%.2f]", a, amount);
+ amount_till_end =
+ surf_cpu_ti_integrate_trace(trace, a, trace->last_time);
/*
fprintf(stderr,"amount_till_end=%.2f\n",amount_till_end);
*/
b = surf_cpu_ti_solve_trace_simple(trace->trace, a, amount);
} else {
b = trace->last_time +
- surf_cpu_ti_solve_trace_simple(trace->trace, 0.0,
- amount - amount_till_end);
+ surf_cpu_ti_solve_trace_simple(trace->trace, 0.0,
+ amount - amount_till_end);
}
return b;
}
* \param amount Amount of flops
* \return The date when amount is available.
*/
-static double surf_cpu_ti_solve_trace_simple(surf_cpu_ti_trace_t trace, double a,
- double amount)
+static double surf_cpu_ti_solve_trace_simple(surf_cpu_ti_trace_t trace,
+ double a, double amount)
{
double integral_a;
int ind;
double time;
integral_a = surf_cpu_ti_integrate_trace_simple_point(trace, a);
ind =
- surf_cpu_ti_binary_search(trace->integral, integral_a + amount, 0,
- trace->nb_points - 1);
+ surf_cpu_ti_binary_search(trace->integral, integral_a + amount, 0,
+ trace->nb_points - 1);
time = trace->time_points[ind];
time +=
- (integral_a + amount -
- trace->integral[ind]) / ((trace->integral[ind + 1] -
- trace->integral[ind]) /
- (trace->time_points[ind + 1] -
- trace->time_points[ind]));
+ (integral_a + amount -
+ trace->integral[ind]) / ((trace->integral[ind + 1] -
+ trace->integral[ind]) /
+ (trace->time_points[ind + 1] -
+ trace->time_points[ind]));
return time;
}
* \param high Upper bound to search in array
* \return Index of point
*/
-static int surf_cpu_ti_binary_search(double *array, double a, int low, int high)
+static int surf_cpu_ti_binary_search(double *array, double a, int low,
+ int high)
{
- int mid = low + (high - low) / 2;
- DEBUG5("a %lf low %d high %d mid %d value %lf", a, low, high, mid,
- array[mid]);
- /* a == array[mid] */
- if (array[mid] == a)
- return mid;
- /* a is between mid and mid+1 */
- if (array[mid] < a && array[mid + 1] > a)
- return mid;
-
- if (array[mid] < a)
- return surf_cpu_ti_binary_search(array, a, mid + 1, high);
- else
- return surf_cpu_ti_binary_search(array, a, low, mid - 1);
+ xbt_assert(low < high, "Wrong parameters: low (%d) should be smaller than"
+ " high (%d)", low, high);
+
+ int mid;
+ do {
+ mid = low + (high - low) / 2;
+ XBT_DEBUG("a %lf low %d high %d mid %d value %lf", a, low, high, mid,
+ array[mid]);
+
+ if (array[mid] > a)
+ high = mid;
+ else
+ low = mid;
+ }
+ while (low < high - 1);
+
+ return low;
}
