X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ccca584250e6b07d6364482c27ac0a5c2c8c425f..0cc9bc7a3d25dec9a4a268d07f808b11ac5c4b7c:/src/surf/trace_mgr.c

diff --git a/src/surf/trace_mgr.c b/src/surf/trace_mgr.c
index 2947389d06..d9faf6e8d8 100644
--- a/src/surf/trace_mgr.c
+++ b/src/surf/trace_mgr.c
@@ -10,6 +10,8 @@
 #include "xbt/dict.h"
 #include "trace_mgr_private.h"
 #include "surf_private.h"
+#include "xbt/RngStream.h"
+#include <math.h>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_trace, surf, "Surf trace management");
 
@@ -32,46 +34,97 @@ XBT_INLINE void tmgr_history_free(tmgr_history_t h)
   free(h);
 }
 
-tmgr_trace_t tmgr_trace_new_uniform(double alpha, double beta)
-{  
+tmgr_trace_t tmgr_trace_new_from_generator(const char *id,
+                                          probabilist_event_generator_t generator1,
+                                          probabilist_event_generator_t generator2)
+{
   tmgr_trace_t trace = NULL;
+  RngStream rng_stream = NULL;
+  
+  rng_stream = sg_platf_rng_stream_get(id);
   
   trace = xbt_new0(s_tmgr_trace_t, 1);
-  trace->type = e_trace_uniform;
-  trace->s_uniform.alpha = alpha;
-  trace->s_uniform.beta = beta;
+  trace->type = e_trace_probabilist;
   
-  //FIXME Generate a new event date
+  trace->s_probabilist.event_generator[0] = generator1;
+  trace->s_probabilist.event_generator[0]->rng_stream = rng_stream;
+  tmgr_event_generator_next_value(trace->s_probabilist.event_generator[0]);
+  
+  //FIXME : may also be a parameter
+  trace->s_probabilist.next_event = 0;
+  
+  if(generator2 == NULL) {
+    trace->s_probabilist.event_generator[1] = generator1;
+  } else {
+    trace->s_probabilist.event_generator[1] = generator2;
+    trace->s_probabilist.event_generator[1]->rng_stream = rng_stream;
+    tmgr_event_generator_next_value(trace->s_probabilist.event_generator[1]);
+  }
   
   return trace;
 }
 
-
-tmgr_trace_t tmgr_trace_new_exponential(double lambda)
+probabilist_event_generator_t tmgr_event_generator_new_uniform(double min,
+                                                               double max)
 {  
-  tmgr_trace_t trace = NULL;
+  probabilist_event_generator_t event_generator = NULL;
   
-  trace = xbt_new0(s_tmgr_trace_t, 1);
-  trace->type = e_trace_exponential;
-  trace->s_exponential.lambda = lambda;
+  event_generator = xbt_new0(s_probabilist_event_generator_t, 1);
+  event_generator->type = e_generator_uniform;
+  event_generator->s_uniform_parameters.min = min;
+  event_generator->s_uniform_parameters.max = max;
+
+  tmgr_event_generator_next_value(event_generator);
   
-  // FIXME Generate a new event date
+  return event_generator;
+}
+
+probabilist_event_generator_t tmgr_event_generator_new_exponential(double rate)
+{  
+  probabilist_event_generator_t event_generator = NULL;
   
-  return trace;
+  event_generator = xbt_new0(s_probabilist_event_generator_t, 1);
+  event_generator->type = e_generator_exponential;
+  event_generator->s_exponential_parameters.rate = rate;
+
+  return event_generator;
 }
 
-tmgr_trace_t tmgr_trace_new_weibull(double lambda, double k)
+probabilist_event_generator_t tmgr_event_generator_new_weibull(double scale,
+                                                               double shape)
 {  
-  tmgr_trace_t trace = NULL;
+  probabilist_event_generator_t event_generator = NULL;
   
-  trace = xbt_new0(s_tmgr_trace_t, 1);
-  trace->type = e_trace_weibull;
-  trace->s_weibull.lambda = lambda;
-  trace->s_weibull.k = k;
+  event_generator = xbt_new0(s_probabilist_event_generator_t, 1);
+  event_generator->type = e_generator_weibull;
+  event_generator->s_weibull_parameters.scale = scale;
+  event_generator->s_weibull_parameters.shape = shape;
+
+  tmgr_event_generator_next_value(event_generator);
   
-  // FIXME Generate a new event date
+  return event_generator;
+}
+
+double tmgr_event_generator_next_value(probabilist_event_generator_t generator)
+{
   
-  return trace;
+  switch(generator->type) {
+    case e_generator_uniform:
+      generator->next_value = (RngStream_RandU01(generator->rng_stream)
+                  * (generator->s_uniform_parameters.max - generator->s_uniform_parameters.min))
+                  + generator->s_uniform_parameters.min;
+      break;
+    case e_generator_exponential:
+      generator->next_value = -log(RngStream_RandU01(generator->rng_stream))
+                              / generator->s_exponential_parameters.rate;
+      break;
+    case e_generator_weibull:
+      generator->next_value = - generator->s_weibull_parameters.scale
+                              * pow( log(RngStream_RandU01(generator->rng_stream)),
+                                    1.0 / generator->s_weibull_parameters.shape );
+  }
+  
+  return generator->next_value;
 }
 
 tmgr_trace_t tmgr_trace_new_from_string(const char *id, const char *input,
@@ -174,6 +227,7 @@ tmgr_trace_t tmgr_empty_trace_new(void)
   s_tmgr_event_t event;
 
   trace = xbt_new0(s_tmgr_trace_t, 1);
+  trace->type = e_trace_list;
   trace->s_list.event_list = xbt_dynar_new(sizeof(s_tmgr_event_t), NULL);
 
   event.delta = 0.0;
@@ -187,7 +241,15 @@ XBT_INLINE void tmgr_trace_free(tmgr_trace_t trace)
 {
   if (!trace)
     return;
-  xbt_dynar_free(&(trace->s_list.event_list));
+  
+  switch(trace->type) {
+    case e_trace_list:
+      xbt_dynar_free(&(trace->s_list.event_list));
+      break;
+    case e_trace_probabilist:
+      THROW_UNIMPLEMENTED;
+      break;
+  }
   free(trace);
 }
 
@@ -203,9 +265,11 @@ tmgr_trace_event_t tmgr_history_add_trace(tmgr_history_t h,
   trace_event->idx = offset;
   trace_event->model = model;
 
-  xbt_assert((trace_event->idx < xbt_dynar_length(trace->s_list.event_list)),
+  if(trace->type == e_trace_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);
 
   return trace_event;
@@ -228,6 +292,7 @@ tmgr_trace_event_t tmgr_history_get_next_event_leq(tmgr_history_t h,
   tmgr_trace_event_t trace_event = NULL;
   tmgr_event_t event = NULL;
   tmgr_trace_t trace = NULL;
+  double event_delta;
 
   if (event_date > date)
     return NULL;
@@ -236,19 +301,41 @@ 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->s_list.event_list, trace_event->idx);
-
-  *value = event->value;
   *model = trace_event->model;
-
-  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 */
-    xbt_heap_push(h->heap, trace_event, event_date + event->delta);
-    trace_event->idx = 0;
-  } else {                      /* We don't need this trace_event anymore */
-    trace_event->free_me = 1;
+  
+  switch(trace->type) {
+    case e_trace_list:
+        
+      event = xbt_dynar_get_ptr(trace->s_list.event_list, trace_event->idx);
+
+      *value = event->value;
+
+      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 */
+        xbt_heap_push(h->heap, trace_event, event_date + event->delta);
+        trace_event->idx = 0;
+      } else {                      /* We don't need this trace_event anymore */
+        trace_event->free_me = 1;
+      }
+      break;
+      
+    case e_trace_probabilist:
+      
+      //FIXME : Simplist and not tested
+      //Would only work for failure events for now
+      *value = (double) trace->s_probabilist.next_event;
+      if(trace->s_probabilist.next_event == 0) {
+        event_delta = tmgr_event_generator_next_value(trace->s_probabilist.event_generator[0]);
+        trace->s_probabilist.next_event = 0;
+      } else {
+        event_delta = tmgr_event_generator_next_value(trace->s_probabilist.event_generator[1]);
+        trace->s_probabilist.next_event = 1;
+      }
+      xbt_heap_push(h->heap, trace_event, event_date + event_delta);
+      
+      break;
   }
 
   return trace_event;