X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/976ee462f4626798ebf76ca46d13f53e10e0e28d..ea45b0fd14b255c0c5a4515b2f27c68002a567c8:/src/surf/trace_mgr.c diff --git a/src/surf/trace_mgr.c b/src/surf/trace_mgr.c index 0ebe38fb57..16dce1e746 100644 --- a/src/surf/trace_mgr.c +++ b/src/surf/trace_mgr.c @@ -1,6 +1,5 @@ -/* $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. */ @@ -11,12 +10,18 @@ #include "xbt/dict.h" #include "trace_mgr_private.h" #include "surf_private.h" +#include "xbt/RngStream.h" +#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_trace, surf, "Surf trace management"); static xbt_dict_t trace_list = NULL; -tmgr_history_t tmgr_history_new(void) +// a unique RngStream structure for everyone +// FIXME : has to be created by someone +static RngStream common_rng_stream = NULL; + +XBT_INLINE tmgr_history_t tmgr_history_new(void) { tmgr_history_t h; @@ -27,14 +32,97 @@ tmgr_history_t tmgr_history_new(void) 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); } +RngStream tmgr_rng_stream_from_id(char* id) +{ + unsigned int id_hash; + RngStream rng_stream = NULL; + + rng_stream = RngStream_CopyStream(common_rng_stream); + id_hash = xbt_dict_hash(id); + RngStream_AdvanceState(rng_stream, 0, id_hash); + + return rng_stream; +} + +probabilist_event_generator_t tmgr_event_generator_new_uniform(RngStream rng_stream, + double alpha, + double beta) +{ + probabilist_event_generator_t event_generator = NULL; + + event_generator = xbt_new0(s_probabilist_event_generator_t, 1); + event_generator->type = e_generator_uniform; + event_generator->s_uniform_parameters.alpha = alpha; + event_generator->s_uniform_parameters.beta = beta; + event_generator->rng_stream = rng_stream; + + tmgr_event_generator_next_value(event_generator); + + return event_generator; +} + +probabilist_event_generator_t tmgr_event_generator_new_exponential(RngStream rng_stream, + double lambda) +{ + probabilist_event_generator_t event_generator = NULL; + + event_generator = xbt_new0(s_probabilist_event_generator_t, 1); + event_generator->type = e_generator_exponential; + event_generator->s_exponential_parameters.lambda = lambda; + event_generator->rng_stream = rng_stream; + + tmgr_event_generator_next_value(event_generator); + + return event_generator; +} + +probabilist_event_generator_t tmgr_event_generator_new_weibull(RngStream rng_stream, + double lambda, + double k) +{ + probabilist_event_generator_t event_generator = NULL; + + event_generator = xbt_new0(s_probabilist_event_generator_t, 1); + event_generator->type = e_generator_weibull; + event_generator->s_weibull_parameters.lambda = lambda; + event_generator->s_weibull_parameters.k = k; + event_generator->rng_stream = rng_stream; + + tmgr_event_generator_next_value(event_generator); + + return event_generator; +} + +double tmgr_event_generator_next_value(probabilist_event_generator_t generator) +{ + + switch(generator->type) { + case e_generator_uniform: + generator->next_value = (RngStream_RandU01(generator->rng_stream) + * (generator->s_uniform_parameters.beta - generator->s_uniform_parameters.alpha)) + + generator->s_uniform_parameters.alpha; + break; + case e_generator_exponential: + generator->next_value = -log(RngStream_RandU01(generator->rng_stream)) + / generator->s_exponential_parameters.lambda; + break; + case e_generator_weibull: + generator->next_value = - generator->s_weibull_parameters.lambda + * pow( log(RngStream_RandU01(generator->rng_stream)), + 1.0 / generator->s_weibull_parameters.k ); + } + + return generator->next_value; +} + 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; @@ -47,16 +135,17 @@ tmgr_trace_t tmgr_trace_new_from_string(const char *id, const char *input, 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); - trace->event_list = xbt_dynar_new(sizeof(s_tmgr_event_t), NULL); + trace->type = e_trace_list; + trace->s_list.event_list = xbt_dynar_new(sizeof(s_tmgr_event_t), NULL); list = xbt_str_split(input, "\n\r"); @@ -69,43 +158,37 @@ tmgr_trace_t tmgr_trace_new_from_string(const char *id, const char *input, 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); + xbt_dynar_push(trace->s_list.event_list, &event); last_event = - xbt_dynar_get_ptr(trace->event_list, - xbt_dynar_length(trace->event_list) - 1); + xbt_dynar_get_ptr(trace->s_list.event_list, + xbt_dynar_length(trace->s_list.event_list) - 1); } if (last_event) last_event->delta = periodicity; - trace->timestep = timestep; - if (!trace_list) - trace_list = xbt_dict_new(); + trace_list = xbt_dict_new_homogeneous((void (*)(void *)) tmgr_trace_free); - xbt_dict_set(trace_list, id, (void *) trace, - (void (*)(void *)) tmgr_trace_free); + xbt_dict_set(trace_list, id, (void *) trace, NULL); xbt_dynar_free(&list); return trace; } -tmgr_trace_t tmgr_trace_new(const char *filename) +tmgr_trace_t tmgr_trace_new_from_file(const char *filename) { + char *tstr = NULL; FILE *f = NULL; tmgr_trace_t trace = NULL; @@ -115,18 +198,18 @@ tmgr_trace_t tmgr_trace_new(const char *filename) 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; @@ -138,20 +221,20 @@ tmgr_trace_t tmgr_empty_trace_new(void) 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); + trace->s_list.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); + xbt_dynar_push(trace->s_list.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_dynar_free(&(trace->s_list.event_list)); free(trace); } @@ -167,7 +250,7 @@ tmgr_trace_event_t tmgr_history_add_trace(tmgr_history_t h, 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->s_list.event_list)), "You're referring to an event that does not exist!"); xbt_heap_push(h->heap, trace_event, start_time); @@ -175,7 +258,7 @@ tmgr_trace_event_t tmgr_history_add_trace(tmgr_history_t h, 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)); @@ -200,12 +283,12 @@ tmgr_trace_event_t tmgr_history_get_next_event_leq(tmgr_history_t h, return NULL; trace = trace_event->trace; - event = xbt_dynar_get_ptr(trace->event_list, trace_event->idx); + event = xbt_dynar_get_ptr(trace->s_list.event_list, trace_event->idx); *value = event->value; *model = trace_event->model; - if (trace_event->idx < xbt_dynar_length(trace->event_list) - 1) { + if (trace_event->idx < xbt_dynar_length(trace->s_list.event_list) - 1) { xbt_heap_push(h->heap, trace_event, event_date + event->delta); trace_event->idx++; } else if (event->delta > 0) { /* Last element, checking for periodicity */ @@ -218,7 +301,7 @@ tmgr_trace_event_t tmgr_history_get_next_event_leq(tmgr_history_t h, return trace_event; } -void tmgr_finalize(void) +XBT_INLINE void tmgr_finalize(void) { xbt_dict_free(&trace_list); }