* under the terms of the license (GNU LGPL) which comes with this package. */
#include "xbt/sysdep.h"
-#include "xbt/error.h"
+#include "xbt/log.h"
#include "xbt/dict.h"
#include "trace_mgr_private.h"
#include "surf_private.h"
-#include <stdlib.h>
-
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(trace, surf,
- "Logging specific to the SURF trace module");
static xbt_dict_t trace_list = NULL;
static void _tmgr_trace_free(void *trace)
h = xbt_new0(s_tmgr_history_t, 1);
- h->heap = xbt_heap_new(8, free); /* Why 8 ? Well, why not... */
+ h->heap = xbt_heap_new(8, xbt_free_f); /* Why 8 ? Well, why not... */
return h;
}
free(h);
}
+tmgr_trace_t tmgr_trace_new_from_string(const char* id, const char *input, double periodicity)
+{
+ tmgr_trace_t trace = NULL;
+ int linecount = 0;
+ s_tmgr_event_t event;
+ tmgr_event_t last_event = NULL;
+ xbt_dynar_t list;
+ unsigned int cpt;
+ char * val;
+
+ if (trace_list) {
+ trace = xbt_dict_get_or_null(trace_list, id);
+ if (trace)
+ return trace;
+ }
+
+ if (periodicity <= 0) {
+ xbt_assert1(0, "Periodicity has to be positive. Your value %lg", periodicity);
+ }
+
+ trace = xbt_new0(s_tmgr_trace_t, 1);
+ trace->event_list = xbt_dynar_new(sizeof(s_tmgr_event_t), NULL);
+
+ list = xbt_str_split(input,"\n\r");
+
+
+ xbt_dynar_foreach(list, cpt, val) {
+ linecount++;
+ xbt_str_trim(val, " \t\n\r\x0B");
+ if (strlen(val) > 0) {
+ if (sscanf(val, "%lg" " " "%lg" "\n", &event.delta, &event.value) != 2) {
+ xbt_assert2(0, "%s\n%d: Syntax error", input, linecount);
+ }
+ if (last_event) {
+ if ((last_event->delta = event.delta - last_event->delta) <= 0) {
+ xbt_assert2(0, "%s\n%d: Invalid trace value, events have to be sorted", input, linecount);
+ }
+ }
+ xbt_dynar_push(trace->event_list, &event);
+ last_event = xbt_dynar_get_ptr(trace->event_list, xbt_dynar_length(trace->event_list) - 1);
+ if (periodicity > 0) {
+ if (last_event)
+ last_event->delta = periodicity;
+ }
+ }
+ }
+
+ if (!trace_list)
+ trace_list = xbt_dict_new();
+
+ xbt_dict_set(trace_list, id, (void *) trace, _tmgr_trace_free);
+
+ xbt_dynar_free(&list);
+ return trace;
+}
+
tmgr_trace_t tmgr_trace_new(const char *filename)
{
tmgr_trace_t trace = NULL;
tmgr_event_t last_event = NULL;
if (trace_list) {
- xbt_dict_get(trace_list, filename, (void **) &trace);
+ trace = xbt_dict_get_or_null(trace_list, filename);
if (trace)
return trace;
}
tmgr_trace_t tmgr_empty_trace_new(void)
{
tmgr_trace_t trace = NULL;
- double periodicity = -1.0; /* No periodicity by default */
+ /*double periodicity = -1.0; No periodicity by default; unused variables
+ tmgr_event_t last_event = NULL; */
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);
tmgr_trace_event_t tmgr_history_add_trace(tmgr_history_t h,
tmgr_trace_t trace,
- double start_time, int offset,
- void *resource)
+ double start_time, unsigned int offset,
+ void *model)
{
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;
- trace_event->resource = resource;
+ trace_event->model = model;
xbt_assert0((trace_event->idx < xbt_dynar_length(trace->event_list)),
"You're refering to an event that does not exist!");
tmgr_trace_event_t tmgr_history_get_next_event_leq(tmgr_history_t h,
double date,
double *value,
- void **resource)
+ void **model)
{
- 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;
+ *model = trace_event->model;
if (trace_event->idx < xbt_dynar_length(trace->event_list) - 1) {
xbt_heap_push(h->heap, trace_event, event_date + event->delta);
trace_event->idx = 0;
} else { /* We don't need this trace_event anymore */
free(trace_event);
+ return NULL;
}
return trace_event;
