-/* $Id$ */
-
-/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */
+/* Copyright (c) 2004, 2005, 2007, 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. */
static xbt_dict_t trace_list = NULL;
-tmgr_history_t tmgr_history_new(void)
+XBT_INLINE tmgr_history_t tmgr_history_new(void)
{
tmgr_history_t h;
return h;
}
-void tmgr_history_free(tmgr_history_t h)
+XBT_INLINE void tmgr_history_free(tmgr_history_t h)
{
xbt_heap_free(h->heap);
free(h);
}
tmgr_trace_t tmgr_trace_new_from_string(const char *id, const char *input,
- double periodicity, double timestep)
+ double periodicity)
{
tmgr_trace_t trace = NULL;
int linecount = 0;
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);
if (sscanf(val, "PERIODICITY " "%lg" "\n", &periodicity) == 1)
continue;
- if (sscanf(val, "TIMESTEP " "%lg" "\n", ×tep) == 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;
- trace->timestep = timestep;
-
if (!trace_list)
trace_list = xbt_dict_new();
tmgr_trace_t tmgr_trace_new(const char *filename)
{
+ 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, ":"));
- char *tstr = xbt_str_from_file(f);
+ tstr = xbt_str_from_file(f);
fclose(f);
- trace = tmgr_trace_new_from_string(filename, tstr, 0., 10.);
+ trace = tmgr_trace_new_from_string(filename, tstr, 0.);
xbt_free(tstr);
return trace;
return trace;
}
-void tmgr_trace_free(tmgr_trace_t trace)
+XBT_INLINE void tmgr_trace_free(tmgr_trace_t trace)
{
if (!trace)
return;
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);
return trace_event;
}
-double tmgr_history_next_date(tmgr_history_t h)
+XBT_INLINE double tmgr_history_next_date(tmgr_history_t h)
{
if (xbt_heap_size(h->heap))
return (xbt_heap_maxkey(h->heap));
return trace_event;
}
-void tmgr_finalize(void)
+XBT_INLINE void tmgr_finalize(void)
{
xbt_dict_free(&trace_list);
}