X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dff9e15c44ab6340d27215957c56fa72fad246a2..7a4e264744a18d8953c3bd5e4a1df05f5d6088b9:/include/surf/simgrid_dtd.h

diff --git a/include/surf/simgrid_dtd.h b/include/surf/simgrid_dtd.h
index f003aee94f..441a053f6f 100644
--- a/include/surf/simgrid_dtd.h
+++ b/include/surf/simgrid_dtd.h
@@ -1,10 +1,10 @@
 /* XML processor/application API for surf/simgrid.dtd.
- * Generated 2008/03/06 08:58:39.
+ * Generated 2009/09/09 17:39:05.
  *
  * This program was generated with the FleXML XML processor generator.
  * FleXML is Copyright (C) 1999-2005 Kristoffer Rose.  All rights reserved.
  * FleXML is Copyright (C) 2003-2006 Martin Quinson.  All rights reserved.
- * (Id: flexml.pl,v 1.63 2007/10/11 14:46:08 mquinson Exp).
+ * (Id: flexml.pl,v 1.62 2007/10/11 10:00:14 mquinson Exp).
  * 
  * There are two, intertwined parts to this program, part A and part B.
  *
@@ -48,368 +48,323 @@
 #ifndef _FLEXML_simgrid_H
 #define _FLEXML_simgrid_H
 
-
 SG_BEGIN_DECL()
-
 /* XML application entry points. */
-XBT_PUBLIC(void) STag_surfxml_platform(void);
-XBT_PUBLIC(void) ETag_surfxml_platform(void);
-XBT_PUBLIC(void) STag_surfxml_include(void);
-XBT_PUBLIC(void) ETag_surfxml_include(void);
-XBT_PUBLIC(void) STag_surfxml_trace(void);
-XBT_PUBLIC(void) ETag_surfxml_trace(void);
-XBT_PUBLIC(void) STag_surfxml_random(void);
-XBT_PUBLIC(void) ETag_surfxml_random(void);
-XBT_PUBLIC(void) STag_surfxml_trace_c_connect(void);
-XBT_PUBLIC(void) ETag_surfxml_trace_c_connect(void);
-XBT_PUBLIC(void) STag_surfxml_set(void);
-XBT_PUBLIC(void) ETag_surfxml_set(void);
-XBT_PUBLIC(void) STag_surfxml_foreach(void);
-XBT_PUBLIC(void) ETag_surfxml_foreach(void);
-XBT_PUBLIC(void) STag_surfxml_host(void);
-XBT_PUBLIC(void) ETag_surfxml_host(void);
-XBT_PUBLIC(void) STag_surfxml_prop(void);
-XBT_PUBLIC(void) ETag_surfxml_prop(void);
-XBT_PUBLIC(void) STag_surfxml_cluster(void);
-XBT_PUBLIC(void) ETag_surfxml_cluster(void);
-XBT_PUBLIC(void) STag_surfxml_router(void);
-XBT_PUBLIC(void) ETag_surfxml_router(void);
-XBT_PUBLIC(void) STag_surfxml_link(void);
-XBT_PUBLIC(void) ETag_surfxml_link(void);
-XBT_PUBLIC(void) STag_surfxml_route_c_multi(void);
-XBT_PUBLIC(void) ETag_surfxml_route_c_multi(void);
-XBT_PUBLIC(void) STag_surfxml_route(void);
-XBT_PUBLIC(void) ETag_surfxml_route(void);
-XBT_PUBLIC(void) STag_surfxml_link_c_ctn(void);
-XBT_PUBLIC(void) ETag_surfxml_link_c_ctn(void);
-XBT_PUBLIC(void) STag_surfxml_process(void);
-XBT_PUBLIC(void) ETag_surfxml_process(void);
-XBT_PUBLIC(void) STag_surfxml_argument(void);
-XBT_PUBLIC(void) ETag_surfxml_argument(void);
+XBT_PUBLIC(void ) STag_surfxml_platform(void);
+XBT_PUBLIC(void ) ETag_surfxml_platform(void);
+XBT_PUBLIC(void ) STag_surfxml_include(void);
+XBT_PUBLIC(void ) ETag_surfxml_include(void);
+XBT_PUBLIC(void ) STag_surfxml_trace(void);
+XBT_PUBLIC(void ) ETag_surfxml_trace(void);
+XBT_PUBLIC(void ) STag_surfxml_random(void);
+XBT_PUBLIC(void ) ETag_surfxml_random(void);
+XBT_PUBLIC(void ) STag_surfxml_trace_c_connect(void);
+XBT_PUBLIC(void ) ETag_surfxml_trace_c_connect(void);
+XBT_PUBLIC(void ) STag_surfxml_set(void);
+XBT_PUBLIC(void ) ETag_surfxml_set(void);
+XBT_PUBLIC(void ) STag_surfxml_foreach(void);
+XBT_PUBLIC(void ) ETag_surfxml_foreach(void);
+XBT_PUBLIC(void ) STag_surfxml_host(void);
+XBT_PUBLIC(void ) ETag_surfxml_host(void);
+XBT_PUBLIC(void ) STag_surfxml_prop(void);
+XBT_PUBLIC(void ) ETag_surfxml_prop(void);
+XBT_PUBLIC(void ) STag_surfxml_cluster(void);
+XBT_PUBLIC(void ) ETag_surfxml_cluster(void);
+XBT_PUBLIC(void ) STag_surfxml_router(void);
+XBT_PUBLIC(void ) ETag_surfxml_router(void);
+XBT_PUBLIC(void ) STag_surfxml_link(void);
+XBT_PUBLIC(void ) ETag_surfxml_link(void);
+XBT_PUBLIC(void ) STag_surfxml_route_c_multi(void);
+XBT_PUBLIC(void ) ETag_surfxml_route_c_multi(void);
+XBT_PUBLIC(void ) STag_surfxml_route(void);
+XBT_PUBLIC(void ) ETag_surfxml_route(void);
+XBT_PUBLIC(void ) STag_surfxml_link_c_ctn(void);
+XBT_PUBLIC(void ) ETag_surfxml_link_c_ctn(void);
+XBT_PUBLIC(void ) STag_surfxml_process(void);
+XBT_PUBLIC(void ) ETag_surfxml_process(void);
+XBT_PUBLIC(void ) STag_surfxml_argument(void);
+XBT_PUBLIC(void ) ETag_surfxml_argument(void);
 
 /* XML application data. */
-     typedef enum { AU_surfxml_random_generator,
-       A_surfxml_random_generator_DRAND48,
-       A_surfxml_random_generator_RAND
-     } AT_surfxml_random_generator;
-     typedef int AT_surfxml_prop_id;
+typedef enum { AU_surfxml_random_generator, A_surfxml_random_generator_DRAND48,A_surfxml_random_generator_RAND } AT_surfxml_random_generator;
+typedef int AT_surfxml_prop_id;
 #define AU_surfxml_prop_id NULL
-     typedef int AT_surfxml_host_interference_recv;
+typedef int AT_surfxml_host_interference_recv;
 #define AU_surfxml_host_interference_recv NULL
-     typedef int AT_surfxml_host_id;
+typedef int AT_surfxml_host_id;
 #define AU_surfxml_host_id NULL
-     typedef int AT_surfxml_set_id;
+typedef int AT_surfxml_set_id;
 #define AU_surfxml_set_id NULL
-     typedef int AT_surfxml_link_latency_file;
+typedef int AT_surfxml_link_latency_file;
 #define AU_surfxml_link_latency_file NULL
-     typedef enum { AU_surfxml_host_state, A_surfxml_host_state_ON,
-       A_surfxml_host_state_OFF
-     } AT_surfxml_host_state;
-     typedef int AT_surfxml_host_interference_send_recv;
+typedef enum { AU_surfxml_host_state, A_surfxml_host_state_ON,A_surfxml_host_state_OFF } AT_surfxml_host_state;
+typedef int AT_surfxml_host_interference_send_recv;
 #define AU_surfxml_host_interference_send_recv NULL
-     typedef int AT_surfxml_host_interference_send;
+typedef int AT_surfxml_host_interference_send;
 #define AU_surfxml_host_interference_send NULL
-     typedef int AT_surfxml_set_suffix;
+typedef int AT_surfxml_set_suffix;
 #define AU_surfxml_set_suffix NULL
-     typedef int AT_surfxml_route_impact_on_dst;
+typedef int AT_surfxml_route_impact_on_dst;
 #define AU_surfxml_route_impact_on_dst NULL
-     typedef int AT_surfxml_host_power;
+typedef int AT_surfxml_host_power;
 #define AU_surfxml_host_power NULL
-     typedef int AT_surfxml_router_id;
+typedef int AT_surfxml_router_id;
 #define AU_surfxml_router_id NULL
-     typedef int AT_surfxml_process_start_time;
+typedef int AT_surfxml_process_start_time;
 #define AU_surfxml_process_start_time NULL
-     typedef int AT_surfxml_cluster_suffix;
+typedef int AT_surfxml_cluster_suffix;
 #define AU_surfxml_cluster_suffix NULL
-     typedef int AT_surfxml_platform_xmlns_c_route;
+typedef int AT_surfxml_platform_xmlns_c_route;
 #define AU_surfxml_platform_xmlns_c_route NULL
-     typedef int AT_surfxml_cluster_prefix;
+typedef int AT_surfxml_cluster_prefix;
 #define AU_surfxml_cluster_prefix NULL
-     typedef int AT_surfxml_trace_file;
+typedef int AT_surfxml_trace_file;
 #define AU_surfxml_trace_file NULL
-     typedef enum { AU_surfxml_route_action, A_surfxml_route_action_POSTPEND,
-       A_surfxml_route_action_PREPEND,
-       A_surfxml_route_action_OVERRIDE
-     } AT_surfxml_route_action;
-     typedef enum { AU_surfxml_link_sharing_policy,
-       A_surfxml_link_sharing_policy_SHARED,
-       A_surfxml_link_sharing_policy_FATPIPE
-     } AT_surfxml_link_sharing_policy;
-     typedef int AT_surfxml_random_min;
+typedef enum { AU_surfxml_route_action, A_surfxml_route_action_POSTPEND,A_surfxml_route_action_PREPEND,A_surfxml_route_action_OVERRIDE } AT_surfxml_route_action;
+typedef enum { AU_surfxml_link_sharing_policy, A_surfxml_link_sharing_policy_SHARED,A_surfxml_link_sharing_policy_FATPIPE } AT_surfxml_link_sharing_policy;
+typedef int AT_surfxml_random_min;
 #define AU_surfxml_random_min NULL
-     typedef int AT_surfxml_process_kill_time;
+typedef int AT_surfxml_process_kill_time;
 #define AU_surfxml_process_kill_time NULL
-     typedef int AT_surfxml_cluster_bb_bw;
+typedef int AT_surfxml_cluster_bb_bw;
 #define AU_surfxml_cluster_bb_bw NULL
-     typedef int AT_surfxml_trace_c_connect_element;
+typedef int AT_surfxml_trace_c_connect_element;
 #define AU_surfxml_trace_c_connect_element NULL
-     typedef int AT_surfxml_argument_value;
+typedef int AT_surfxml_argument_value;
 #define AU_surfxml_argument_value NULL
-     typedef enum { AU_surfxml_link_state, A_surfxml_link_state_ON,
-       A_surfxml_link_state_OFF
-     } AT_surfxml_link_state;
-     typedef int AT_surfxml_route_impact_on_src;
+typedef enum { AU_surfxml_link_state, A_surfxml_link_state_ON,A_surfxml_link_state_OFF } AT_surfxml_link_state;
+typedef int AT_surfxml_route_impact_on_src;
 #define AU_surfxml_route_impact_on_src NULL
-     typedef int AT_surfxml_link_bandwidth;
+typedef int AT_surfxml_link_bandwidth;
 #define AU_surfxml_link_bandwidth NULL
-     typedef int AT_surfxml_cluster_id;
+typedef int AT_surfxml_cluster_id;
 #define AU_surfxml_cluster_id NULL
-     typedef int AT_surfxml_random_mean;
+typedef int AT_surfxml_random_mean;
 #define AU_surfxml_random_mean NULL
-     typedef int AT_surfxml_cluster_bb_lat;
+typedef int AT_surfxml_cluster_bb_lat;
 #define AU_surfxml_cluster_bb_lat NULL
-     typedef int AT_surfxml_link_latency;
+typedef int AT_surfxml_link_latency;
 #define AU_surfxml_link_latency NULL
-     typedef int AT_surfxml_platform_xmlns_c_link;
+typedef int AT_surfxml_platform_xmlns_c_link;
 #define AU_surfxml_platform_xmlns_c_link NULL
-     typedef int AT_surfxml_link_bandwidth_file;
+typedef int AT_surfxml_link_bandwidth_file;
 #define AU_surfxml_link_bandwidth_file NULL
-     typedef int AT_surfxml_random_id;
+typedef int AT_surfxml_random_id;
 #define AU_surfxml_random_id NULL
-     typedef int AT_surfxml_set_radical;
+typedef int AT_surfxml_set_radical;
 #define AU_surfxml_set_radical NULL
-     typedef int AT_surfxml_random_max;
+typedef int AT_surfxml_random_max;
 #define AU_surfxml_random_max NULL
-     typedef int AT_surfxml_link_id;
+typedef int AT_surfxml_link_id;
 #define AU_surfxml_link_id NULL
-     typedef int AT_surfxml_process_host;
+typedef int AT_surfxml_process_host;
 #define AU_surfxml_process_host NULL
-     typedef int AT_surfxml_host_availability_file;
+typedef int AT_surfxml_host_availability_file;
 #define AU_surfxml_host_availability_file NULL
-     typedef int AT_surfxml_cluster_lat;
+typedef int AT_surfxml_cluster_lat;
 #define AU_surfxml_cluster_lat NULL
-     typedef int AT_surfxml_trace_periodicity;
+typedef int AT_surfxml_trace_periodicity;
 #define AU_surfxml_trace_periodicity NULL
-     typedef int AT_surfxml_foreach_set_id;
+typedef int AT_surfxml_foreach_set_id;
 #define AU_surfxml_foreach_set_id NULL
-     typedef int AT_surfxml_route_impact_on_dst_with_other_send;
+typedef int AT_surfxml_route_impact_on_dst_with_other_send;
 #define AU_surfxml_route_impact_on_dst_with_other_send NULL
-     typedef int AT_surfxml_prop_value;
+typedef int AT_surfxml_prop_value;
 #define AU_surfxml_prop_value NULL
-     typedef int AT_surfxml_route_impact_on_src_with_other_recv;
+typedef int AT_surfxml_route_impact_on_src_with_other_recv;
 #define AU_surfxml_route_impact_on_src_with_other_recv NULL
-     typedef int AT_surfxml_link_state_file;
+typedef int AT_surfxml_trace_timestep;
+#define AU_surfxml_trace_timestep NULL
+typedef int AT_surfxml_link_state_file;
 #define AU_surfxml_link_state_file NULL
-     typedef int AT_surfxml_set_prefix;
+typedef int AT_surfxml_set_prefix;
 #define AU_surfxml_set_prefix NULL
-     typedef int AT_surfxml_cluster_power;
+typedef int AT_surfxml_cluster_power;
 #define AU_surfxml_cluster_power NULL
-     typedef int AT_surfxml_process_function;
+typedef int AT_surfxml_process_function;
 #define AU_surfxml_process_function NULL
-     typedef int AT_surfxml_host_max_outgoing_rate;
+typedef int AT_surfxml_host_max_outgoing_rate;
 #define AU_surfxml_host_max_outgoing_rate NULL
-     typedef int AT_surfxml_link_c_ctn_id;
+typedef int AT_surfxml_link_c_ctn_id;
 #define AU_surfxml_link_c_ctn_id NULL
-     typedef int AT_surfxml_host_availability;
+typedef int AT_surfxml_host_availability;
 #define AU_surfxml_host_availability NULL
-     typedef int AT_surfxml_route_src;
+typedef int AT_surfxml_route_src;
 #define AU_surfxml_route_src NULL
-     typedef int AT_surfxml_route_c_multi_src;
+typedef int AT_surfxml_route_c_multi_src;
 #define AU_surfxml_route_c_multi_src NULL
-     typedef enum { AU_surfxml_route_c_multi_action,
-       A_surfxml_route_c_multi_action_POSTPEND,
-       A_surfxml_route_c_multi_action_PREPEND,
-       A_surfxml_route_c_multi_action_OVERRIDE
-     } AT_surfxml_route_c_multi_action;
-     typedef int AT_surfxml_trace_c_connect_trace;
+typedef enum { AU_surfxml_route_c_multi_action, A_surfxml_route_c_multi_action_POSTPEND,A_surfxml_route_c_multi_action_PREPEND,A_surfxml_route_c_multi_action_OVERRIDE } AT_surfxml_route_c_multi_action;
+typedef int AT_surfxml_trace_c_connect_trace;
 #define AU_surfxml_trace_c_connect_trace NULL
-     typedef int AT_surfxml_trace_id;
+typedef int AT_surfxml_trace_id;
 #define AU_surfxml_trace_id NULL
-     typedef int AT_surfxml_cluster_radical;
+typedef int AT_surfxml_cluster_radical;
 #define AU_surfxml_cluster_radical NULL
-     typedef int AT_surfxml_include_file;
+typedef int AT_surfxml_include_file;
 #define AU_surfxml_include_file NULL
-     typedef int AT_surfxml_random_std_deviation;
+typedef int AT_surfxml_random_std_deviation;
 #define AU_surfxml_random_std_deviation NULL
-     typedef enum { AU_surfxml_trace_c_connect_kind,
-       A_surfxml_trace_c_connect_kind_HOST_AVAIL,
-       A_surfxml_trace_c_connect_kind_POWER,
-       A_surfxml_trace_c_connect_kind_LINK_AVAIL,
-       A_surfxml_trace_c_connect_kind_BANDWIDTH,
-       A_surfxml_trace_c_connect_kind_LATENCY
-     } AT_surfxml_trace_c_connect_kind;
-     typedef int AT_surfxml_route_c_multi_dst;
+typedef enum { AU_surfxml_trace_c_connect_kind, A_surfxml_trace_c_connect_kind_HOST_AVAIL,A_surfxml_trace_c_connect_kind_POWER,A_surfxml_trace_c_connect_kind_LINK_AVAIL,A_surfxml_trace_c_connect_kind_BANDWIDTH,A_surfxml_trace_c_connect_kind_LATENCY } AT_surfxml_trace_c_connect_kind;
+typedef int AT_surfxml_route_c_multi_dst;
 #define AU_surfxml_route_c_multi_dst NULL
-     typedef int AT_surfxml_host_state_file;
+typedef int AT_surfxml_host_state_file;
 #define AU_surfxml_host_state_file NULL
-     typedef enum { AU_surfxml_route_c_multi_symmetric,
-       A_surfxml_route_c_multi_symmetric_YES,
-       A_surfxml_route_c_multi_symmetric_NO
-     } AT_surfxml_route_c_multi_symmetric;
-     typedef int AT_surfxml_route_dst;
+typedef enum { AU_surfxml_route_c_multi_symmetric, A_surfxml_route_c_multi_symmetric_YES,A_surfxml_route_c_multi_symmetric_NO } AT_surfxml_route_c_multi_symmetric;
+typedef int AT_surfxml_route_dst;
 #define AU_surfxml_route_dst NULL
-     typedef int AT_surfxml_cluster_bw;
+typedef int AT_surfxml_cluster_bw;
 #define AU_surfxml_cluster_bw NULL
-     typedef int AT_surfxml_platform_version;
+typedef int AT_surfxml_platform_version;
 #define AU_surfxml_platform_version NULL
 
 /* FleXML-provided data. */
-XBT_PUBLIC_DATA(int) surfxml_pcdata_ix;
+XBT_PUBLIC_DATA(int ) surfxml_pcdata_ix;
 XBT_PUBLIC_DATA(char *) surfxml_bufferstack;
 #define surfxml_pcdata (surfxml_bufferstack + surfxml_pcdata_ix)
-XBT_PUBLIC_DATA(AT_surfxml_random_generator) AX_surfxml_random_generator;
+XBT_PUBLIC_DATA(AT_surfxml_random_generator ) AX_surfxml_random_generator;
 #define A_surfxml_random_generator AX_surfxml_random_generator
-XBT_PUBLIC_DATA(AT_surfxml_prop_id) AX_surfxml_prop_id;
+XBT_PUBLIC_DATA(AT_surfxml_prop_id ) AX_surfxml_prop_id;
 #define A_surfxml_prop_id (surfxml_bufferstack + AX_surfxml_prop_id)
-XBT_PUBLIC_DATA(AT_surfxml_host_interference_recv)
-  AX_surfxml_host_interference_recv;
+XBT_PUBLIC_DATA(AT_surfxml_host_interference_recv ) AX_surfxml_host_interference_recv;
 #define A_surfxml_host_interference_recv (surfxml_bufferstack + AX_surfxml_host_interference_recv)
-XBT_PUBLIC_DATA(AT_surfxml_host_id) AX_surfxml_host_id;
+XBT_PUBLIC_DATA(AT_surfxml_host_id ) AX_surfxml_host_id;
 #define A_surfxml_host_id (surfxml_bufferstack + AX_surfxml_host_id)
-XBT_PUBLIC_DATA(AT_surfxml_set_id) AX_surfxml_set_id;
+XBT_PUBLIC_DATA(AT_surfxml_set_id ) AX_surfxml_set_id;
 #define A_surfxml_set_id (surfxml_bufferstack + AX_surfxml_set_id)
-XBT_PUBLIC_DATA(AT_surfxml_link_latency_file) AX_surfxml_link_latency_file;
+XBT_PUBLIC_DATA(AT_surfxml_link_latency_file ) AX_surfxml_link_latency_file;
 #define A_surfxml_link_latency_file (surfxml_bufferstack + AX_surfxml_link_latency_file)
-XBT_PUBLIC_DATA(AT_surfxml_host_state) AX_surfxml_host_state;
+XBT_PUBLIC_DATA(AT_surfxml_host_state ) AX_surfxml_host_state;
 #define A_surfxml_host_state AX_surfxml_host_state
-XBT_PUBLIC_DATA(AT_surfxml_host_interference_send_recv)
-  AX_surfxml_host_interference_send_recv;
+XBT_PUBLIC_DATA(AT_surfxml_host_interference_send_recv ) AX_surfxml_host_interference_send_recv;
 #define A_surfxml_host_interference_send_recv (surfxml_bufferstack + AX_surfxml_host_interference_send_recv)
-XBT_PUBLIC_DATA(AT_surfxml_host_interference_send)
-  AX_surfxml_host_interference_send;
+XBT_PUBLIC_DATA(AT_surfxml_host_interference_send ) AX_surfxml_host_interference_send;
 #define A_surfxml_host_interference_send (surfxml_bufferstack + AX_surfxml_host_interference_send)
-XBT_PUBLIC_DATA(AT_surfxml_set_suffix) AX_surfxml_set_suffix;
+XBT_PUBLIC_DATA(AT_surfxml_set_suffix ) AX_surfxml_set_suffix;
 #define A_surfxml_set_suffix (surfxml_bufferstack + AX_surfxml_set_suffix)
-XBT_PUBLIC_DATA(AT_surfxml_route_impact_on_dst)
-  AX_surfxml_route_impact_on_dst;
+XBT_PUBLIC_DATA(AT_surfxml_route_impact_on_dst ) AX_surfxml_route_impact_on_dst;
 #define A_surfxml_route_impact_on_dst (surfxml_bufferstack + AX_surfxml_route_impact_on_dst)
-XBT_PUBLIC_DATA(AT_surfxml_host_power) AX_surfxml_host_power;
+XBT_PUBLIC_DATA(AT_surfxml_host_power ) AX_surfxml_host_power;
 #define A_surfxml_host_power (surfxml_bufferstack + AX_surfxml_host_power)
-XBT_PUBLIC_DATA(AT_surfxml_router_id) AX_surfxml_router_id;
+XBT_PUBLIC_DATA(AT_surfxml_router_id ) AX_surfxml_router_id;
 #define A_surfxml_router_id (surfxml_bufferstack + AX_surfxml_router_id)
-XBT_PUBLIC_DATA(AT_surfxml_process_start_time) AX_surfxml_process_start_time;
+XBT_PUBLIC_DATA(AT_surfxml_process_start_time ) AX_surfxml_process_start_time;
 #define A_surfxml_process_start_time (surfxml_bufferstack + AX_surfxml_process_start_time)
-XBT_PUBLIC_DATA(AT_surfxml_cluster_suffix) AX_surfxml_cluster_suffix;
+XBT_PUBLIC_DATA(AT_surfxml_cluster_suffix ) AX_surfxml_cluster_suffix;
 #define A_surfxml_cluster_suffix (surfxml_bufferstack + AX_surfxml_cluster_suffix)
-XBT_PUBLIC_DATA(AT_surfxml_platform_xmlns_c_route)
-  AX_surfxml_platform_xmlns_c_route;
+XBT_PUBLIC_DATA(AT_surfxml_platform_xmlns_c_route ) AX_surfxml_platform_xmlns_c_route;
 #define A_surfxml_platform_xmlns_c_route (surfxml_bufferstack + AX_surfxml_platform_xmlns_c_route)
-XBT_PUBLIC_DATA(AT_surfxml_cluster_prefix) AX_surfxml_cluster_prefix;
+XBT_PUBLIC_DATA(AT_surfxml_cluster_prefix ) AX_surfxml_cluster_prefix;
 #define A_surfxml_cluster_prefix (surfxml_bufferstack + AX_surfxml_cluster_prefix)
-XBT_PUBLIC_DATA(AT_surfxml_trace_file) AX_surfxml_trace_file;
+XBT_PUBLIC_DATA(AT_surfxml_trace_file ) AX_surfxml_trace_file;
 #define A_surfxml_trace_file (surfxml_bufferstack + AX_surfxml_trace_file)
-XBT_PUBLIC_DATA(AT_surfxml_route_action) AX_surfxml_route_action;
+XBT_PUBLIC_DATA(AT_surfxml_route_action ) AX_surfxml_route_action;
 #define A_surfxml_route_action AX_surfxml_route_action
-XBT_PUBLIC_DATA(AT_surfxml_link_sharing_policy)
-  AX_surfxml_link_sharing_policy;
+XBT_PUBLIC_DATA(AT_surfxml_link_sharing_policy ) AX_surfxml_link_sharing_policy;
 #define A_surfxml_link_sharing_policy AX_surfxml_link_sharing_policy
-XBT_PUBLIC_DATA(AT_surfxml_random_min) AX_surfxml_random_min;
+XBT_PUBLIC_DATA(AT_surfxml_random_min ) AX_surfxml_random_min;
 #define A_surfxml_random_min (surfxml_bufferstack + AX_surfxml_random_min)
-XBT_PUBLIC_DATA(AT_surfxml_process_kill_time) AX_surfxml_process_kill_time;
+XBT_PUBLIC_DATA(AT_surfxml_process_kill_time ) AX_surfxml_process_kill_time;
 #define A_surfxml_process_kill_time (surfxml_bufferstack + AX_surfxml_process_kill_time)
-XBT_PUBLIC_DATA(AT_surfxml_cluster_bb_bw) AX_surfxml_cluster_bb_bw;
+XBT_PUBLIC_DATA(AT_surfxml_cluster_bb_bw ) AX_surfxml_cluster_bb_bw;
 #define A_surfxml_cluster_bb_bw (surfxml_bufferstack + AX_surfxml_cluster_bb_bw)
-XBT_PUBLIC_DATA(AT_surfxml_trace_c_connect_element)
-  AX_surfxml_trace_c_connect_element;
+XBT_PUBLIC_DATA(AT_surfxml_trace_c_connect_element ) AX_surfxml_trace_c_connect_element;
 #define A_surfxml_trace_c_connect_element (surfxml_bufferstack + AX_surfxml_trace_c_connect_element)
-XBT_PUBLIC_DATA(AT_surfxml_argument_value) AX_surfxml_argument_value;
+XBT_PUBLIC_DATA(AT_surfxml_argument_value ) AX_surfxml_argument_value;
 #define A_surfxml_argument_value (surfxml_bufferstack + AX_surfxml_argument_value)
-XBT_PUBLIC_DATA(AT_surfxml_link_state) AX_surfxml_link_state;
+XBT_PUBLIC_DATA(AT_surfxml_link_state ) AX_surfxml_link_state;
 #define A_surfxml_link_state AX_surfxml_link_state
-XBT_PUBLIC_DATA(AT_surfxml_route_impact_on_src)
-  AX_surfxml_route_impact_on_src;
+XBT_PUBLIC_DATA(AT_surfxml_route_impact_on_src ) AX_surfxml_route_impact_on_src;
 #define A_surfxml_route_impact_on_src (surfxml_bufferstack + AX_surfxml_route_impact_on_src)
-XBT_PUBLIC_DATA(AT_surfxml_link_bandwidth) AX_surfxml_link_bandwidth;
+XBT_PUBLIC_DATA(AT_surfxml_link_bandwidth ) AX_surfxml_link_bandwidth;
 #define A_surfxml_link_bandwidth (surfxml_bufferstack + AX_surfxml_link_bandwidth)
-XBT_PUBLIC_DATA(AT_surfxml_cluster_id) AX_surfxml_cluster_id;
+XBT_PUBLIC_DATA(AT_surfxml_cluster_id ) AX_surfxml_cluster_id;
 #define A_surfxml_cluster_id (surfxml_bufferstack + AX_surfxml_cluster_id)
-XBT_PUBLIC_DATA(AT_surfxml_random_mean) AX_surfxml_random_mean;
+XBT_PUBLIC_DATA(AT_surfxml_random_mean ) AX_surfxml_random_mean;
 #define A_surfxml_random_mean (surfxml_bufferstack + AX_surfxml_random_mean)
-XBT_PUBLIC_DATA(AT_surfxml_cluster_bb_lat) AX_surfxml_cluster_bb_lat;
+XBT_PUBLIC_DATA(AT_surfxml_cluster_bb_lat ) AX_surfxml_cluster_bb_lat;
 #define A_surfxml_cluster_bb_lat (surfxml_bufferstack + AX_surfxml_cluster_bb_lat)
-XBT_PUBLIC_DATA(AT_surfxml_link_latency) AX_surfxml_link_latency;
+XBT_PUBLIC_DATA(AT_surfxml_link_latency ) AX_surfxml_link_latency;
 #define A_surfxml_link_latency (surfxml_bufferstack + AX_surfxml_link_latency)
-XBT_PUBLIC_DATA(AT_surfxml_platform_xmlns_c_link)
-  AX_surfxml_platform_xmlns_c_link;
+XBT_PUBLIC_DATA(AT_surfxml_platform_xmlns_c_link ) AX_surfxml_platform_xmlns_c_link;
 #define A_surfxml_platform_xmlns_c_link (surfxml_bufferstack + AX_surfxml_platform_xmlns_c_link)
-XBT_PUBLIC_DATA(AT_surfxml_link_bandwidth_file)
-  AX_surfxml_link_bandwidth_file;
+XBT_PUBLIC_DATA(AT_surfxml_link_bandwidth_file ) AX_surfxml_link_bandwidth_file;
 #define A_surfxml_link_bandwidth_file (surfxml_bufferstack + AX_surfxml_link_bandwidth_file)
-XBT_PUBLIC_DATA(AT_surfxml_random_id) AX_surfxml_random_id;
+XBT_PUBLIC_DATA(AT_surfxml_random_id ) AX_surfxml_random_id;
 #define A_surfxml_random_id (surfxml_bufferstack + AX_surfxml_random_id)
-XBT_PUBLIC_DATA(AT_surfxml_set_radical) AX_surfxml_set_radical;
+XBT_PUBLIC_DATA(AT_surfxml_set_radical ) AX_surfxml_set_radical;
 #define A_surfxml_set_radical (surfxml_bufferstack + AX_surfxml_set_radical)
-XBT_PUBLIC_DATA(AT_surfxml_random_max) AX_surfxml_random_max;
+XBT_PUBLIC_DATA(AT_surfxml_random_max ) AX_surfxml_random_max;
 #define A_surfxml_random_max (surfxml_bufferstack + AX_surfxml_random_max)
-XBT_PUBLIC_DATA(AT_surfxml_link_id) AX_surfxml_link_id;
+XBT_PUBLIC_DATA(AT_surfxml_link_id ) AX_surfxml_link_id;
 #define A_surfxml_link_id (surfxml_bufferstack + AX_surfxml_link_id)
-XBT_PUBLIC_DATA(AT_surfxml_process_host) AX_surfxml_process_host;
+XBT_PUBLIC_DATA(AT_surfxml_process_host ) AX_surfxml_process_host;
 #define A_surfxml_process_host (surfxml_bufferstack + AX_surfxml_process_host)
-XBT_PUBLIC_DATA(AT_surfxml_host_availability_file)
-  AX_surfxml_host_availability_file;
+XBT_PUBLIC_DATA(AT_surfxml_host_availability_file ) AX_surfxml_host_availability_file;
 #define A_surfxml_host_availability_file (surfxml_bufferstack + AX_surfxml_host_availability_file)
-XBT_PUBLIC_DATA(AT_surfxml_cluster_lat) AX_surfxml_cluster_lat;
+XBT_PUBLIC_DATA(AT_surfxml_cluster_lat ) AX_surfxml_cluster_lat;
 #define A_surfxml_cluster_lat (surfxml_bufferstack + AX_surfxml_cluster_lat)
-XBT_PUBLIC_DATA(AT_surfxml_trace_periodicity) AX_surfxml_trace_periodicity;
+XBT_PUBLIC_DATA(AT_surfxml_trace_periodicity ) AX_surfxml_trace_periodicity;
 #define A_surfxml_trace_periodicity (surfxml_bufferstack + AX_surfxml_trace_periodicity)
-XBT_PUBLIC_DATA(AT_surfxml_foreach_set_id) AX_surfxml_foreach_set_id;
+XBT_PUBLIC_DATA(AT_surfxml_foreach_set_id ) AX_surfxml_foreach_set_id;
 #define A_surfxml_foreach_set_id (surfxml_bufferstack + AX_surfxml_foreach_set_id)
-XBT_PUBLIC_DATA(AT_surfxml_route_impact_on_dst_with_other_send)
-  AX_surfxml_route_impact_on_dst_with_other_send;
+XBT_PUBLIC_DATA(AT_surfxml_route_impact_on_dst_with_other_send ) AX_surfxml_route_impact_on_dst_with_other_send;
 #define A_surfxml_route_impact_on_dst_with_other_send (surfxml_bufferstack + AX_surfxml_route_impact_on_dst_with_other_send)
-XBT_PUBLIC_DATA(AT_surfxml_prop_value) AX_surfxml_prop_value;
+XBT_PUBLIC_DATA(AT_surfxml_prop_value ) AX_surfxml_prop_value;
 #define A_surfxml_prop_value (surfxml_bufferstack + AX_surfxml_prop_value)
-XBT_PUBLIC_DATA(AT_surfxml_route_impact_on_src_with_other_recv)
-  AX_surfxml_route_impact_on_src_with_other_recv;
+XBT_PUBLIC_DATA(AT_surfxml_route_impact_on_src_with_other_recv ) AX_surfxml_route_impact_on_src_with_other_recv;
 #define A_surfxml_route_impact_on_src_with_other_recv (surfxml_bufferstack + AX_surfxml_route_impact_on_src_with_other_recv)
-XBT_PUBLIC_DATA(AT_surfxml_link_state_file) AX_surfxml_link_state_file;
+XBT_PUBLIC_DATA(AT_surfxml_trace_timestep ) AX_surfxml_trace_timestep;
+#define A_surfxml_trace_timestep (surfxml_bufferstack + AX_surfxml_trace_timestep)
+XBT_PUBLIC_DATA(AT_surfxml_link_state_file ) AX_surfxml_link_state_file;
 #define A_surfxml_link_state_file (surfxml_bufferstack + AX_surfxml_link_state_file)
-XBT_PUBLIC_DATA(AT_surfxml_set_prefix) AX_surfxml_set_prefix;
+XBT_PUBLIC_DATA(AT_surfxml_set_prefix ) AX_surfxml_set_prefix;
 #define A_surfxml_set_prefix (surfxml_bufferstack + AX_surfxml_set_prefix)
-XBT_PUBLIC_DATA(AT_surfxml_cluster_power) AX_surfxml_cluster_power;
+XBT_PUBLIC_DATA(AT_surfxml_cluster_power ) AX_surfxml_cluster_power;
 #define A_surfxml_cluster_power (surfxml_bufferstack + AX_surfxml_cluster_power)
-XBT_PUBLIC_DATA(AT_surfxml_process_function) AX_surfxml_process_function;
+XBT_PUBLIC_DATA(AT_surfxml_process_function ) AX_surfxml_process_function;
 #define A_surfxml_process_function (surfxml_bufferstack + AX_surfxml_process_function)
-XBT_PUBLIC_DATA(AT_surfxml_host_max_outgoing_rate)
-  AX_surfxml_host_max_outgoing_rate;
+XBT_PUBLIC_DATA(AT_surfxml_host_max_outgoing_rate ) AX_surfxml_host_max_outgoing_rate;
 #define A_surfxml_host_max_outgoing_rate (surfxml_bufferstack + AX_surfxml_host_max_outgoing_rate)
-XBT_PUBLIC_DATA(AT_surfxml_link_c_ctn_id) AX_surfxml_link_c_ctn_id;
+XBT_PUBLIC_DATA(AT_surfxml_link_c_ctn_id ) AX_surfxml_link_c_ctn_id;
 #define A_surfxml_link_c_ctn_id (surfxml_bufferstack + AX_surfxml_link_c_ctn_id)
-XBT_PUBLIC_DATA(AT_surfxml_host_availability) AX_surfxml_host_availability;
+XBT_PUBLIC_DATA(AT_surfxml_host_availability ) AX_surfxml_host_availability;
 #define A_surfxml_host_availability (surfxml_bufferstack + AX_surfxml_host_availability)
-XBT_PUBLIC_DATA(AT_surfxml_route_src) AX_surfxml_route_src;
+XBT_PUBLIC_DATA(AT_surfxml_route_src ) AX_surfxml_route_src;
 #define A_surfxml_route_src (surfxml_bufferstack + AX_surfxml_route_src)
-XBT_PUBLIC_DATA(AT_surfxml_route_c_multi_src) AX_surfxml_route_c_multi_src;
+XBT_PUBLIC_DATA(AT_surfxml_route_c_multi_src ) AX_surfxml_route_c_multi_src;
 #define A_surfxml_route_c_multi_src (surfxml_bufferstack + AX_surfxml_route_c_multi_src)
-XBT_PUBLIC_DATA(AT_surfxml_route_c_multi_action)
-  AX_surfxml_route_c_multi_action;
+XBT_PUBLIC_DATA(AT_surfxml_route_c_multi_action ) AX_surfxml_route_c_multi_action;
 #define A_surfxml_route_c_multi_action AX_surfxml_route_c_multi_action
-XBT_PUBLIC_DATA(AT_surfxml_trace_c_connect_trace)
-  AX_surfxml_trace_c_connect_trace;
+XBT_PUBLIC_DATA(AT_surfxml_trace_c_connect_trace ) AX_surfxml_trace_c_connect_trace;
 #define A_surfxml_trace_c_connect_trace (surfxml_bufferstack + AX_surfxml_trace_c_connect_trace)
-XBT_PUBLIC_DATA(AT_surfxml_trace_id) AX_surfxml_trace_id;
+XBT_PUBLIC_DATA(AT_surfxml_trace_id ) AX_surfxml_trace_id;
 #define A_surfxml_trace_id (surfxml_bufferstack + AX_surfxml_trace_id)
-XBT_PUBLIC_DATA(AT_surfxml_cluster_radical) AX_surfxml_cluster_radical;
+XBT_PUBLIC_DATA(AT_surfxml_cluster_radical ) AX_surfxml_cluster_radical;
 #define A_surfxml_cluster_radical (surfxml_bufferstack + AX_surfxml_cluster_radical)
-XBT_PUBLIC_DATA(AT_surfxml_include_file) AX_surfxml_include_file;
+XBT_PUBLIC_DATA(AT_surfxml_include_file ) AX_surfxml_include_file;
 #define A_surfxml_include_file (surfxml_bufferstack + AX_surfxml_include_file)
-XBT_PUBLIC_DATA(AT_surfxml_random_std_deviation)
-  AX_surfxml_random_std_deviation;
+XBT_PUBLIC_DATA(AT_surfxml_random_std_deviation ) AX_surfxml_random_std_deviation;
 #define A_surfxml_random_std_deviation (surfxml_bufferstack + AX_surfxml_random_std_deviation)
-XBT_PUBLIC_DATA(AT_surfxml_trace_c_connect_kind)
-  AX_surfxml_trace_c_connect_kind;
+XBT_PUBLIC_DATA(AT_surfxml_trace_c_connect_kind ) AX_surfxml_trace_c_connect_kind;
 #define A_surfxml_trace_c_connect_kind AX_surfxml_trace_c_connect_kind
-XBT_PUBLIC_DATA(AT_surfxml_route_c_multi_dst) AX_surfxml_route_c_multi_dst;
+XBT_PUBLIC_DATA(AT_surfxml_route_c_multi_dst ) AX_surfxml_route_c_multi_dst;
 #define A_surfxml_route_c_multi_dst (surfxml_bufferstack + AX_surfxml_route_c_multi_dst)
-XBT_PUBLIC_DATA(AT_surfxml_host_state_file) AX_surfxml_host_state_file;
+XBT_PUBLIC_DATA(AT_surfxml_host_state_file ) AX_surfxml_host_state_file;
 #define A_surfxml_host_state_file (surfxml_bufferstack + AX_surfxml_host_state_file)
-XBT_PUBLIC_DATA(AT_surfxml_route_c_multi_symmetric)
-  AX_surfxml_route_c_multi_symmetric;
+XBT_PUBLIC_DATA(AT_surfxml_route_c_multi_symmetric ) AX_surfxml_route_c_multi_symmetric;
 #define A_surfxml_route_c_multi_symmetric AX_surfxml_route_c_multi_symmetric
-XBT_PUBLIC_DATA(AT_surfxml_route_dst) AX_surfxml_route_dst;
+XBT_PUBLIC_DATA(AT_surfxml_route_dst ) AX_surfxml_route_dst;
 #define A_surfxml_route_dst (surfxml_bufferstack + AX_surfxml_route_dst)
-XBT_PUBLIC_DATA(AT_surfxml_cluster_bw) AX_surfxml_cluster_bw;
+XBT_PUBLIC_DATA(AT_surfxml_cluster_bw ) AX_surfxml_cluster_bw;
 #define A_surfxml_cluster_bw (surfxml_bufferstack + AX_surfxml_cluster_bw)
-XBT_PUBLIC_DATA(AT_surfxml_platform_version) AX_surfxml_platform_version;
+XBT_PUBLIC_DATA(AT_surfxml_platform_version ) AX_surfxml_platform_version;
 #define A_surfxml_platform_version (surfxml_bufferstack + AX_surfxml_platform_version)
 
 /* XML application utilities. */
-XBT_PUBLIC(int) surfxml_element_context(int);
+XBT_PUBLIC(int ) surfxml_element_context(int);
 
 /* XML processor entry point. */
-XBT_PUBLIC(int) yylex(void);
+XBT_PUBLIC(int ) yylex(void);
 
 /* Flexml error handling function (useful only when -q flag passed to flexml) */
-     const char *surfxml_parse_err_msg(void);
-
-
SG_END_DECL()
+const char * surfxml_parse_err_msg(void);
 #endif