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->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;
s_tmgr_event_t val;
cpu_ti_t cpu = xbt_new0(s_cpu_ti_t, 1);
s_surf_action_cpu_ti_t ti_action;
- xbt_assert1(!surf_model_resource_by_name(surf_cpu_model, name),
+ 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->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;
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;
}
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) ||
+ xbt_assert((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_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);
+ 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",
+ 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);
static void cpu_ti_define_callbacks(const char *file)
{
- surfxml_add_callback(STag_surfxml_host_cb_list, parse_cpu_ti_init);
+ surfxml_add_callback(ETag_surfxml_host_cb_list, parse_cpu_ti_init);
surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_traces_cpu_ti);
}
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;
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) {
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;
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;
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;
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());
return action->remains;
- XBT_OUT;
+ XBT_OUT();
}
static e_surf_resource_state_t cpu_ti_get_state(void *cpu)
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->event_list, point, &val);
return val.value;
}
tmgr_trace_t state_trace,
xbt_dict_t cpu_properties)
{
- 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_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);
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);
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;
}
/* 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 */
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);
/*
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;
+ while(low<high) {
+ mid = low + (high - low) / 2;
+ XBT_DEBUG("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)
+ low = mid + 1;
+ else
+ high = mid - 1;
+ }
+ return mid;
}
