handle modifications of the DTD in surf

[simgrid.git] / src / surf / trace_mgr_private.h

diff --git a/src/surf/trace_mgr_private.h b/src/surf/trace_mgr_private.h
index 9498be8..4611c81 100644 (file)
--- a/src/surf/trace_mgr_private.h
+++ b/src/surf/trace_mgr_private.h
@@ -31,18 +31,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 +51,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,5 +70,6 @@ typedef struct tmgr_history {
   xbt_heap_t heap;
 } s_tmgr_history_t;
 
+double tmgr_event_generator_next_value(probabilist_event_generator_t generator);
 
 #endif                          /* _SURF_TMGR_PRIVATE_H */