if (trace_list) {
trace = xbt_dict_get_or_null(trace_list, id);
if (trace) {
- WARN1("Ignoring redefinition of trace %s", id);
+ XBT_WARN("Ignoring redefinition of trace %s", id);
return trace;
}
}
- xbt_assert1(periodicity >= 0,
+ xbt_assert(periodicity >= 0,
"Invalid periodicity %lg (must be positive)", periodicity);
trace = xbt_new0(s_tmgr_trace_t, 1);
continue;
if (sscanf(val, "%lg" " " "%lg" "\n", &event.delta, &event.value) != 2)
- xbt_die(bprintf
- ("%s:%d: Syntax error in trace\n%s", id, linecount, input));
+ xbt_die("%s:%d: Syntax error in trace\n%s", id, linecount, input);
if (last_event) {
if (last_event->delta > event.delta) {
- xbt_die(bprintf
- ("%s:%d: Invalid trace: Events must be sorted, but time %lg > time %lg.\n%s",
- id, linecount, last_event->delta, event.delta, input));
+ xbt_die("%s:%d: Invalid trace: Events must be sorted, "
+ "but time %lg > time %lg.\n%s",
+ id, linecount, last_event->delta, event.delta, input);
}
last_event->delta = event.delta - last_event->delta;
}
xbt_dynar_push(trace->event_list, &event);
last_event =
- xbt_dynar_get_ptr(trace->event_list,
- xbt_dynar_length(trace->event_list) - 1);
+ xbt_dynar_get_ptr(trace->event_list,
+ xbt_dynar_length(trace->event_list) - 1);
}
if (last_event)
last_event->delta = periodicity;
tmgr_trace_t tmgr_trace_new(const char *filename)
{
- char *tstr = NULL;
+ char *tstr = NULL;
FILE *f = NULL;
tmgr_trace_t trace = NULL;
if (trace_list) {
trace = xbt_dict_get_or_null(trace_list, filename);
if (trace) {
- WARN1("Ignoring redefinition of trace %s", filename);
+ XBT_WARN("Ignoring redefinition of trace %s", filename);
return trace;
}
}
f = surf_fopen(filename, "r");
- xbt_assert2(f!=NULL, "Cannot open file '%s' (path=%s)", filename,
- xbt_str_join(surf_path,":"));
+ xbt_assert(f != NULL, "Cannot open file '%s' (path=%s)", filename,
+ xbt_str_join(surf_path, ":"));
tstr = xbt_str_from_file(f);
fclose(f);
trace_event->idx = offset;
trace_event->model = model;
- xbt_assert0((trace_event->idx < xbt_dynar_length(trace->event_list)),
+ xbt_assert((trace_event->idx < xbt_dynar_length(trace->event_list)),
"You're referring to an event that does not exist!");
xbt_heap_push(h->heap, trace_event, start_time);