-/* $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. */
+/*
+ commit: e2d6799c4182f00443b3013aadb1c2412372460f
+ This commit retrieves the old implementation of CPU_TI with multi-levels.
+*/
+
#include "surf_private.h"
#include "trace_mgr_private.h"
#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 running_action_set_that_does_not_need_being_checked = NULL;
-static xbt_swag_t modified_cpu = NULL;
-static xbt_heap_t action_heap;
+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_integrate_trace(surf_cpu_ti_tgmr_t trace, double a,
- double b);
-static double surf_cpu_integrate_trace_simple(surf_cpu_ti_tgmr_t trace,
- double a, double b);
-
-
-static double surf_cpu_solve_trace(surf_cpu_ti_tgmr_t trace, double a,
- double amount);
-static double surf_cpu_solve_trace_somewhat_simple(surf_cpu_ti_tgmr_t trace,
- double a, double amount);
-static double surf_cpu_solve_trace_simple(surf_cpu_ti_tgmr_t trace, double a,
- double amount);
-
-static void surf_cpu_free_trace(surf_cpu_ti_tgmr_t trace);
-static void surf_cpu_free_time_series(surf_cpu_ti_timeSeries_t timeSeries);
+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);
+
+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);
/* end prototypes */
-static void surf_cpu_free_time_series(surf_cpu_ti_timeSeries_t timeSeries)
+static void surf_cpu_ti_free_trace(surf_cpu_ti_trace_t trace)
{
- xbt_free(timeSeries->values);
- xbt_free(timeSeries);
+ if (trace->time_points)
+ xbt_free(trace->time_points);
+ if (trace->integral)
+ xbt_free(trace->integral);
+ xbt_free(trace);
}
-static void surf_cpu_free_trace(surf_cpu_ti_tgmr_t trace)
+static void surf_cpu_ti_free_tmgr(surf_cpu_ti_tgmr_t trace)
{
- int i;
-
- for (i = 0; i < trace->nb_levels; i++)
- surf_cpu_free_time_series(trace->levels[i]);
-
- xbt_free(trace->levels);
+ if (trace->trace)
+ surf_cpu_ti_free_trace(trace->trace);
xbt_free(trace);
}
-static surf_cpu_ti_timeSeries_t surf_cpu_ti_time_series_new(tmgr_trace_t
- power_trace,
- double spacing)
+static surf_cpu_ti_trace_t surf_cpu_ti_trace_new(tmgr_trace_t power_trace)
{
- surf_cpu_ti_timeSeries_t series;
- double time, value;
- double previous_time = 0.0;
- unsigned int cpt;
+ surf_cpu_ti_trace_t trace;
s_tmgr_event_t val;
- series = xbt_new0(s_surf_cpu_ti_timeSeries_t, 1);
- series->spacing = spacing;
-
- time = 0.0;
+ unsigned int cpt;
+ double integral = 0;
+ double time = 0;
+ 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));
+ trace->integral =
+ 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) {
- /* delta = the next trace event
- * value = state until next event */
+ trace->time_points[i] = time;
+ trace->integral[i] = integral;
+ integral += val.delta * val.value;
time += val.delta;
- value = val.value;
-
- /* ignore events if time is less than spacing */
- if (time < (series->nb_points) * spacing) {
- continue;
- }
-
- while (previous_time < time) {
- series->values = xbt_realloc(series->values,
- (series->nb_points + 1) * sizeof(double));
- series->values[(series->nb_points)++] = value;
- previous_time += spacing;
- }
- }
-
- return series;
-}
-
-/**
- * \brief Create new levels of points.
- *
- * This function assumes that the input series is
- * evenly spaces, starting at time 0. That is the sort
- * of series produced by surf_cpu_ti_time_series_new()
- *
- * \param original Original timeSeries structure
- * \param factor New factor to spacing
- * \return New timeSeries structure with spacing*factor
- */
-static surf_cpu_ti_timeSeries_t
-surf_cpu_ti_time_series_coarsen(surf_cpu_ti_timeSeries_t original, int factor)
-{
- surf_cpu_ti_timeSeries_t series;
- int j, i = 0;
- double dfactor = (double) (factor);
- double ave;
-
- if (original->nb_points <= factor) {
- DEBUG0("Warning: Not enough data points to coarsen time series");
- return NULL;
+ i++;
}
-
- series = xbt_new0(s_surf_cpu_ti_timeSeries_t, 1);
- series->spacing = (original->spacing) * dfactor;
-
- while (i + factor <= original->nb_points) {
- /* Averaging */
- ave = 0.0;
- for (j = i; j < i + factor; j++) {
- ave += original->values[j];
- }
- ave /= dfactor;
- /* Updating */
- series->values = xbt_realloc(series->values,
- (series->nb_points + 1) * sizeof(double));
- series->values[(series->nb_points)++] = ave;
- i += factor;
- }
-
- return series;
+ trace->time_points[i] = time;
+ trace->integral[i] = integral;
+ return trace;
}
/**
- * \brief Create a new integration trace from a tmgr_trace_t
- *
- * \param power_trace CPU availability trace
- * \param value Percentage of CPU power disponible (usefull to fixed tracing)
- * \param spacing Initial spacing
- * \return Integration trace structure
- */
+* \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 spacing Initial spacing
+* \return Integration trace structure
+*/
static surf_cpu_ti_tgmr_t cpu_ti_parse_trace(tmgr_trace_t power_trace,
double value)
{
surf_cpu_ti_tgmr_t trace;
- surf_cpu_ti_timeSeries_t series;
- int i;
+ double total_time = 0.0;
+ s_tmgr_event_t val;
+ unsigned int cpt;
trace = xbt_new0(s_surf_cpu_ti_tgmr_t, 1);
- /* no availability file, fixed trace */
+/* no availability file, fixed trace */
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;
}
- DEBUG2("Value %lf, Spacing %lf", value, power_trace->timestep);
- series = surf_cpu_ti_time_series_new(power_trace, power_trace->timestep);
- if (!series)
- return NULL;
+ /* only one point available, fixed trace */
+ if (xbt_dynar_length(power_trace->event_list) == 1) {
+ xbt_dynar_get_cpy(power_trace->event_list, 0, &val);
+ trace->type = TRACE_FIXED;
+ trace->value = val.value;
+ return trace;
+ }
trace->type = TRACE_DYNAMIC;
+ trace->power_trace = power_trace;
- trace->levels = xbt_new0(surf_cpu_ti_timeSeries_t, 1);
- trace->levels[(trace->nb_levels)++] = series;
-
- /* Do the coarsening with some arbitrary factors */
- for (i = 1; i < TRACE_NB_LEVELS; i++) {
- series = surf_cpu_ti_time_series_coarsen(trace->levels[i - 1], 4 * i);
-
- if (series) { /* If coarsening was possible, add it */
- trace->levels = xbt_realloc(trace->levels,
- (trace->nb_levels +
- 1) * sizeof(s_surf_cpu_ti_timeSeries_t));
- trace->levels[(trace->nb_levels)++] = series;
- } else { /* otherwise stop */
- break;
- }
+ /* count the total time of trace file */
+ xbt_dynar_foreach(power_trace->event_list, cpt, val) {
+ total_time += val.delta;
}
+ 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);
- /* calcul of initial integrate */
- trace->last_time =
- power_trace->timestep * ((double) (trace->levels[0]->nb_points));
- trace->total = surf_cpu_integrate_trace(trace, 0.0, trace->last_time);
+ XBT_DEBUG("Total integral %lf, last_time %lf ",
+ trace->total, trace->last_time);
return trace;
}
-static cpu_ti_t cpu_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)
{
- cpu_ti_t cpu = xbt_new0(s_cpu_ti_t, 1);
+ tmgr_trace_t empty_trace;
+ s_tmgr_event_t val;
+ 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);
-
- xbt_dict_set(surf_model_resource_set(surf_cpu_model), name, cpu,
- surf_resource_free);
+ 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,
+ xbt_dynar_length(power_trace->event_list) - 1, &val);
+ 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);
+ }
+ }
+ xbt_lib_set(host_lib, name, SURF_CPU_LEVEL, cpu);
return cpu;
}
-static void parse_cpu_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_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;
}
-static void add_traces_cpu(void)
+static void add_traces_cpu_ti(void)
{
xbt_dict_cursor_t cursor = NULL;
char *trace_name, *elm;
return;
called = 1;
- /* connect all traces relative to hosts */
+/* 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_free_trace(cpu->avail_trace);
+ surf_cpu_ti_free_tmgr(cpu->avail_trace);
cpu->avail_trace = cpu_ti_parse_trace(trace, cpu->power_scale);
+
+ /* add a fake trace event if periodicity == 0 */
+ if (trace && xbt_dynar_length(trace->event_list) > 1) {
+ s_tmgr_event_t val;
+ xbt_dynar_get_cpy(trace->event_list,
+ xbt_dynar_length(trace->event_list) - 1, &val);
+ if (val.delta == 0) {
+ 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);
+ }
+ }
}
}
-static void 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_init);
- surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_traces_cpu);
+ surf_parse_host_add_cb(parse_cpu_ti_init);
+ surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_traces_cpu_ti);
}
-static int resource_used(void *resource_id)
+static int cpu_ti_resource_used(void *resource_id)
{
cpu_ti_t cpu = resource_id;
return xbt_swag_size(cpu->action_set);
}
-static int action_unref(surf_action_t action)
+static int cpu_ti_action_unref(surf_action_t action)
{
action->refcount--;
if (!action->refcount) {
/* remove from action_set */
xbt_swag_remove(action, ACTION_GET_CPU(action)->action_set);
/* remove from heap */
- xbt_heap_remove(action_heap, ((surf_action_cpu_ti_t) action)->index_heap);
- xbt_swag_insert(ACTION_GET_CPU(action), modified_cpu);
- free(action);
+ 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);
+ surf_action_free(&action);
return 1;
}
return 0;
}
-static void action_cancel(surf_action_t action)
+static void cpu_ti_action_cancel(surf_action_t action)
{
surf_action_state_set(action, SURF_ACTION_FAILED);
- xbt_heap_remove(action_heap, ((surf_action_cpu_ti_t) action)->index_heap);
- xbt_swag_insert(ACTION_GET_CPU(action), modified_cpu);
+ 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_action_state_set(surf_action_t action,
- e_surf_action_state_t state)
+static void cpu_ti_action_state_set(surf_action_t action,
+ e_surf_action_state_t state)
{
surf_action_state_set(action, state);
- xbt_swag_insert(ACTION_GET_CPU(action), modified_cpu);
+ xbt_swag_insert(ACTION_GET_CPU(action), cpu_ti_modified_cpu);
return;
}
/**
- * \brief Update the remaning amount of actions
- *
- * \param cpu Cpu on which the actions are running
- * \param now Current time
- */
-static void cpu_update_remaining_amount(cpu_ti_t cpu, double now)
+* \brief Update the remaining amount of actions
+*
+* \param cpu Cpu on which the actions are running
+* \param now Current time
+*/
+static void cpu_ti_update_remaining_amount(cpu_ti_t cpu, double now)
{
#define GENERIC_ACTION(action) action->generic_action
double area_total;
surf_action_cpu_ti_t action;
- /* alrealdy updated */
- if (cpu->last_update == now)
+/* already updated */
+ if (cpu->last_update >= now)
return;
- /* calcule the surface */
+/* calcule the surface */
area_total =
- surf_cpu_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;
}
/**
- * \brief Update the finish date of action if necessary
- *
- * \param cpu Cpu on which the actions are running
- * \param now Current time
- */
-static void cpu_update_action_finish_date(cpu_ti_t cpu, double now)
+* \brief Update the finish date of action if necessary
+*
+* \param cpu Cpu on which the actions are running
+* \param now Current time
+*/
+static void cpu_ti_update_action_finish_date(cpu_ti_t cpu, double now)
{
#define GENERIC_ACTION(action) action->generic_action
surf_action_cpu_ti_t action;
double sum_priority = 0.0, total_area, min_finish = -1;
- /* update remaning amount of actions */
- cpu_update_remaining_amount(cpu, now);
+/* update remaning amount of actions */
+ cpu_ti_update_remaining_amount(cpu, now);
xbt_swag_foreach(action, cpu->action_set) {
/* action not running, skip it */
cpu->sum_priority = sum_priority;
xbt_swag_foreach(action, cpu->action_set) {
+ min_finish = -1;
/* action not running, skip it */
if (GENERIC_ACTION(action).state_set !=
surf_cpu_model->states.running_action_set)
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_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(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(action_heap, action, min_finish);
+ xbt_heap_push(cpu_ti_action_heap, action, min_finish);
- DEBUG4
- ("Update finish time: Action: %p, Start Time: %lf Finish Time: %lf Max duration %lf",
- 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, modified_cpu);
+/* remove from modified cpu */
+ xbt_swag_remove(cpu, cpu_ti_modified_cpu);
#undef GENERIC_ACTION
}
-static double share_resources(double now)
+static double cpu_ti_share_resources(double now)
{
cpu_ti_t cpu, cpu_next;
double min_action_duration = -1;
- /* iterates over modified cpus to update share resources */
- xbt_swag_foreach_safe(cpu, cpu_next, modified_cpu) {
- cpu_update_action_finish_date(cpu, now);
+/* iterates over modified cpus to update share resources */
+ xbt_swag_foreach_safe(cpu, cpu_next, cpu_ti_modified_cpu) {
+ cpu_ti_update_action_finish_date(cpu, now);
}
- /* get the min next event if heap not empty */
- if (xbt_heap_size(action_heap) > 0)
- min_action_duration = xbt_heap_maxkey(action_heap) - 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;
- 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;
}
-static void update_actions_state(double now, double delta)
+static void cpu_ti_update_actions_state(double now, double delta)
{
#define GENERIC_ACTION(action) action->generic_action
surf_action_cpu_ti_t action;
- while ((xbt_heap_size(action_heap) > 0)
- && (xbt_heap_maxkey(action_heap) <= now)) {
- DEBUG1("Action %p: finish", action);
- action = xbt_heap_pop(action_heap);
+ 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);
+ 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;
- cpu_action_state_set((surf_action_t) action, SURF_ACTION_DONE);
+ cpu_ti_action_state_set((surf_action_t) action, SURF_ACTION_DONE);
/* update remaining amout of all actions */
- cpu_update_remaining_amount(action->cpu, surf_get_clock());
+ cpu_ti_update_remaining_amount(action->cpu, surf_get_clock());
}
#undef GENERIC_ACTION
}
-static void update_resource_state(void *id,
- tmgr_trace_event_t event_type,
- double value, double date)
+static void cpu_ti_update_resource_state(void *id,
+ tmgr_trace_event_t event_type,
+ double value, double date)
{
cpu_ti_t cpu = id;
surf_action_cpu_ti_t action;
- if (event_type == cpu->state_event) {
+
+ if (event_type == cpu->power_event) {
+ tmgr_trace_t power_trace;
+ surf_cpu_ti_tgmr_t trace;
+ s_tmgr_event_t val;
+
+ 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);
+ xbt_swag_insert(cpu, cpu_ti_modified_cpu);
+
+ power_trace = cpu->avail_trace->power_trace;
+ xbt_dynar_get_cpy(power_trace->event_list,
+ xbt_dynar_length(power_trace->event_list) - 1, &val);
+ /* free old trace */
+ surf_cpu_ti_free_tmgr(cpu->avail_trace);
+ cpu->power_scale = val.value;
+
+ trace = xbt_new0(s_surf_cpu_ti_tgmr_t, 1);
+ trace->type = TRACE_FIXED;
+ trace->value = val.value;
+ XBT_DEBUG("value %lf", val.value);
+
+ cpu->avail_trace = trace;
+
+ if (tmgr_trace_event_free(event_type))
+ cpu->power_event = NULL;
+
+ } else if (event_type == cpu->state_event) {
if (value > 0)
cpu->state_current = SURF_RESOURCE_ON;
else {
|| surf_action_state_get((surf_action_t) action) ==
SURF_ACTION_NOT_IN_THE_SYSTEM) {
action->generic_action.finish = date;
- cpu_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(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();
}
return;
}
-static surf_action_t execute(void *cpu, double size)
+static surf_action_t cpu_ti_execute(void *cpu, double size)
{
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;
- xbt_swag_insert(CPU, modified_cpu);
+ xbt_swag_insert(CPU, cpu_ti_modified_cpu);
xbt_swag_insert(action, CPU->action_set);
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;
}
-static void action_update_index_heap(void *action, int i)
+static void cpu_ti_action_update_index_heap(void *action, int i)
{
((surf_action_cpu_ti_t) action)->index_heap = i;
}
-static surf_action_t action_sleep(void *cpu, double duration)
+static surf_action_t cpu_ti_action_sleep(void *cpu, double duration)
{
surf_action_cpu_ti_t action = NULL;
if (duration > 0)
duration = MAX(duration, MAXMIN_PRECISION);
- XBT_IN2("(%s,%g)", surf_resource_name(cpu), duration);
- action = (surf_action_cpu_ti_t) execute(cpu, 1.0);
+ 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;
if (duration == NO_MAX_DURATION) {
is used to speed up update_resource_state */
xbt_swag_remove(action, ((surf_action_t) action)->state_set);
((surf_action_t) action)->state_set =
- 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 action_suspend(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_swag_insert(ACTION_GET_CPU(action), modified_cpu);
+ 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 action_resume(surf_action_t action)
+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), modified_cpu);
+ xbt_swag_insert(ACTION_GET_CPU(action), cpu_ti_modified_cpu);
}
- XBT_OUT;
+ XBT_OUT();
}
-static int action_is_suspended(surf_action_t action)
+static int cpu_ti_action_is_suspended(surf_action_t action)
{
return (((surf_action_cpu_ti_t) action)->suspended == 1);
}
-static void 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 */
+/* add in action heap */
if (ACT->index_heap >= 0) {
surf_action_cpu_ti_t heap_act =
- xbt_heap_remove(action_heap, ACT->index_heap);
+ xbt_heap_remove(cpu_ti_action_heap, ACT->index_heap);
if (heap_act != ACT)
DIE_IMPOSSIBLE;
}
- xbt_heap_push(action_heap, ACT, min_finish);
+ xbt_heap_push(cpu_ti_action_heap, ACT, min_finish);
- XBT_OUT;
+ XBT_OUT();
}
-static void 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), modified_cpu);
- XBT_OUT;
+ xbt_swag_insert(ACTION_GET_CPU(action), cpu_ti_modified_cpu);
+ XBT_OUT();
}
-static double action_get_remains(surf_action_t action)
+static double cpu_ti_action_get_remains(surf_action_t action)
{
- XBT_IN1("(%p)", action);
- cpu_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 get_state(void *cpu)
+static e_surf_resource_state_t cpu_ti_get_state(void *cpu)
{
return ((cpu_ti_t) cpu)->state_current;
}
-static double get_speed(void *cpu, double load)
+static double cpu_ti_get_speed(void *cpu, double load)
{
return load * (((cpu_ti_t) cpu)->power_peak);
}
/**
- * \brief Auxiliar function to update the cpu power 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
- * \param a Time
- * \return Cpu power scale
+* \brief Auxiliary function to update the CPU power 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
+* \param a Time
+* \return CPU power scale
*/
-static double surf_cpu_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;
+ s_tmgr_event_t val;
reduced_a = a - floor(a / trace->last_time) * trace->last_time;
- point = (int) (reduced_a / trace->levels[0]->spacing);
- return trace->levels[0]->values[point];
+ 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, point, &val);
+ return val.value;
}
-static double get_available_speed(void *cpu)
+static double cpu_ti_get_available_speed(void *cpu)
{
cpu_ti_t CPU = cpu;
CPU->power_scale =
- surf_cpu_get_power_scale(CPU->avail_trace, surf_get_clock());
- /* number between 0 and 1 */
+ surf_cpu_ti_get_power_scale(CPU->avail_trace, surf_get_clock());
+/* number between 0 and 1 */
return CPU->power_scale;
}
-static void finalize(void)
+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_free_trace(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(running_action_set_that_does_not_need_being_checked);
- xbt_swag_free(modified_cpu);
- running_action_set_that_does_not_need_being_checked = NULL;
- xbt_heap_free(action_heap);
+ 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);
}
-static void surf_cpu_model_init_internal(void)
+static void surf_cpu_ti_model_init_internal(void)
{
s_surf_action_t action;
s_cpu_ti_t cpu;
surf_cpu_model = surf_model_init();
- running_action_set_that_does_not_need_being_checked =
- xbt_swag_new(xbt_swag_offset(action, state_hookup));
+ cpu_ti_running_action_set_that_does_not_need_being_checked =
+ xbt_swag_new(xbt_swag_offset(action, state_hookup));
- 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->action_unref = action_unref;
- surf_cpu_model->action_cancel = action_cancel;
- surf_cpu_model->action_state_set = cpu_action_state_set;
+ surf_cpu_model->action_unref = cpu_ti_action_unref;
+ surf_cpu_model->action_cancel = cpu_ti_action_cancel;
+ surf_cpu_model->action_state_set = cpu_ti_action_state_set;
- surf_cpu_model->model_private->resource_used = resource_used;
- surf_cpu_model->model_private->share_resources = share_resources;
- surf_cpu_model->model_private->update_actions_state = update_actions_state;
+ 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_resource_state =
- update_resource_state;
- surf_cpu_model->model_private->finalize = finalize;
-
- surf_cpu_model->suspend = action_suspend;
- surf_cpu_model->resume = action_resume;
- surf_cpu_model->is_suspended = action_is_suspended;
- surf_cpu_model->set_max_duration = action_set_max_duration;
- surf_cpu_model->set_priority = action_set_priority;
- surf_cpu_model->get_remains = action_get_remains;
-
- surf_cpu_model->extension.cpu.execute = execute;
- surf_cpu_model->extension.cpu.sleep = action_sleep;
-
- surf_cpu_model->extension.cpu.get_state = get_state;
- surf_cpu_model->extension.cpu.get_speed = get_speed;
- surf_cpu_model->extension.cpu.get_available_speed = get_available_speed;
-
- action_heap = xbt_heap_new(8, NULL);
- xbt_heap_set_update_callback(action_heap, action_update_index_heap);
+ 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->resume = cpu_ti_action_resume;
+ surf_cpu_model->is_suspended = cpu_ti_action_is_suspended;
+ surf_cpu_model->set_max_duration = cpu_ti_action_set_max_duration;
+ surf_cpu_model->set_priority = cpu_ti_action_set_priority;
+ surf_cpu_model->get_remains = cpu_ti_action_get_remains;
+
+ surf_cpu_model->extension.cpu.execute = cpu_ti_execute;
+ surf_cpu_model->extension.cpu.sleep = cpu_ti_action_sleep;
+
+ 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.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);
}
-void surf_cpu_model_init_ti(const char *filename)
+void surf_cpu_model_init_ti()
{
if (surf_cpu_model)
return;
- surf_cpu_model_init_internal();
- define_callbacks(filename);
+ surf_cpu_ti_model_init_internal();
+ cpu_ti_define_callbacks();
xbt_dynar_push(model_list, &surf_cpu_model);
}
-///////////////// BEGIN INTEGRAL //////////////
-
/**
- * \brief Integrate trace
- *
- * Wrapper around surf_cpu_integrate_trace_simple() to get
- * the cyclic effect.
- *
- * \param trace Trace structure.
- * \param a Begin of interval
- * \param b End of interval
- * \return the integrate value. -1 if an error occurs.
- */
-static double surf_cpu_integrate_trace(surf_cpu_ti_tgmr_t trace, double a,
- double b)
+* \brief Integrate trace
+*
+* Wrapper around surf_cpu_integrate_trace_simple() to get
+* the cyclic effect.
+*
+* \param trace Trace structure.
+* \param a Begin of interval
+* \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)
{
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)
b_index = (int) (floor(b / trace->last_time));
if (a_index > b_index) { /* Same chunk */
- return surf_cpu_integrate_trace_simple(trace,
- a - (a_index -
- 1) * trace->last_time,
- b - (b_index) * trace->last_time);
+ return surf_cpu_ti_integrate_trace_simple(trace->trace,
+ a - (a_index -
+ 1) * trace->last_time,
+ b -
+ (b_index) *
+ trace->last_time);
}
- first_chunk = surf_cpu_integrate_trace_simple(trace,
- a - (a_index -
- 1) * trace->last_time,
- trace->last_time);
+ first_chunk = surf_cpu_ti_integrate_trace_simple(trace->trace,
+ a - (a_index -
+ 1) *
+ trace->last_time,
+ trace->last_time);
middle_chunk = (b_index - a_index) * trace->total;
- last_chunk = surf_cpu_integrate_trace_simple(trace,
- 0.0,
- b -
- (b_index) * trace->last_time);
+ last_chunk = surf_cpu_ti_integrate_trace_simple(trace->trace,
+ 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);
}
/**
- * \brief Integrate the trace between a and b.
- *
- * integrates without taking cyclic-traces into account.
- * [a,b] \subset [0,last_time]
- *
- * \param trace Trace structure.
- * \param a Begin of interval
- * \param b End of interval
- * \return the integrate value. -1 if an error occurs.
- */
-static double surf_cpu_integrate_trace_simple(surf_cpu_ti_tgmr_t trace,
- double a, double b)
+ * \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.
+ * \param trace Trace structure
+ * \param a Initial point
+ * \param b Final point
+ * \return Integral
+*/
+static double surf_cpu_ti_integrate_trace_simple(surf_cpu_ti_trace_t trace,
+ double a, double b)
{
- double integral = 0.0;
- int i;
- long index;
- int top_level = 0;
- long l_bounds[TRACE_NB_LEVELS];
- long u_bounds[TRACE_NB_LEVELS];
- double a_divided_by_spacing;
- double current_spacing;
- DEBUG2("Computing simple integral on [%.2f , %.2f]\n", a, b);
-
- /* Sanity checks */
- if ((a < 0.0) || (b < a) || (a > trace->last_time)
- || (b > trace->last_time)) {
- CRITICAL2
- ("Error, invalid integration interval [%.2f,%.2f]. You probably have a task executing with negative computation amount. Check your code.",
- a, b);
- xbt_abort();
- }
- if (b == a) {
- return 0.0;
- }
-
- for (i = 0; i < trace->nb_levels; i++) {
- a_divided_by_spacing = a / trace->levels[i]->spacing;
- if (ceil(a_divided_by_spacing) == a_divided_by_spacing)
- l_bounds[i] = 1 + (long) ceil(a_divided_by_spacing);
- else
- l_bounds[i] = (long) (ceil(a_divided_by_spacing));
- if (b == trace->last_time) {
- u_bounds[i] = (long) (floor(b / trace->levels[i]->spacing)) - 1;
- } else {
- u_bounds[i] = (long) (floor(b / trace->levels[i]->spacing));
- }
- DEBUG3("level %d: l%ld u%ld\n", i, l_bounds[i], u_bounds[i]);
-
- if (l_bounds[i] <= u_bounds[i])
- top_level = i;
- }
- DEBUG1("top_level=%d\n", top_level);
-
- /* Are a and b BOTH in the same chunk of level 0 ? */
- if (l_bounds[0] > u_bounds[0]) {
- return (b - a) * (trace->levels[0]->values[u_bounds[0]]);
- }
-
- /* first sub-level amount */
- integral += ((l_bounds[0]) * (trace->levels[0]->spacing) - a) *
- (trace->levels[0]->values[l_bounds[0] - 1]);
-
- DEBUG1("Initial level 0 amount is %.2f\n", integral);
-
- /* first n-1 levels */
- for (i = 0; i < top_level; i++) {
-
- if (l_bounds[i] >= u_bounds[i])
- break;
-
- current_spacing = trace->levels[i]->spacing;
- index = l_bounds[i];
-
- DEBUG1("L%d:", i);
-
- while (double_positive
- (l_bounds[i + 1] * trace->levels[i + 1]->spacing -
- index * current_spacing)) {
- integral += current_spacing * trace->levels[i]->values[index];
- DEBUG2("%.2f->%.2f|",
- index * (trace->levels[i]->spacing),
- (index + 1) * (trace->levels[i]->spacing));
- index++;
- }
-
- DEBUG0("\n");
- }
-
- DEBUG1("After going up: %.2f\n", integral);
-
- /* n-th level */
- current_spacing = trace->levels[top_level]->spacing;
- index = l_bounds[top_level];
-
- DEBUG1("L%d:", top_level);
-
- while (index < u_bounds[top_level]) {
- integral += current_spacing * trace->levels[top_level]->values[index];
-
- DEBUG2("%.2f->%.2f|",
- index * (trace->levels[top_level]->spacing),
- (index + 1) * (trace->levels[top_level]->spacing));
-
- index++;
- }
-
- DEBUG0("\n");
- DEBUG1("After steady : %.2f\n", integral);
-
- /* And going back down */
- for (i = top_level - 1; i >= 0; i--) {
- if (l_bounds[i] > u_bounds[i])
- break;
-
- current_spacing = trace->levels[i]->spacing;
- index = u_bounds[i + 1] * (trace->levels[i + 1]->spacing /
- current_spacing);
- DEBUG1("L%d:", i);
- while (double_positive
- ((u_bounds[i]) * current_spacing - index * current_spacing)) {
- integral += current_spacing * trace->levels[i]->values[index];
- DEBUG2("%.2f->%.2f|",
- index * (trace->levels[i]->spacing),
- (index + 1) * (trace->levels[i]->spacing));
- index++;
- }
- }
-
- DEBUG1("After going down : %.2f", integral);
-
-
- /* Little piece at the end */
- integral += (b - u_bounds[0] * (trace->levels[0]->spacing)) *
- (trace->levels[0]->values[u_bounds[0]]);
+ return surf_cpu_ti_integrate_trace_simple_point(trace,
+ b) -
+ surf_cpu_ti_integrate_trace_simple_point(trace, a);
+}
- DEBUG1("After last bit : %.2f", integral);
+/**
+ * \brief Auxiliary function to calculate the integral at point a.
+ * \param trace Trace structure
+ * \param a point
+ * \return Integral
+*/
+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);
+ integral += trace->integral[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]);
+ XBT_DEBUG("Integral a %lf = %lf", a, integral);
return integral;
}
-
/**
- * \brief Calcul the time needed to execute "amount" on cpu.
- *
- * Here, amount can span multiple trace periods
- *
- * \param trace CPU trace structure
- * \param a Initial time
- * \param amount Amount of calcul to be executed
- * \return End time
- */
-static double surf_cpu_solve_trace(surf_cpu_ti_tgmr_t trace, double a,
- double amount)
+* \brief Calculate the time needed to execute "amount" on cpu.
+*
+* Here, amount can span multiple trace periods
+*
+* \param trace CPU trace structure
+* \param a Initial time
+* \param amount Amount to be executed
+* \return End time
+*/
+static double surf_cpu_ti_solve_trace(surf_cpu_ti_tgmr_t trace, double a,
+ double amount)
{
int quotient;
double reduced_b;
double reduced_a;
double b;
- /* Fix very small negative numbers */
+/* Fix very small negative numbers */
if ((a < 0.0) && (a > -EPSILON)) {
a = 0.0;
}
amount = 0.0;
}
- /* Sanity checks */
+/* 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();
}
- /* At this point, a and amount are positive */
+/* At this point, a and amount are positive */
if (amount < EPSILON)
return a;
- /* Is the trace fixed ? */
+/* Is the trace fixed ? */
if (trace->type == TRACE_FIXED) {
return (a + (amount / trace->value));
}
- /* Reduce the problem to one where 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_a = %.2f\n",reduced_a);
- fprintf(stderr,"reduced_amount = %.2f\n",reduced_amount);
- */
+/* Now solve for new_amount which is <= trace_total */
+/*
+ fprintf(stderr,"reduced_a = %.2f\n",reduced_a);
+ fprintf(stderr,"reduced_amount = %.2f\n",reduced_amount);
+ */
reduced_b =
- surf_cpu_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 */
+/* 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;
}
/**
- * \brief Auxiliar function to solve integral
- *
- * Here, amount is <= trace->total
- * and a <=trace->last_time
- *
- */
-static double surf_cpu_solve_trace_somewhat_simple(surf_cpu_ti_tgmr_t trace,
- double a, double amount)
+* \brief Auxiliary function to solve integral
+*
+* Here, amount is <= trace->total
+* and a <=trace->last_time
+*
+*/
+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("In solveTraceIntegralSomewhatSimple(): [%.2f, amount=%.2f]",
- a, amount);
-
- amount_till_end = surf_cpu_integrate_trace(trace, a, trace->last_time);
- /*
- fprintf(stderr,"amount_till_end=%.2f\n",amount_till_end);
- */
+ 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);
+ */
if (amount_till_end > amount) {
- b = surf_cpu_solve_trace_simple(trace, a, amount);
+ b = surf_cpu_ti_solve_trace_simple(trace->trace, a, amount);
} else {
b = trace->last_time +
- surf_cpu_solve_trace_simple(trace, 0.0, amount - amount_till_end);
+ surf_cpu_ti_solve_trace_simple(trace->trace, 0.0,
+ amount - amount_till_end);
}
-
return b;
}
/**
- * \brief Auxiliar function to solve integral
- * surf_cpu_solve_trace_simple()
- *
- * solve for the upper bound without taking
- * cyclic-traces into account.
- *
- * [a,y] \subset [0,last_time]
- *
- */
-static double surf_cpu_solve_trace_simple(surf_cpu_ti_tgmr_t trace, double a,
- double amount)
+ * \brief Auxiliary function to solve integral.
+ * 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
+ * \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)
{
- double next_chunk;
- double remains;
- int i;
- long index;
- int top_level;
- double b;
- int done;
- long l_bounds[TRACE_NB_LEVELS]; /* May be too bgi for this trace */
- double a_divided_by_spacing;
- double current_spacing;
-
- DEBUG2("Solving simple integral [x=%.2f,amount=%.2f]", a, amount);
-
- /* Sanity checks */
- if ((a < 0.0) || (amount < 0.0) || (a > trace->last_time)) {
- CRITICAL2
- ("Error, invalid parameters [a = %.2f, amount = %.2f]. You probably have a task executing with negative computation amount. Check your code.",
- a, amount);
- xbt_abort();
- }
- if (amount == 0.0) {
- /* fprintf(stderr,"Warning: trivial integral solve\n"); */
- return a;
- }
-
- for (i = 0; i < trace->nb_levels; i++) {
- a_divided_by_spacing = a / trace->levels[i]->spacing;
- if (ceil(a_divided_by_spacing) == a_divided_by_spacing)
- l_bounds[i] = 1 + (long) ceil(a_divided_by_spacing);
- else
- l_bounds[i] = (long) (ceil(a_divided_by_spacing));
-
- if ((l_bounds[i] + 1) * trace->levels[i]->spacing > trace->last_time)
- break;
-
- DEBUG2("level %d: l%ld", i, l_bounds[i]);
- }
- if (i == trace->nb_levels)
- top_level = trace->nb_levels - 1;
- else {
- top_level = i;
- }
-
- remains = amount;
- /* first sub-level amount */
- next_chunk = ((l_bounds[0]) * (trace->levels[0]->spacing) - a) *
- (trace->levels[0]->values[l_bounds[0] - 1]);
-
- if (remains - next_chunk < 0.0) {
- b = a + (amount / trace->levels[0]->values[l_bounds[0] - 1]);
-
- DEBUG1("Returning sub-level[0] result %.2f", b);
-
- return b;
- } else {
- b = (l_bounds[0]) * (trace->levels[0]->spacing);
- remains -= next_chunk;
- }
- DEBUG2("After sub-0 stuff: remains %.2f (b=%.2f)", remains, b);
-
- /* first n-1 levels */
- DEBUG0("Going up levels");
-
- done = 0;
- for (i = 0; i < top_level; i++) {
-
- current_spacing = trace->levels[i]->spacing;
- index = l_bounds[i];
-
- DEBUG1("L%d:", i);
-
- while (double_positive
- (l_bounds[i + 1] * trace->levels[i + 1]->spacing -
- index * current_spacing)
- && ((index + 1) * (current_spacing) < trace->last_time)) {
-
- next_chunk = current_spacing * trace->levels[i]->values[index];
-
- DEBUG3("%.2f next_chunk= %.2f remains=%.2f",
- (index + 1) * (trace->levels[i]->spacing), next_chunk, remains);
-
- if (remains - next_chunk < 0.0) { /* Too far */
- done = 1;
- break;
- } else { /* Keep going */
- DEBUG2("%.2f->%.2f|",
- index * (trace->levels[i]->spacing),
- (index + 1) * (trace->levels[i]->spacing));
-
- remains -= next_chunk;
- b = (index + 1) * (current_spacing);
- }
- index++;
- }
- if (done)
- break;
- }
-
- DEBUG0("Steady");
-
- /* n-th level */
- current_spacing = trace->levels[top_level]->spacing;
- index = l_bounds[top_level];
-
- DEBUG1("L%d:", top_level);
-
- while (index < trace->levels[top_level]->nb_points) {
- next_chunk = current_spacing * trace->levels[top_level]->values[index];
- if (remains - next_chunk <= 0.0) { /* Too far */
- break;
- } else {
- DEBUG2("%.2f->%.2f|",
- index * (trace->levels[top_level]->spacing),
- (index + 1) * (trace->levels[top_level]->spacing));
-
- remains -= next_chunk;
- b = (index + 1) * (current_spacing);
- }
- index++;
- }
- DEBUG2("remains = %.2f b=%.2f", remains, b);
-
- /* And going back down */
- DEBUG0("Going back down");
- for (i = top_level - 1; i >= 0; i--) {
-
- current_spacing = trace->levels[i]->spacing;
- index = b / (trace->levels[i]->spacing);
+ 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);
+ 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]));
+
+ return time;
+}
- DEBUG1("L%d:", i);
+/**
+ * \brief Binary search in array.
+ * 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
+ * \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)
+{
+ xbt_assert(low < high, "Wrong parameters: low (%d) should be smaller than"
+ " high (%d)", low, high);
- while (index < trace->levels[i]->nb_points) {
- next_chunk = current_spacing * trace->levels[i]->values[index];
- if (remains - next_chunk <= 0.0) { /* Too far */
- break;
- } else {
- DEBUG2("%.2f->%.2f|",
- index * (current_spacing), (index + 1) * (current_spacing));
+ 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]);
- remains -= next_chunk;
- b += current_spacing;
- }
- index++;
- }
+ if (array[mid] > a)
+ high = mid;
+ else
+ low = mid;
}
+ while (low < high - 1);
- DEBUG2("remains = %.2f b=%.2f\n", remains, b);
- DEBUG1("Last bit index=%ld\n", index);
-
- /* Little piece at the end */
- b += (remains) / (trace->levels[0]->values[index]);
-
- return b;
+ return low;
}
-
-//////////// END INTEGRAL /////////////////
