kill cruft that I introduced while merging routing code from Anvers

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

diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c
index 0497f30..d8ec646 100644 (file)
--- a/src/surf/surfxml_parse.c
+++ b/src/surf/surfxml_parse.c
@@ -12,8 +12,6 @@
 #include "surf/surfxml_parse_private.h"
 #include "surf/surf_private.h"
 
-#define NO_IMPLICIT_ROUTES
-
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_parse, surf,
                                 "Logging specific to the SURF parsing module");
 #undef CLEANUP
@@ -1104,6 +1102,7 @@ static void convert_route_multi_to_routes(void)
 /* Trace management functions */
 
 static double trace_periodicity = -1.0;
+static double trace_timestep = -1.0;
 static char *trace_file = NULL;
 static char *trace_id;
 
@@ -1112,6 +1111,7 @@ static void parse_trace_init(void)
   trace_id = strdup(A_surfxml_trace_id);
   trace_file = strdup(A_surfxml_trace_file);
   surf_parse_get_double(&trace_periodicity, A_surfxml_trace_periodicity);
+  surf_parse_get_double(&trace_timestep, A_surfxml_trace_timestep);
 }
 
 static void parse_trace_finalize(void)
@@ -1125,7 +1125,7 @@ static void parse_trace_finalize(void)
     else
       trace =
         tmgr_trace_new_from_string(trace_id, surfxml_pcdata,
-                                   trace_periodicity);
+                                   trace_periodicity, trace_timestep);
   }
   xbt_dict_set(traces_set_list, trace_id, (void *) trace, NULL);
 }