Fix copyright headers

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

diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c
index c4ba3d4..f312e78 100644 (file)
--- a/src/surf/surfxml_parse.c
+++ b/src/surf/surfxml_parse.c
@@ -1,6 +1,5 @@
-/*     $Id$     */
-
-/* Copyright (c) 2004 Arnaud Legrand. All rights reserved.                  */
+/* Copyright (c) 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -832,6 +831,7 @@ static void parse_route_elem(void)
   val = xbt_strdup(A_surfxml_link_c_ctn_id);
 
   xbt_dynar_push(route_link_list, &val);
+  //INFO2("Push %s (size now:%ld)",val,xbt_dynar_length(route_link_list));
 }
 
 static void parse_Stag_route_multi(void)
@@ -858,7 +858,11 @@ void manage_route(xbt_dict_t routing_table, const char *route_name,
 
   /* get already existing list if it exists */
   links = xbt_dict_get_or_null(routing_table, route_name);
-  DEBUG1("ROUTE: %s", route_name);
+  DEBUG3("ROUTE: %s (action:%s; len:%ld)", route_name,
+      (action==A_surfxml_route_action_OVERRIDE?"override":(
+          action==A_surfxml_route_action_PREPEND?"prepend":"postpend")),
+       (links?xbt_dynar_length(links):0));
+
   if (links != NULL) {
     switch (action) {
     case A_surfxml_route_action_PREPEND:       /* add existing links at the end; route_link_list + links */
@@ -878,6 +882,8 @@ void manage_route(xbt_dict_t routing_table, const char *route_name,
       xbt_dynar_free(&links);
       break;
     default:
+      xbt_die(bprintf("While dealing with routes of %s, got action=%d. Please report this bug.",
+          route_name,action));
       break;
     }
   }
@@ -1039,7 +1045,6 @@ 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;
 
@@ -1048,7 +1053,6 @@ static void parse_Stag_trace(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_Etag_trace(void)
@@ -1062,7 +1066,7 @@ static void parse_Etag_trace(void)
     else
       trace =
         tmgr_trace_new_from_string(trace_id, surfxml_pcdata,
-                                   trace_periodicity, trace_timestep);
+                                   trace_periodicity);
   }
   xbt_dict_set(traces_set_list, trace_id, (void *) trace, NULL);
 }