Trace manager : Add and change some structures and functions

[simgrid.git] / src / surf / trace_mgr.c

diff --git a/src/surf/trace_mgr.c b/src/surf/trace_mgr.c
index c42d11d..a73e539 100644 (file)
--- a/src/surf/trace_mgr.c
+++ b/src/surf/trace_mgr.c
@@ -10,11 +10,16 @@
 #include "xbt/dict.h"
 #include "trace_mgr_private.h"
 #include "surf_private.h"
+#include "xbt/RngStream.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_trace, surf, "Surf trace management");
 
 static xbt_dict_t trace_list = NULL;
 
+// 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;
@@ -32,6 +37,67 @@ XBT_INLINE void tmgr_history_free(tmgr_history_t h)
   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;
+
+  //FIXME Generate a new event date
+  
+  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;
+
+  //FIXME Generate a new event date
+  
+  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;
+
+  // FIXME Generate a new event date
+  
+  return event_generator;
+}
+
 tmgr_trace_t tmgr_trace_new_from_string(const char *id, const char *input,
                                         double periodicity)
 {