X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0ffe21abd220652547671c0de3cae515fb5fc6e2..ae7bffe6655b934fc4a09ca1a34e10de5d8dd366:/src/surf/trace_mgr_private.h

diff --git a/src/surf/trace_mgr_private.h b/src/surf/trace_mgr_private.h
index e9a97572b2..a84a6385d8 100644
--- a/src/surf/trace_mgr_private.h
+++ b/src/surf/trace_mgr_private.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004, 2007, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2004, 2007, 2009-2010, 2012-2014. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -7,6 +7,7 @@
 #ifndef _SURF_TMGR_PRIVATE_H
 #define _SURF_TMGR_PRIVATE_H
 
+#include "xbt/base.h"
 #include "xbt/swag.h"
 #include "xbt/heap.h"
 #include "surf/trace_mgr.h"
@@ -31,18 +32,18 @@ typedef struct probabilist_event_generator {
   double next_value;
   union {
     struct {
-      double alpha;
-      double beta;
+      double min;
+      double max;
     } s_uniform_parameters;
     struct {
-      double lambda;
+      double rate;
     } s_exponential_parameters;
     struct {
-      double lambda;
-      double k;
+      double scale;
+      double shape;
     } s_weibull_parameters;
   };
-} s_probabilist_event_generator_t, *probabilist_event_generator_t;
+} s_probabilist_event_generator_t;
 
 typedef struct tmgr_trace {
   enum e_trace_type type;
@@ -51,8 +52,8 @@ typedef struct tmgr_trace {
       xbt_dynar_t event_list;
     } s_list;
     struct {
-      probabilist_event_generator_t event1_generator;
-      probabilist_event_generator_t event2_generator;
+      probabilist_event_generator_t event_generator[2];
+      int is_state_trace;
       int next_event;
     } s_probabilist;
   };
@@ -70,6 +71,6 @@ typedef struct tmgr_history {
   xbt_heap_t heap;
 } s_tmgr_history_t;
 
-double tmgr_event_generator_next_value(probabilist_event_generator_t generator);
+XBT_PRIVATE double tmgr_event_generator_next_value(probabilist_event_generator_t generator);
 
 #endif                          /* _SURF_TMGR_PRIVATE_H */