X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/749ea30edef7311180cd8449a1ff449ea5d47b93..f4d1afaaa1e4fee55a98707443c05bdbc9abb42c:/src/surf/trace_mgr.c?ds=sidebyside

diff --git a/src/surf/trace_mgr.c b/src/surf/trace_mgr.c
index b61bac05be..aad40d7223 100644
--- a/src/surf/trace_mgr.c
+++ b/src/surf/trace_mgr.c
@@ -6,14 +6,10 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "xbt/sysdep.h"
-#include "xbt/error.h"
+#include "xbt/log.h"
 #include "xbt/dict.h"
 #include "trace_mgr_private.h"
 #include "surf_private.h"
-#include <stdlib.h>
-
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(trace, surf,
-				"Logging specific to the SURF trace module");
 
 static xbt_dict_t trace_list = NULL;
 static void _tmgr_trace_free(void *trace)
@@ -27,7 +23,7 @@ tmgr_history_t tmgr_history_new(void)
 
   h = xbt_new0(s_tmgr_history_t, 1);
 
-  h->heap = xbt_heap_new(8, free);	/* Why 8 ? Well, why not... */
+  h->heap = xbt_heap_new(8, xbt_free_f);	/* Why 8 ? Well, why not... */
 
   return h;
 }
@@ -49,7 +45,7 @@ tmgr_trace_t tmgr_trace_new(const char *filename)
   tmgr_event_t last_event = NULL;
 
   if (trace_list) {
-    xbt_dict_get(trace_list, filename, (void **) &trace);
+    trace = xbt_dict_get_or_null(trace_list, filename);
     if (trace)
       return trace;
   }
@@ -112,9 +108,9 @@ tmgr_trace_t tmgr_trace_new(const char *filename)
 tmgr_trace_t tmgr_empty_trace_new(void)
 {
   tmgr_trace_t trace = NULL;
-  double periodicity = -1.0;	/* No periodicity by default */
+  /*double periodicity = -1.0;   No periodicity by default; unused variables
+     tmgr_event_t last_event = NULL; */
   s_tmgr_event_t event;
-  tmgr_event_t last_event = NULL;
 
   trace = xbt_new0(s_tmgr_trace_t, 1);
   trace->event_list = xbt_dynar_new(sizeof(s_tmgr_event_t), NULL);
@@ -141,7 +137,6 @@ tmgr_trace_event_t tmgr_history_add_trace(tmgr_history_t h,
 {
   tmgr_trace_event_t trace_event = NULL;
 
-
   trace_event = xbt_new0(s_tmgr_trace_event_t, 1);
   trace_event->trace = trace;
   trace_event->idx = offset;
@@ -168,7 +163,7 @@ tmgr_trace_event_t tmgr_history_get_next_event_leq(tmgr_history_t h,
 						   double *value,
 						   void **resource)
 {
-  double event_date = xbt_heap_maxkey(h->heap);
+  double event_date = tmgr_history_next_date(h);
   tmgr_trace_event_t trace_event = NULL;
   tmgr_event_t event = NULL;
   tmgr_trace_t trace = NULL;
@@ -182,7 +177,6 @@ tmgr_trace_event_t tmgr_history_get_next_event_leq(tmgr_history_t h,
   trace = trace_event->trace;
   event = xbt_dynar_get_ptr(trace->event_list, trace_event->idx);
 
-
   *value = event->value;
   *resource = trace_event->resource;