X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/24b8008bb424160e633b1374f54dcd89bdcb9749..f57edc1d5b4f497883b451fc85d2d653d27a8247:/src/surf/trace_mgr.c diff --git a/src/surf/trace_mgr.c b/src/surf/trace_mgr.c index c7a78a0c66..ea18e1a9c4 100644 --- a/src/surf/trace_mgr.c +++ b/src/surf/trace_mgr.c @@ -1,168 +1,188 @@ -/* Authors: Arnaud Legrand */ +/* 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. */ + * 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/str.h" #include "xbt/dict.h" #include "trace_mgr_private.h" -#include +#include "surf_private.h" + +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_trace, surf, "Surf trace management"); static xbt_dict_t trace_list = NULL; -static void _tmgr_trace_free(void *trace) -{ - tmgr_trace_free(trace); -} -tmgr_history_t tmgr_history_new(void) +XBT_INLINE tmgr_history_t tmgr_history_new(void) { - tmgr_history_t history; + tmgr_history_t h; - history = xbt_new0(s_tmgr_history_t, 1); + h = xbt_new0(s_tmgr_history_t, 1); - history->heap = xbt_heap_new(8, xbt_free); /* Why 8 ? Well, why not... */ + h->heap = xbt_heap_new(8, xbt_free_f); /* Why 8 ? Well, why not... */ - return history; + return h; } -void tmgr_history_free(tmgr_history_t history) +XBT_INLINE void tmgr_history_free(tmgr_history_t h) { - xbt_heap_free(history->heap); - xbt_free(history); + xbt_heap_free(h->heap); + free(h); } -tmgr_trace_t tmgr_trace_new(const char *filename) +tmgr_trace_t tmgr_trace_new_from_string(const char *id, const char *input, + double periodicity) { tmgr_trace_t trace = NULL; - FILE *f = NULL; int linecount = 0; - char line[256]; - xbt_heap_float_t current_time = 0.0, previous_time = 0.0; - xbt_maxmin_float_t value = -1.0; - xbt_heap_float_t periodicity = -1.0; /* No periodicity by default */ s_tmgr_event_t event; tmgr_event_t last_event = NULL; + xbt_dynar_t list; + unsigned int cpt; + char *val; if (trace_list) { - xbt_dict_get(trace_list, filename, (void **) &trace); - if (trace) + trace = xbt_dict_get_or_null(trace_list, id); + if (trace) { + XBT_WARN("Ignoring redefinition of trace %s", id); return trace; + } } - /* Parsing et création de la trace */ - - if ((f = fopen(filename, "r")) == NULL) { - fprintf(stderr, "Cannot open file '%s'\n", filename); - return NULL; - } + xbt_assert(periodicity >= 0, + "Invalid periodicity %lg (must be positive)", periodicity); trace = xbt_new0(s_tmgr_trace_t, 1); trace->event_list = xbt_dynar_new(sizeof(s_tmgr_event_t), NULL); - while (fgets(line, 256, f)) { + list = xbt_str_split(input, "\n\r"); + + xbt_dynar_foreach(list, cpt, val) { linecount++; - if ((line[0] == '#') || (line[0] == '\n') || (line[0] == '%')) + xbt_str_trim(val, " \t\n\r\x0B"); + if (val[0] == '#' || val[0] == '\0' || val[0] == '%') continue; - if (sscanf(line, "PERIODICITY " XBT_HEAP_FLOAT_T "\n", &(periodicity)) - == 1) { - if (periodicity <= 0) { - fprintf(stderr, - "%s,%d: Syntax error. Periodicity has to be positive\n", - filename, linecount); - abort(); -/* xbt_dynar_free(&(trace->event_list)); */ -/* xbt_free(trace); */ -/* return NULL; */ - } + if (sscanf(val, "PERIODICITY " "%lg" "\n", &periodicity) == 1) continue; - } - if (sscanf - (line, XBT_HEAP_FLOAT_T " " XBT_MAXMIN_FLOAT_T "\n", &event.delta, - &event.value) != 2) { - fprintf(stderr, "%s,%d: Syntax error\n", filename, linecount); - abort(); -/* xbt_dynar_free(&(trace->event_list)); */ -/* xbt_free(trace); */ -/* return NULL; */ - } + if (sscanf(val, "%lg" " " "%lg" "\n", &event.delta, &event.value) != 2) + xbt_die("%s:%d: Syntax error in trace\n%s", id, linecount, input); if (last_event) { - if ((last_event->delta = event.delta - last_event->delta) <= 0) { - fprintf(stderr, - "%s,%d: Invalid trace value, events have to be sorted\n", - filename, linecount); - abort(); + if (last_event->delta > event.delta) { + 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); -/* printf(XBT_HEAP_FLOAT_T " " XBT_MAXMIN_FLOAT_T "\n", event.delta, */ -/* event.value); */ - } - - if (periodicity > 0) { - if (last_event) - last_event->delta = periodicity; + last_event = + xbt_dynar_get_ptr(trace->event_list, + xbt_dynar_length(trace->event_list) - 1); } + if (last_event) + last_event->delta = periodicity; if (!trace_list) trace_list = xbt_dict_new(); - xbt_dict_set(trace_list, filename, (void *) trace, _tmgr_trace_free); + xbt_dict_set(trace_list, id, (void *) trace, + (void (*)(void *)) tmgr_trace_free); + + xbt_dynar_free(&list); + return trace; +} + +tmgr_trace_t tmgr_trace_new(const char *filename) +{ + char *tstr = NULL; + FILE *f = NULL; + tmgr_trace_t trace = NULL; + + if ((!filename) || (strcmp(filename, "") == 0)) + return NULL; + if (trace_list) { + trace = xbt_dict_get_or_null(trace_list, filename); + if (trace) { + XBT_WARN("Ignoring redefinition of trace %s", filename); + return trace; + } + } + + f = surf_fopen(filename, "r"); + 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 = tmgr_trace_new_from_string(filename, tstr, 0.); + xbt_free(tstr); return trace; } +tmgr_trace_t tmgr_empty_trace_new(void) +{ + tmgr_trace_t trace = NULL; + s_tmgr_event_t event; + + 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) +XBT_INLINE 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 history, tmgr_trace_t trace, - xbt_heap_float_t start_time, int offset, - void *resource) +tmgr_trace_event_t tmgr_history_add_trace(tmgr_history_t h, + tmgr_trace_t trace, + 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; - if (trace_event->idx >= xbt_dynar_length(trace->event_list)) - abort(); + xbt_assert((trace_event->idx < xbt_dynar_length(trace->event_list)), + "You're referring to an event that does not exist!"); - xbt_heap_push(history->heap, trace_event, start_time); + xbt_heap_push(h->heap, trace_event, start_time); return trace_event; } -xbt_heap_float_t tmgr_history_next_date(tmgr_history_t history) +XBT_INLINE double tmgr_history_next_date(tmgr_history_t h) { - if (xbt_heap_size(history->heap)) - return (xbt_heap_maxkey(history->heap)); + if (xbt_heap_size(h->heap)) + return (xbt_heap_maxkey(h->heap)); else return -1.0; } -tmgr_trace_event_t tmgr_history_get_next_event_leq(tmgr_history_t history, - xbt_heap_float_t date, - xbt_maxmin_float_t * value, - void **resource) +tmgr_trace_event_t tmgr_history_get_next_event_leq(tmgr_history_t h, + double date, + double *value, + void **model) { - xbt_heap_float_t event_date = xbt_heap_maxkey(history->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; @@ -170,30 +190,38 @@ tmgr_trace_event_t tmgr_history_get_next_event_leq(tmgr_history_t history, if (event_date > date) return NULL; - if (!(trace_event = xbt_heap_pop(history->heap))) + if (!(trace_event = xbt_heap_pop(h->heap))) return 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(history->heap, trace_event, event_date + event->delta); + xbt_heap_push(h->heap, trace_event, event_date + event->delta); trace_event->idx++; - } else if (event->delta > 0) { /* Last element, checking for periodicity */ - xbt_heap_push(history->heap, trace_event, event_date + event->delta); + } else if (event->delta > 0) { /* Last element, checking for periodicity */ + 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); + } else { /* We don't need this trace_event anymore */ + trace_event->free_me = 1; } return trace_event; } -void tmgr_finalize(void) +XBT_INLINE void tmgr_finalize(void) { xbt_dict_free(&trace_list); } + +int tmgr_trace_event_free(tmgr_trace_event_t trace_event) +{ + if (trace_event->free_me) { + xbt_free(trace_event); + return 1; + } + return 0; +}