* 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.
+ 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"
-
+#include "surf/surf_resource.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_ti, surf,
"Logging specific to the SURF CPU TRACE INTEGRATION module");
static void surf_cpu_ti_free_trace(surf_cpu_ti_trace_t trace)
{
- if (trace->time_points)
- xbt_free(trace->time_points);
- if (trace->integral)
- xbt_free(trace->integral);
+ xbt_free(trace->time_points);
+ xbt_free(trace->integral);
xbt_free(trace);
}
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_dynar_length(power_trace->s_list.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) {
+ (xbt_dynar_length(power_trace->s_list.event_list) + 1));
+ trace->nb_points = xbt_dynar_length(power_trace->s_list.event_list);
+ xbt_dynar_foreach(power_trace->s_list.event_list, cpt, val) {
trace->time_points[i] = time;
trace->integral[i] = integral;
integral += val.delta * val.value;
/**
* \brief Creates a new integration trace from a tmgr_trace_t
*
-* \param power_trace CPU availability trace
-* \param value Percentage of CPU power available (useful to fixed tracing)
-* \param spacing Initial spacing
-* \return Integration trace structure
+* \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)
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;
}
/* 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);
+ if (xbt_dynar_length(power_trace->s_list.event_list) == 1) {
+ xbt_dynar_get_cpy(power_trace->s_list.event_list, 0, &val);
trace->type = TRACE_FIXED;
trace->value = val.value;
return trace;
trace->power_trace = power_trace;
/* count the total time of trace file */
- xbt_dynar_foreach(power_trace->event_list, cpt, val) {
+ xbt_dynar_foreach(power_trace->s_list.event_list, cpt, val) {
total_time += val.delta;
}
trace->trace = surf_cpu_ti_trace_new(power_trace);
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,
+static void* cpu_ti_create_resource(const char *name, double power_peak,
double power_scale,
tmgr_trace_t power_trace,
int core,
{
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),
+ 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_assert0(core==1,"Multi-core not handled with this model yet");
+ 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->generic_resource.model = surf_cpu_model;
- cpu->generic_resource.name = name;
- cpu->generic_resource.properties = cpu_properties;
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);
- if (power_trace && xbt_dynar_length(power_trace->event_list) > 1) {
+ if (power_trace && xbt_dynar_length(power_trace->s_list.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);
+ xbt_dynar_get_cpy(power_trace->s_list.event_list,
+ xbt_dynar_length(power_trace->s_list.event_list) - 1, &val);
if (val.delta == 0) {
empty_trace = tmgr_empty_trace_new();
cpu->power_event =
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(sg_platf_host_cbarg_t host)
{
- double power_peak = 0.0;
- double power_scale = 0.0;
- int core = 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);
- surf_parse_get_int(&core, A_surfxml_host_core);
-
- 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, core, state_initial, state_trace,
- current_property_set);
+ cpu_ti_create_resource(host->id,
+ host->power_peak,
+ host->power_scale,
+ host->power_trace,
+ host->core_amount,
+ host->initial_state,
+ host->state_trace,
+ host->properties);
}
/* 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",
+ 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);
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) {
+ if (trace && xbt_dynar_length(trace->s_list.event_list) > 1) {
s_tmgr_event_t val;
- xbt_dynar_get_cpy(trace->event_list,
- xbt_dynar_length(trace->event_list) - 1, &val);
+ xbt_dynar_get_cpy(trace->s_list.event_list,
+ xbt_dynar_length(trace->s_list.event_list) - 1, &val);
if (val.delta == 0) {
tmgr_trace_t empty_trace;
empty_trace = tmgr_empty_trace_new();
}
}
-static void cpu_ti_define_callbacks(const char *file)
+static void cpu_ti_define_callbacks()
{
- surfxml_add_callback(STag_surfxml_host_cb_list, parse_cpu_ti_init);
- surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_traces_cpu_ti);
+ sg_platf_host_add_cb(parse_cpu_ti_init);
+ sg_platf_postparse_add_cb(add_traces_cpu_ti);
}
static int cpu_ti_resource_used(void *resource_id)
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;
/**
* \brief Update the remaining amount of actions
*
-* \param cpu Cpu on which the actions are running
-* \param now Current time
+* \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;
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,
+ XBT_DEBUG("Flops total: %lf, Last update %lf", area_total,
cpu->last_update);
xbt_swag_foreach(action, cpu->action_set) {
+ surf_action_t generic = (surf_action_t)action;
/* action not running, skip it */
- if (GENERIC_ACTION(action).state_set !=
+ if (generic->state_set !=
surf_cpu_model->states.running_action_set)
continue;
/* bogus priority, skip it */
- if (GENERIC_ACTION(action).priority <= 0)
+ if (generic->priority <= 0)
continue;
/* action suspended, skip it */
continue;
/* action don't need update */
- if (GENERIC_ACTION(action).start >= now)
+ if (generic->start >= now)
continue;
/* skip action that are finishing now */
- if (GENERIC_ACTION(action).finish >= 0
- && GENERIC_ACTION(action).finish <= now)
+ if (generic->finish >= 0
+ && generic->finish <= now)
continue;
/* update remaining */
- double_update(&(GENERIC_ACTION(action).remains),
+ double_update(&(generic->remains),
area_total / (cpu->sum_priority *
- GENERIC_ACTION(action).priority));
- DEBUG2("Update remaining action(%p) remaining %lf", action,
- GENERIC_ACTION(action).remains);
+ generic->priority));
+ XBT_DEBUG("Update remaining action(%p) remaining %lf", action,
+ generic->remains);
}
cpu->last_update = now;
#undef GENERIC_ACTION
/**
* \brief Update the finish date of action if necessary
*
-* \param cpu Cpu on which the actions are running
-* \param now Current time
+* \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)
{
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);
if (min_finish != NO_MAX_DURATION)
xbt_heap_push(cpu_ti_action_heap, action, min_finish);
- DEBUG5
+ 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,
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;
cpu_ti_t cpu = id;
surf_action_cpu_ti_t action;
+ surf_watched_hosts();
+
if (event_type == cpu->power_event) {
tmgr_trace_t power_trace;
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);
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);
+ xbt_dynar_get_cpy(power_trace->s_list.event_list,
+ xbt_dynar_length(power_trace->s_list.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;
- DEBUG1("value %lf", val.value);
+ XBT_DEBUG("value %lf", val.value);
cpu->avail_trace = trace;
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);
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;
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_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)
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;
}
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)
{
- 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);
+ XBT_IN("(%p)", action);
cpu_ti_update_remaining_amount((cpu_ti_t)
((surf_action_cpu_ti_t) action)->cpu,
surf_get_clock());
+ XBT_OUT();
return action->remains;
- XBT_OUT;
}
static e_surf_resource_state_t cpu_ti_get_state(void *cpu)
/**
* \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
+* 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_ti_get_power_scale(surf_cpu_ti_tgmr_t trace,
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);
+ xbt_dynar_get_cpy(trace->power_trace->s_list.event_list, point, &val);
return val.value;
}
return CPU->power_scale;
}
-static void cpu_ti_create_resource(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)
-{
- xbt_assert0(core==1,"Multi-core not handled with this model yet");
- cpu_ti_new(name, power_peak, power_scale, power_trace, core,
- state_initial, state_trace, cpu_properties);
-}
-
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);
cpu_ti_modified_cpu =
xbt_swag_new(xbt_swag_offset(cpu, modified_cpu_hookup));
- surf_cpu_model->name = "CPU_TI";
+ surf_cpu_model->name = "cpu_ti";
surf_cpu_model->action_unref = cpu_ti_action_unref;
surf_cpu_model->action_cancel = cpu_ti_action_cancel;
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);
}
-void surf_cpu_model_init_ti(const char *filename)
+void surf_cpu_model_init_ti()
{
- if (surf_cpu_model)
- return;
+ xbt_assert(!surf_cpu_model,"CPU model already initialized. This should not happen.");
surf_cpu_ti_model_init_internal();
- cpu_ti_define_callbacks(filename);
+ cpu_ti_define_callbacks();
xbt_dynar_push(model_list, &surf_cpu_model);
}
* the cyclic effect.
*
* \param trace Trace structure.
-* \param a Begin of interval
-* \param b End of interval
+* \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,
int a_index, b_index;
if ((a < 0.0) || (a > b)) {
- CRITICAL2
+ 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();
(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 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
+ * 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)
/**
* \brief Auxiliary function to calculate the integral at point a.
- * \param trace Trace structure
- * \param a point
- * \return Integral
+ * \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)
surf_cpu_ti_binary_search(trace->time_points, a, 0,
trace->nb_points - 1);
integral += trace->integral[ind];
- DEBUG7
+ 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]);
trace->
time_points
[ind]);
- DEBUG2("Integral a %lf = %lf", a, integral);
+ XBT_DEBUG("Integral a %lf = %lf", a, integral);
return integral;
}
*
* 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
+* \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)
/* Sanity checks */
if ((a < 0.0) || (amount < 0.0)) {
- CRITICAL2
+ 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_a = %.2f\n",reduced_a);
- fprintf(stderr,"reduced_amount = %.2f\n",reduced_amount);
+ fprintf(stderr,"reduced_a = %.2f\n",reduced_a);
+ fprintf(stderr,"reduced_amount = %.2f\n",reduced_amount);
*/
reduced_b =
surf_cpu_ti_solve_trace_somewhat_simple(trace, reduced_a,
double amount_till_end;
double b;
- DEBUG2("Solve integral: [%.2f, amount=%.2f]", a, amount);
+ 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);
+ fprintf(stderr,"amount_till_end=%.2f\n",amount_till_end);
*/
if (amount_till_end > 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
+ * 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,
/**
* \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
+ * 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)
{
- 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;
}
