Merge branch 'master' of git+ssh://scm.gforge.inria.fr/gitroot/simgrid/simgrid

[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 65d1bb7..4611c81 100644 (file)
--- a/src/surf/trace_mgr_private.h
+++ b/src/surf/trace_mgr_private.h
@@ -31,15 +31,15 @@ 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;
@@ -52,6 +52,7 @@ typedef struct tmgr_trace {
     } s_list;
     struct {
       probabilist_event_generator_t event_generator[2];
+      int is_state_trace;
       int next_event;
     } s_probabilist;
   };