X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f25af1e2829458e33a3a0b74c75865c89dff5f9e..9f4ddf3b15fccdab0f2666bf44061e7fd8305f49:/src/surf/trace_mgr.c

diff --git a/src/surf/trace_mgr.c b/src/surf/trace_mgr.c
index 23ccb0d6c8..c49bd7ca67 100644
--- a/src/surf/trace_mgr.c
+++ b/src/surf/trace_mgr.c
@@ -51,7 +51,7 @@ tmgr_trace_t tmgr_trace_new_from_string(const char *id, const char *input,
     }
   }
 
-  xbt_assert1(periodicity >= 0,
+  xbt_assert(periodicity >= 0,
               "Invalid periodicity %lg (must be positive)", periodicity);
 
   trace = xbt_new0(s_tmgr_trace_t, 1);
@@ -88,10 +88,9 @@ tmgr_trace_t tmgr_trace_new_from_string(const char *id, const char *input,
     last_event->delta = periodicity;
 
   if (!trace_list)
-    trace_list = xbt_dict_new();
+    trace_list = xbt_dict_new_homogeneous((void (*)(void *)) tmgr_trace_free);
 
-  xbt_dict_set(trace_list, id, (void *) trace,
-               (void (*)(void *)) tmgr_trace_free);
+  xbt_dict_set(trace_list, id, (void *) trace, NULL);
 
   xbt_dynar_free(&list);
   return trace;
@@ -115,7 +114,7 @@ tmgr_trace_t tmgr_trace_new(const char *filename)
   }
 
   f = surf_fopen(filename, "r");
-  xbt_assert2(f != NULL, "Cannot open file '%s' (path=%s)", filename,
+  xbt_assert(f != NULL, "Cannot open file '%s' (path=%s)", filename,
               xbt_str_join(surf_path, ":"));
 
   tstr = xbt_str_from_file(f);
@@ -161,7 +160,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 < xbt_dynar_length(trace->event_list)),
+  xbt_assert((trace_event->idx < xbt_dynar_length(trace->event_list)),
               "You're referring to an event that does not exist!");
 
   xbt_heap_push(h->heap, trace_event, start_time);