X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7d0c4c0adbba2982f29444f00d1e70ad6b6aacdf..027f3abe8f56d9729fa87329b559a5723e34aed5:/src/surf/trace_mgr.c

diff --git a/src/surf/trace_mgr.c b/src/surf/trace_mgr.c
index 9d199f7ee1..65a9259c2d 100644
--- a/src/surf/trace_mgr.c
+++ b/src/surf/trace_mgr.c
@@ -34,6 +34,62 @@ void tmgr_history_free(tmgr_history_t h)
   free(h);
 }
 
+tmgr_trace_t tmgr_trace_new_from_string(const char* id, const char *input, double periodicity)
+{
+  tmgr_trace_t trace = NULL;
+  int linecount = 0;
+  s_tmgr_event_t event;
+  tmgr_event_t last_event = NULL;
+  xbt_dynar_t list;
+  unsigned int cpt;
+  char * val;
+
+  if (trace_list) {
+    trace = xbt_dict_get_or_null(trace_list, id);
+    if (trace)
+      return trace;
+  }
+
+  if (periodicity <= 0) {
+    xbt_assert1(0, "Periodicity has to be positive. Your value %lg", periodicity);
+  }
+
+  trace = xbt_new0(s_tmgr_trace_t, 1);
+  trace->event_list = xbt_dynar_new(sizeof(s_tmgr_event_t), NULL);
+
+  list = xbt_str_split(input,"\n\r");
+  
+  
+  xbt_dynar_foreach(list, cpt, val) {
+     linecount++;
+     xbt_str_trim(val, " \t\n\r\x0B");
+     if (strlen(val) > 0) {
+       if (sscanf(val, "%lg" " " "%lg" "\n", &event.delta, &event.value) != 2) {
+          xbt_assert2(0, "%s\n%d: Syntax error", input, linecount);
+       }
+       if (last_event) {
+           if ((last_event->delta = event.delta - last_event->delta) <= 0) {
+	       xbt_assert2(0, "%s\n%d: Invalid trace value, events have to be sorted", input, linecount);
+           }
+       }
+       xbt_dynar_push(trace->event_list, &event);
+       last_event = xbt_dynar_get_ptr(trace->event_list, xbt_dynar_length(trace->event_list) - 1);
+       if (periodicity > 0) {
+         if (last_event)
+           last_event->delta = periodicity;
+       }
+     }
+  }
+
+  if (!trace_list)
+    trace_list = xbt_dict_new();
+
+  xbt_dict_set(trace_list, id, (void *) trace, _tmgr_trace_free);
+
+  xbt_dynar_free(&list);
+  return trace;
+}
+
 tmgr_trace_t tmgr_trace_new(const char *filename)
 {
   tmgr_trace_t trace = NULL;
@@ -132,7 +188,7 @@ void tmgr_trace_free(tmgr_trace_t trace)
 
 tmgr_trace_event_t tmgr_history_add_trace(tmgr_history_t h,
 					  tmgr_trace_t trace,
-					  double start_time, int offset,
+					  double start_time, unsigned int offset,
 					  void *model)
 {
   tmgr_trace_event_t trace_event = NULL;
@@ -142,7 +198,7 @@ tmgr_trace_event_t tmgr_history_add_trace(tmgr_history_t h,
   trace_event->idx = offset;
   trace_event->model = model;
 
-  xbt_assert0((trace_event->idx < (int)xbt_dynar_length(trace->event_list)),
+  xbt_assert0((trace_event->idx < xbt_dynar_length(trace->event_list)),
 	      "You're refering to an event that does not exist!");
 
   xbt_heap_push(h->heap, trace_event, start_time);
@@ -180,7 +236,7 @@ tmgr_trace_event_t tmgr_history_get_next_event_leq(tmgr_history_t h,
   *value = event->value;
   *model = trace_event->model;
 
-  if (trace_event->idx < (int)xbt_dynar_length(trace->event_list) - 1) {
+  if (trace_event->idx < xbt_dynar_length(trace->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 */