h = xbt_new0(s_tmgr_history_t, 1);
- h->heap = xbt_heap_new(8, xbt_free); /* Why 8 ? Well, why not... */
+ h->heap = xbt_heap_new(8, free); /* Why 8 ? Well, why not... */
return h;
}
void tmgr_history_free(tmgr_history_t h)
{
xbt_heap_free(h->heap);
- xbt_free(h);
+ free(h);
}
tmgr_trace_t tmgr_trace_new(const char *filename)
return trace;
}
+tmgr_trace_t tmgr_empty_trace_new(void)
+{
+ tmgr_trace_t trace = NULL;
+ double periodicity = -1.0; /* No periodicity by default */
+ s_tmgr_event_t event;
+ tmgr_event_t last_event = NULL;
+
+ trace = xbt_new0(s_tmgr_trace_t, 1);
+ trace->event_list = xbt_dynar_new(sizeof(s_tmgr_event_t), NULL);
+
+ event.delta = 0.0;
+ event.value = 0.0;
+ xbt_dynar_push(trace->event_list, &event);
+
+ return trace;
+}
void tmgr_trace_free(tmgr_trace_t trace)
{
if (!trace)
return;
xbt_dynar_free(&(trace->event_list));
- xbt_free(trace);
+ free(trace);
}
tmgr_trace_event_t tmgr_history_add_trace(tmgr_history_t h,
{
tmgr_trace_event_t trace_event = NULL;
-
trace_event = xbt_new0(s_tmgr_trace_event_t, 1);
trace_event->trace = trace;
trace_event->idx = offset;
double *value,
void **resource)
{
- double event_date = xbt_heap_maxkey(h->heap);
+ double event_date = tmgr_history_next_date(h);
tmgr_trace_event_t trace_event = NULL;
tmgr_event_t event = NULL;
tmgr_trace_t trace = NULL;
trace = trace_event->trace;
event = xbt_dynar_get_ptr(trace->event_list, trace_event->idx);
-
*value = event->value;
*resource = trace_event->resource;
xbt_heap_push(h->heap, trace_event, event_date + event->delta);
trace_event->idx = 0;
} else { /* We don't need this trace_event anymore */
- xbt_free(trace_event);
+ free(trace_event);
}
return trace_event;