Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
merge changes. Strange, it seems to ate pierre commit
authorMartin Quinson <martin.quinson@loria.fr>
Fri, 4 Nov 2011 15:32:12 +0000 (16:32 +0100)
committerMartin Quinson <martin.quinson@loria.fr>
Fri, 4 Nov 2011 15:32:12 +0000 (16:32 +0100)
include/surf/simgrid_dtd.h
include/xbt/graphxml.h
src/include/surf/surfxml_parse_values.h
src/simdag/dax_dtd.c
src/simdag/dax_dtd.h
src/surf/simgrid_dtd.c
src/surf/surf_routing.c
src/surf/surfxml_parse.c
src/xbt/graphxml.c

index 3675f70..1a960fd 100644 (file)
@@ -2,8 +2,8 @@
  *
  * 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.66 2011/10/30 21:03:48 mquinson Exp).
+ * FleXML is Copyright (C) 2003-2011 Martin Quinson.  All rights reserved.
+ * (Id: flexml.pl,v 1.67 2011/11/01 20:49:21 mquinson Exp).
  * 
  * There are two, intertwined parts to this program, part A and part B.
  *
@@ -12,7 +12,7 @@
  * 
  * Some parts, here collectively called "Part A", are found in the 
  * FleXML package.  They are Copyright (C) 1999-2005 Kristoffer Rose
- * and Copyright (C) 2003-2006 Martin Quinson. All rights reserved.
+ * and Copyright (C) 2003-2011 Martin Quinson. All rights reserved.
  *
  * You can redistribute, use, perform, display and/or modify "Part A"
  * provided the following two conditions hold:
@@ -88,237 +88,156 @@ XBT_PUBLIC(void ) STag_surfxml_prop(void);
 XBT_PUBLIC(void ) ETag_surfxml_prop(void);
 
 /* XML application data. */
-short int surfxml_random_generator_isset;
 typedef enum { AU_surfxml_random_generator, A_surfxml_random_generator_DRAND48,A_surfxml_random_generator_RAND,A_surfxml_random_generator_RNGSTREAM,A_surfxml_random_generator_NONE } AT_surfxml_random_generator;
-short int surfxml_ASroute_gw_dst_isset;
 typedef int AT_surfxml_ASroute_gw_dst;
 #define AU_surfxml_ASroute_gw_dst NULL
-short int surfxml_trace_connect_element_isset;
 typedef int AT_surfxml_trace_connect_element;
 #define AU_surfxml_trace_connect_element NULL
-short int surfxml_prop_id_isset;
 typedef int AT_surfxml_prop_id;
 #define AU_surfxml_prop_id NULL
-short int surfxml_host_id_isset;
 typedef int AT_surfxml_host_id;
 #define AU_surfxml_host_id NULL
-short int surfxml_ASroute_symmetrical_isset;
 typedef enum { AU_surfxml_ASroute_symmetrical, A_surfxml_ASroute_symmetrical_YES,A_surfxml_ASroute_symmetrical_NO } AT_surfxml_ASroute_symmetrical;
-short int surfxml_peer_lat_isset;
 typedef int AT_surfxml_peer_lat;
 #define AU_surfxml_peer_lat NULL
-short int surfxml_link_latency_file_isset;
 typedef int AT_surfxml_link_latency_file;
 #define AU_surfxml_link_latency_file NULL
-short int surfxml_peer_availability_file_isset;
 typedef int AT_surfxml_peer_availability_file;
 #define AU_surfxml_peer_availability_file NULL
-short int surfxml_link_ctn_direction_isset;
 typedef enum { AU_surfxml_link_ctn_direction, A_surfxml_link_ctn_direction_UP,A_surfxml_link_ctn_direction_DOWN,A_surfxml_link_ctn_direction_NONE } AT_surfxml_link_ctn_direction;
-short int surfxml_host_state_isset;
 typedef enum { AU_surfxml_host_state, A_surfxml_host_state_ON,A_surfxml_host_state_OFF } AT_surfxml_host_state;
-short int surfxml_AS_id_isset;
 typedef int AT_surfxml_AS_id;
 #define AU_surfxml_AS_id NULL
-short int surfxml_host_power_isset;
 typedef int AT_surfxml_host_power;
 #define AU_surfxml_host_power NULL
-short int surfxml_router_id_isset;
 typedef int AT_surfxml_router_id;
 #define AU_surfxml_router_id NULL
-short int surfxml_process_start_time_isset;
 typedef int AT_surfxml_process_start_time;
 #define AU_surfxml_process_start_time NULL
-short int surfxml_cluster_suffix_isset;
 typedef int AT_surfxml_cluster_suffix;
 #define AU_surfxml_cluster_suffix NULL
-short int surfxml_ASroute_src_isset;
 typedef int AT_surfxml_ASroute_src;
 #define AU_surfxml_ASroute_src NULL
-short int surfxml_cluster_prefix_isset;
 typedef int AT_surfxml_cluster_prefix;
 #define AU_surfxml_cluster_prefix NULL
-short int surfxml_trace_file_isset;
 typedef int AT_surfxml_trace_file;
 #define AU_surfxml_trace_file NULL
-short int surfxml_link_sharing_policy_isset;
 typedef enum { AU_surfxml_link_sharing_policy, A_surfxml_link_sharing_policy_SHARED,A_surfxml_link_sharing_policy_FATPIPE,A_surfxml_link_sharing_policy_FULLDUPLEX } AT_surfxml_link_sharing_policy;
-short int surfxml_random_min_isset;
 typedef int AT_surfxml_random_min;
 #define AU_surfxml_random_min NULL
-short int surfxml_link_ctn_id_isset;
 typedef int AT_surfxml_link_ctn_id;
 #define AU_surfxml_link_ctn_id NULL
-short int surfxml_peer_bw_out_isset;
 typedef int AT_surfxml_peer_bw_out;
 #define AU_surfxml_peer_bw_out NULL
-short int surfxml_cluster_availability_file_isset;
 typedef int AT_surfxml_cluster_availability_file;
 #define AU_surfxml_cluster_availability_file NULL
-short int surfxml_process_kill_time_isset;
 typedef int AT_surfxml_process_kill_time;
 #define AU_surfxml_process_kill_time NULL
-short int surfxml_cluster_bb_bw_isset;
 typedef int AT_surfxml_cluster_bb_bw;
 #define AU_surfxml_cluster_bb_bw NULL
-short int surfxml_argument_value_isset;
 typedef int AT_surfxml_argument_value;
 #define AU_surfxml_argument_value NULL
-short int surfxml_link_state_isset;
 typedef enum { AU_surfxml_link_state, A_surfxml_link_state_ON,A_surfxml_link_state_OFF } AT_surfxml_link_state;
-short int surfxml_ASroute_gw_src_isset;
 typedef int AT_surfxml_ASroute_gw_src;
 #define AU_surfxml_ASroute_gw_src NULL
-short int surfxml_AS_routing_isset;
 typedef int AT_surfxml_AS_routing;
 #define AU_surfxml_AS_routing NULL
-short int surfxml_link_bandwidth_isset;
 typedef int AT_surfxml_link_bandwidth;
 #define AU_surfxml_link_bandwidth NULL
-short int surfxml_cluster_id_isset;
 typedef int AT_surfxml_cluster_id;
 #define AU_surfxml_cluster_id NULL
-short int surfxml_peer_bw_in_isset;
 typedef int AT_surfxml_peer_bw_in;
 #define AU_surfxml_peer_bw_in NULL
-short int surfxml_random_mean_isset;
 typedef int AT_surfxml_random_mean;
 #define AU_surfxml_random_mean NULL
-short int surfxml_cluster_bb_lat_isset;
 typedef int AT_surfxml_cluster_bb_lat;
 #define AU_surfxml_cluster_bb_lat NULL
-short int surfxml_link_latency_isset;
 typedef int AT_surfxml_link_latency;
 #define AU_surfxml_link_latency NULL
-short int surfxml_trace_connect_kind_isset;
 typedef enum { AU_surfxml_trace_connect_kind, A_surfxml_trace_connect_kind_HOST_AVAIL,A_surfxml_trace_connect_kind_POWER,A_surfxml_trace_connect_kind_LINK_AVAIL,A_surfxml_trace_connect_kind_BANDWIDTH,A_surfxml_trace_connect_kind_LATENCY } AT_surfxml_trace_connect_kind;
-short int surfxml_random_seed_isset;
 typedef int AT_surfxml_random_seed;
 #define AU_surfxml_random_seed NULL
-short int surfxml_cluster_state_file_isset;
 typedef int AT_surfxml_cluster_state_file;
 #define AU_surfxml_cluster_state_file NULL
-short int surfxml_link_bandwidth_file_isset;
 typedef int AT_surfxml_link_bandwidth_file;
 #define AU_surfxml_link_bandwidth_file NULL
-short int surfxml_route_symmetrical_isset;
 typedef enum { AU_surfxml_route_symmetrical, A_surfxml_route_symmetrical_YES,A_surfxml_route_symmetrical_NO } AT_surfxml_route_symmetrical;
-short int surfxml_random_id_isset;
 typedef int AT_surfxml_random_id;
 #define AU_surfxml_random_id NULL
-short int surfxml_random_max_isset;
 typedef int AT_surfxml_random_max;
 #define AU_surfxml_random_max NULL
-short int surfxml_link_id_isset;
 typedef int AT_surfxml_link_id;
 #define AU_surfxml_link_id NULL
-short int surfxml_process_host_isset;
 typedef int AT_surfxml_process_host;
 #define AU_surfxml_process_host NULL
-short int surfxml_host_availability_file_isset;
 typedef int AT_surfxml_host_availability_file;
 #define AU_surfxml_host_availability_file NULL
-short int surfxml_cluster_lat_isset;
 typedef int AT_surfxml_cluster_lat;
 #define AU_surfxml_cluster_lat NULL
-short int surfxml_trace_periodicity_isset;
 typedef int AT_surfxml_trace_periodicity;
 #define AU_surfxml_trace_periodicity NULL
-short int surfxml_cluster_bb_sharing_policy_isset;
 typedef enum { AU_surfxml_cluster_bb_sharing_policy, A_surfxml_cluster_bb_sharing_policy_SHARED,A_surfxml_cluster_bb_sharing_policy_FATPIPE } AT_surfxml_cluster_bb_sharing_policy;
-short int surfxml_router_coordinates_isset;
 typedef int AT_surfxml_router_coordinates;
 #define AU_surfxml_router_coordinates NULL
-short int surfxml_peer_coordinates_isset;
 typedef int AT_surfxml_peer_coordinates;
 #define AU_surfxml_peer_coordinates NULL
-short int surfxml_peer_state_file_isset;
 typedef int AT_surfxml_peer_state_file;
 #define AU_surfxml_peer_state_file NULL
-short int surfxml_prop_value_isset;
 typedef int AT_surfxml_prop_value;
 #define AU_surfxml_prop_value NULL
-short int surfxml_ASroute_dst_isset;
 typedef int AT_surfxml_ASroute_dst;
 #define AU_surfxml_ASroute_dst NULL
-short int surfxml_random_radical_isset;
 typedef int AT_surfxml_random_radical;
 #define AU_surfxml_random_radical NULL
-short int surfxml_link_state_file_isset;
 typedef int AT_surfxml_link_state_file;
 #define AU_surfxml_link_state_file NULL
-short int surfxml_trace_connect_trace_isset;
 typedef int AT_surfxml_trace_connect_trace;
 #define AU_surfxml_trace_connect_trace NULL
-short int surfxml_cluster_power_isset;
 typedef int AT_surfxml_cluster_power;
 #define AU_surfxml_cluster_power NULL
-short int surfxml_process_function_isset;
 typedef int AT_surfxml_process_function;
 #define AU_surfxml_process_function NULL
-short int surfxml_peer_id_isset;
 typedef int AT_surfxml_peer_id;
 #define AU_surfxml_peer_id NULL
-short int surfxml_cluster_router_id_isset;
 typedef int AT_surfxml_cluster_router_id;
 #define AU_surfxml_cluster_router_id NULL
-short int surfxml_cluster_sharing_policy_isset;
 typedef enum { AU_surfxml_cluster_sharing_policy, A_surfxml_cluster_sharing_policy_SHARED,A_surfxml_cluster_sharing_policy_FULLDUPLEX,A_surfxml_cluster_sharing_policy_FATPIPE } AT_surfxml_cluster_sharing_policy;
-short int surfxml_bypassRoute_dst_isset;
 typedef int AT_surfxml_bypassRoute_dst;
 #define AU_surfxml_bypassRoute_dst NULL
-short int surfxml_host_core_isset;
 typedef int AT_surfxml_host_core;
 #define AU_surfxml_host_core NULL
-short int surfxml_host_availability_isset;
 typedef int AT_surfxml_host_availability;
 #define AU_surfxml_host_availability NULL
-short int surfxml_bypassRoute_src_isset;
 typedef int AT_surfxml_bypassRoute_src;
 #define AU_surfxml_bypassRoute_src NULL
-short int surfxml_route_src_isset;
 typedef int AT_surfxml_route_src;
 #define AU_surfxml_route_src NULL
-short int surfxml_bypassRoute_gw_dst_isset;
 typedef int AT_surfxml_bypassRoute_gw_dst;
 #define AU_surfxml_bypassRoute_gw_dst NULL
-short int surfxml_host_coordinates_isset;
 typedef int AT_surfxml_host_coordinates;
 #define AU_surfxml_host_coordinates NULL
-short int surfxml_trace_id_isset;
 typedef int AT_surfxml_trace_id;
 #define AU_surfxml_trace_id NULL
-short int surfxml_peer_power_isset;
 typedef int AT_surfxml_peer_power;
 #define AU_surfxml_peer_power NULL
-short int surfxml_cluster_radical_isset;
 typedef int AT_surfxml_cluster_radical;
 #define AU_surfxml_cluster_radical NULL
-short int surfxml_config_id_isset;
 typedef int AT_surfxml_config_id;
 #define AU_surfxml_config_id NULL
-short int surfxml_bypassRoute_gw_src_isset;
 typedef int AT_surfxml_bypassRoute_gw_src;
 #define AU_surfxml_bypassRoute_gw_src NULL
-short int surfxml_cluster_core_isset;
 typedef int AT_surfxml_cluster_core;
 #define AU_surfxml_cluster_core NULL
-short int surfxml_include_file_isset;
 typedef int AT_surfxml_include_file;
 #define AU_surfxml_include_file NULL
-short int surfxml_random_std_deviation_isset;
 typedef int AT_surfxml_random_std_deviation;
 #define AU_surfxml_random_std_deviation NULL
-short int surfxml_host_state_file_isset;
 typedef int AT_surfxml_host_state_file;
 #define AU_surfxml_host_state_file NULL
-short int surfxml_route_dst_isset;
 typedef int AT_surfxml_route_dst;
 #define AU_surfxml_route_dst NULL
-short int surfxml_cluster_bw_isset;
 typedef int AT_surfxml_cluster_bw;
 #define AU_surfxml_cluster_bw NULL
-short int surfxml_platform_version_isset;
 typedef int AT_surfxml_platform_version;
 #define AU_surfxml_platform_version NULL
 
@@ -328,166 +247,247 @@ 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;
 #define A_surfxml_random_generator AX_surfxml_random_generator
+XBT_PUBLIC_DATA(short ) int surfxml_random_generator_isset;
 XBT_PUBLIC_DATA(AT_surfxml_ASroute_gw_dst ) AX_surfxml_ASroute_gw_dst;
 #define A_surfxml_ASroute_gw_dst (surfxml_bufferstack + AX_surfxml_ASroute_gw_dst)
+XBT_PUBLIC_DATA(short ) int surfxml_ASroute_gw_dst_isset;
 XBT_PUBLIC_DATA(AT_surfxml_trace_connect_element ) AX_surfxml_trace_connect_element;
 #define A_surfxml_trace_connect_element (surfxml_bufferstack + AX_surfxml_trace_connect_element)
+XBT_PUBLIC_DATA(short ) int surfxml_trace_connect_element_isset;
 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(short ) int surfxml_prop_id_isset;
 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(short ) int surfxml_host_id_isset;
 XBT_PUBLIC_DATA(AT_surfxml_ASroute_symmetrical ) AX_surfxml_ASroute_symmetrical;
 #define A_surfxml_ASroute_symmetrical AX_surfxml_ASroute_symmetrical
+XBT_PUBLIC_DATA(short ) int surfxml_ASroute_symmetrical_isset;
 XBT_PUBLIC_DATA(AT_surfxml_peer_lat ) AX_surfxml_peer_lat;
 #define A_surfxml_peer_lat (surfxml_bufferstack + AX_surfxml_peer_lat)
+XBT_PUBLIC_DATA(short ) int surfxml_peer_lat_isset;
 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(short ) int surfxml_link_latency_file_isset;
 XBT_PUBLIC_DATA(AT_surfxml_peer_availability_file ) AX_surfxml_peer_availability_file;
 #define A_surfxml_peer_availability_file (surfxml_bufferstack + AX_surfxml_peer_availability_file)
+XBT_PUBLIC_DATA(short ) int surfxml_peer_availability_file_isset;
 XBT_PUBLIC_DATA(AT_surfxml_link_ctn_direction ) AX_surfxml_link_ctn_direction;
 #define A_surfxml_link_ctn_direction AX_surfxml_link_ctn_direction
+XBT_PUBLIC_DATA(short ) int surfxml_link_ctn_direction_isset;
 XBT_PUBLIC_DATA(AT_surfxml_host_state ) AX_surfxml_host_state;
 #define A_surfxml_host_state AX_surfxml_host_state
+XBT_PUBLIC_DATA(short ) int surfxml_host_state_isset;
 XBT_PUBLIC_DATA(AT_surfxml_AS_id ) AX_surfxml_AS_id;
 #define A_surfxml_AS_id (surfxml_bufferstack + AX_surfxml_AS_id)
+XBT_PUBLIC_DATA(short ) int surfxml_AS_id_isset;
 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(short ) int surfxml_host_power_isset;
 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(short ) int surfxml_router_id_isset;
 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(short ) int surfxml_process_start_time_isset;
 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(short ) int surfxml_cluster_suffix_isset;
 XBT_PUBLIC_DATA(AT_surfxml_ASroute_src ) AX_surfxml_ASroute_src;
 #define A_surfxml_ASroute_src (surfxml_bufferstack + AX_surfxml_ASroute_src)
+XBT_PUBLIC_DATA(short ) int surfxml_ASroute_src_isset;
 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(short ) int surfxml_cluster_prefix_isset;
 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(short ) int surfxml_trace_file_isset;
 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(short ) int surfxml_link_sharing_policy_isset;
 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(short ) int surfxml_random_min_isset;
 XBT_PUBLIC_DATA(AT_surfxml_link_ctn_id ) AX_surfxml_link_ctn_id;
 #define A_surfxml_link_ctn_id (surfxml_bufferstack + AX_surfxml_link_ctn_id)
+XBT_PUBLIC_DATA(short ) int surfxml_link_ctn_id_isset;
 XBT_PUBLIC_DATA(AT_surfxml_peer_bw_out ) AX_surfxml_peer_bw_out;
 #define A_surfxml_peer_bw_out (surfxml_bufferstack + AX_surfxml_peer_bw_out)
+XBT_PUBLIC_DATA(short ) int surfxml_peer_bw_out_isset;
 XBT_PUBLIC_DATA(AT_surfxml_cluster_availability_file ) AX_surfxml_cluster_availability_file;
 #define A_surfxml_cluster_availability_file (surfxml_bufferstack + AX_surfxml_cluster_availability_file)
+XBT_PUBLIC_DATA(short ) int surfxml_cluster_availability_file_isset;
 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(short ) int surfxml_process_kill_time_isset;
 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(short ) int surfxml_cluster_bb_bw_isset;
 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(short ) int surfxml_argument_value_isset;
 XBT_PUBLIC_DATA(AT_surfxml_link_state ) AX_surfxml_link_state;
 #define A_surfxml_link_state AX_surfxml_link_state
+XBT_PUBLIC_DATA(short ) int surfxml_link_state_isset;
 XBT_PUBLIC_DATA(AT_surfxml_ASroute_gw_src ) AX_surfxml_ASroute_gw_src;
 #define A_surfxml_ASroute_gw_src (surfxml_bufferstack + AX_surfxml_ASroute_gw_src)
+XBT_PUBLIC_DATA(short ) int surfxml_ASroute_gw_src_isset;
 XBT_PUBLIC_DATA(AT_surfxml_AS_routing ) AX_surfxml_AS_routing;
 #define A_surfxml_AS_routing (surfxml_bufferstack + AX_surfxml_AS_routing)
+XBT_PUBLIC_DATA(short ) int surfxml_AS_routing_isset;
 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(short ) int surfxml_link_bandwidth_isset;
 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(short ) int surfxml_cluster_id_isset;
 XBT_PUBLIC_DATA(AT_surfxml_peer_bw_in ) AX_surfxml_peer_bw_in;
 #define A_surfxml_peer_bw_in (surfxml_bufferstack + AX_surfxml_peer_bw_in)
+XBT_PUBLIC_DATA(short ) int surfxml_peer_bw_in_isset;
 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(short ) int surfxml_random_mean_isset;
 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(short ) int surfxml_cluster_bb_lat_isset;
 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(short ) int surfxml_link_latency_isset;
 XBT_PUBLIC_DATA(AT_surfxml_trace_connect_kind ) AX_surfxml_trace_connect_kind;
 #define A_surfxml_trace_connect_kind AX_surfxml_trace_connect_kind
+XBT_PUBLIC_DATA(short ) int surfxml_trace_connect_kind_isset;
 XBT_PUBLIC_DATA(AT_surfxml_random_seed ) AX_surfxml_random_seed;
 #define A_surfxml_random_seed (surfxml_bufferstack + AX_surfxml_random_seed)
+XBT_PUBLIC_DATA(short ) int surfxml_random_seed_isset;
 XBT_PUBLIC_DATA(AT_surfxml_cluster_state_file ) AX_surfxml_cluster_state_file;
 #define A_surfxml_cluster_state_file (surfxml_bufferstack + AX_surfxml_cluster_state_file)
+XBT_PUBLIC_DATA(short ) int surfxml_cluster_state_file_isset;
 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(short ) int surfxml_link_bandwidth_file_isset;
 XBT_PUBLIC_DATA(AT_surfxml_route_symmetrical ) AX_surfxml_route_symmetrical;
 #define A_surfxml_route_symmetrical AX_surfxml_route_symmetrical
+XBT_PUBLIC_DATA(short ) int surfxml_route_symmetrical_isset;
 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(short ) int surfxml_random_id_isset;
 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(short ) int surfxml_random_max_isset;
 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(short ) int surfxml_link_id_isset;
 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(short ) int surfxml_process_host_isset;
 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(short ) int surfxml_host_availability_file_isset;
 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(short ) int surfxml_cluster_lat_isset;
 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(short ) int surfxml_trace_periodicity_isset;
 XBT_PUBLIC_DATA(AT_surfxml_cluster_bb_sharing_policy ) AX_surfxml_cluster_bb_sharing_policy;
 #define A_surfxml_cluster_bb_sharing_policy AX_surfxml_cluster_bb_sharing_policy
+XBT_PUBLIC_DATA(short ) int surfxml_cluster_bb_sharing_policy_isset;
 XBT_PUBLIC_DATA(AT_surfxml_router_coordinates ) AX_surfxml_router_coordinates;
 #define A_surfxml_router_coordinates (surfxml_bufferstack + AX_surfxml_router_coordinates)
+XBT_PUBLIC_DATA(short ) int surfxml_router_coordinates_isset;
 XBT_PUBLIC_DATA(AT_surfxml_peer_coordinates ) AX_surfxml_peer_coordinates;
 #define A_surfxml_peer_coordinates (surfxml_bufferstack + AX_surfxml_peer_coordinates)
+XBT_PUBLIC_DATA(short ) int surfxml_peer_coordinates_isset;
 XBT_PUBLIC_DATA(AT_surfxml_peer_state_file ) AX_surfxml_peer_state_file;
 #define A_surfxml_peer_state_file (surfxml_bufferstack + AX_surfxml_peer_state_file)
+XBT_PUBLIC_DATA(short ) int surfxml_peer_state_file_isset;
 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(short ) int surfxml_prop_value_isset;
 XBT_PUBLIC_DATA(AT_surfxml_ASroute_dst ) AX_surfxml_ASroute_dst;
 #define A_surfxml_ASroute_dst (surfxml_bufferstack + AX_surfxml_ASroute_dst)
+XBT_PUBLIC_DATA(short ) int surfxml_ASroute_dst_isset;
 XBT_PUBLIC_DATA(AT_surfxml_random_radical ) AX_surfxml_random_radical;
 #define A_surfxml_random_radical (surfxml_bufferstack + AX_surfxml_random_radical)
+XBT_PUBLIC_DATA(short ) int surfxml_random_radical_isset;
 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(short ) int surfxml_link_state_file_isset;
 XBT_PUBLIC_DATA(AT_surfxml_trace_connect_trace ) AX_surfxml_trace_connect_trace;
 #define A_surfxml_trace_connect_trace (surfxml_bufferstack + AX_surfxml_trace_connect_trace)
+XBT_PUBLIC_DATA(short ) int surfxml_trace_connect_trace_isset;
 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(short ) int surfxml_cluster_power_isset;
 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(short ) int surfxml_process_function_isset;
 XBT_PUBLIC_DATA(AT_surfxml_peer_id ) AX_surfxml_peer_id;
 #define A_surfxml_peer_id (surfxml_bufferstack + AX_surfxml_peer_id)
+XBT_PUBLIC_DATA(short ) int surfxml_peer_id_isset;
 XBT_PUBLIC_DATA(AT_surfxml_cluster_router_id ) AX_surfxml_cluster_router_id;
 #define A_surfxml_cluster_router_id (surfxml_bufferstack + AX_surfxml_cluster_router_id)
+XBT_PUBLIC_DATA(short ) int surfxml_cluster_router_id_isset;
 XBT_PUBLIC_DATA(AT_surfxml_cluster_sharing_policy ) AX_surfxml_cluster_sharing_policy;
 #define A_surfxml_cluster_sharing_policy AX_surfxml_cluster_sharing_policy
+XBT_PUBLIC_DATA(short ) int surfxml_cluster_sharing_policy_isset;
 XBT_PUBLIC_DATA(AT_surfxml_bypassRoute_dst ) AX_surfxml_bypassRoute_dst;
 #define A_surfxml_bypassRoute_dst (surfxml_bufferstack + AX_surfxml_bypassRoute_dst)
+XBT_PUBLIC_DATA(short ) int surfxml_bypassRoute_dst_isset;
 XBT_PUBLIC_DATA(AT_surfxml_host_core ) AX_surfxml_host_core;
 #define A_surfxml_host_core (surfxml_bufferstack + AX_surfxml_host_core)
+XBT_PUBLIC_DATA(short ) int surfxml_host_core_isset;
 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(short ) int surfxml_host_availability_isset;
 XBT_PUBLIC_DATA(AT_surfxml_bypassRoute_src ) AX_surfxml_bypassRoute_src;
 #define A_surfxml_bypassRoute_src (surfxml_bufferstack + AX_surfxml_bypassRoute_src)
+XBT_PUBLIC_DATA(short ) int surfxml_bypassRoute_src_isset;
 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(short ) int surfxml_route_src_isset;
 XBT_PUBLIC_DATA(AT_surfxml_bypassRoute_gw_dst ) AX_surfxml_bypassRoute_gw_dst;
 #define A_surfxml_bypassRoute_gw_dst (surfxml_bufferstack + AX_surfxml_bypassRoute_gw_dst)
+XBT_PUBLIC_DATA(short ) int surfxml_bypassRoute_gw_dst_isset;
 XBT_PUBLIC_DATA(AT_surfxml_host_coordinates ) AX_surfxml_host_coordinates;
 #define A_surfxml_host_coordinates (surfxml_bufferstack + AX_surfxml_host_coordinates)
+XBT_PUBLIC_DATA(short ) int surfxml_host_coordinates_isset;
 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(short ) int surfxml_trace_id_isset;
 XBT_PUBLIC_DATA(AT_surfxml_peer_power ) AX_surfxml_peer_power;
 #define A_surfxml_peer_power (surfxml_bufferstack + AX_surfxml_peer_power)
+XBT_PUBLIC_DATA(short ) int surfxml_peer_power_isset;
 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(short ) int surfxml_cluster_radical_isset;
 XBT_PUBLIC_DATA(AT_surfxml_config_id ) AX_surfxml_config_id;
 #define A_surfxml_config_id (surfxml_bufferstack + AX_surfxml_config_id)
+XBT_PUBLIC_DATA(short ) int surfxml_config_id_isset;
 XBT_PUBLIC_DATA(AT_surfxml_bypassRoute_gw_src ) AX_surfxml_bypassRoute_gw_src;
 #define A_surfxml_bypassRoute_gw_src (surfxml_bufferstack + AX_surfxml_bypassRoute_gw_src)
+XBT_PUBLIC_DATA(short ) int surfxml_bypassRoute_gw_src_isset;
 XBT_PUBLIC_DATA(AT_surfxml_cluster_core ) AX_surfxml_cluster_core;
 #define A_surfxml_cluster_core (surfxml_bufferstack + AX_surfxml_cluster_core)
+XBT_PUBLIC_DATA(short ) int surfxml_cluster_core_isset;
 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(short ) int surfxml_include_file_isset;
 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(short ) int surfxml_random_std_deviation_isset;
 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(short ) int surfxml_host_state_file_isset;
 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(short ) int surfxml_route_dst_isset;
 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(short ) int surfxml_cluster_bw_isset;
 XBT_PUBLIC_DATA(AT_surfxml_platform_version ) AX_surfxml_platform_version;
 #define A_surfxml_platform_version (surfxml_bufferstack + AX_surfxml_platform_version)
+XBT_PUBLIC_DATA(short ) int surfxml_platform_version_isset;
 
 /* XML application utilities. */
 XBT_PUBLIC(int ) surfxml_element_context(int);
index 2300786..9c5fdbf 100644 (file)
@@ -2,8 +2,8 @@
  *
  * 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.66 2011/10/30 21:03:48 mquinson Exp).
+ * FleXML is Copyright (C) 2003-2011 Martin Quinson.  All rights reserved.
+ * (Id: flexml.pl,v 1.67 2011/11/01 20:49:21 mquinson Exp).
  * 
  * There are two, intertwined parts to this program, part A and part B.
  *
@@ -12,7 +12,7 @@
  * 
  * Some parts, here collectively called "Part A", are found in the 
  * FleXML package.  They are Copyright (C) 1999-2005 Kristoffer Rose
- * and Copyright (C) 2003-2006 Martin Quinson. All rights reserved.
+ * and Copyright (C) 2003-2011 Martin Quinson. All rights reserved.
  *
  * You can redistribute, use, perform, display and/or modify "Part A"
  * provided the following two conditions hold:
@@ -56,39 +56,27 @@ XBT_PUBLIC(void ) STag_graphxml_edge(void);
 XBT_PUBLIC(void ) ETag_graphxml_edge(void);
 
 /* XML application data. */
-short int graphxml_node_name_isset;
 typedef int AT_graphxml_node_name;
 #define AU_graphxml_node_name NULL
-short int graphxml_edge_source_isset;
 typedef int AT_graphxml_edge_source;
 #define AU_graphxml_edge_source NULL
-short int graphxml_node_position_y_isset;
 typedef int AT_graphxml_node_position_y;
 #define AU_graphxml_node_position_y NULL
-short int graphxml_node_position_x_isset;
 typedef int AT_graphxml_node_position_x;
 #define AU_graphxml_node_position_x NULL
-short int graphxml_edge_data_isset;
 typedef int AT_graphxml_edge_data;
 #define AU_graphxml_edge_data NULL
-short int graphxml_edge_target_isset;
 typedef int AT_graphxml_edge_target;
 #define AU_graphxml_edge_target NULL
-short int graphxml_graph_isDirected_isset;
 typedef enum { AU_graphxml_graph_isDirected, A_graphxml_graph_isDirected_true,A_graphxml_graph_isDirected_false } AT_graphxml_graph_isDirected;
-short int graphxml_node_label_isset;
 typedef int AT_graphxml_node_label;
 #define AU_graphxml_node_label NULL
-short int graphxml_node_data_isset;
 typedef int AT_graphxml_node_data;
 #define AU_graphxml_node_data NULL
-short int graphxml_edge_label_isset;
 typedef int AT_graphxml_edge_label;
 #define AU_graphxml_edge_label NULL
-short int graphxml_edge_length_isset;
 typedef int AT_graphxml_edge_length;
 #define AU_graphxml_edge_length NULL
-short int graphxml_edge_name_isset;
 typedef int AT_graphxml_edge_name;
 #define AU_graphxml_edge_name NULL
 
@@ -98,28 +86,40 @@ XBT_PUBLIC_DATA(char *) graphxml_bufferstack;
 #define graphxml_pcdata (graphxml_bufferstack + graphxml_pcdata_ix)
 XBT_PUBLIC_DATA(AT_graphxml_node_name ) AX_graphxml_node_name;
 #define A_graphxml_node_name (graphxml_bufferstack + AX_graphxml_node_name)
+XBT_PUBLIC_DATA(short ) int graphxml_node_name_isset;
 XBT_PUBLIC_DATA(AT_graphxml_edge_source ) AX_graphxml_edge_source;
 #define A_graphxml_edge_source (graphxml_bufferstack + AX_graphxml_edge_source)
+XBT_PUBLIC_DATA(short ) int graphxml_edge_source_isset;
 XBT_PUBLIC_DATA(AT_graphxml_node_position_y ) AX_graphxml_node_position_y;
 #define A_graphxml_node_position_y (graphxml_bufferstack + AX_graphxml_node_position_y)
+XBT_PUBLIC_DATA(short ) int graphxml_node_position_y_isset;
 XBT_PUBLIC_DATA(AT_graphxml_node_position_x ) AX_graphxml_node_position_x;
 #define A_graphxml_node_position_x (graphxml_bufferstack + AX_graphxml_node_position_x)
+XBT_PUBLIC_DATA(short ) int graphxml_node_position_x_isset;
 XBT_PUBLIC_DATA(AT_graphxml_edge_data ) AX_graphxml_edge_data;
 #define A_graphxml_edge_data (graphxml_bufferstack + AX_graphxml_edge_data)
+XBT_PUBLIC_DATA(short ) int graphxml_edge_data_isset;
 XBT_PUBLIC_DATA(AT_graphxml_edge_target ) AX_graphxml_edge_target;
 #define A_graphxml_edge_target (graphxml_bufferstack + AX_graphxml_edge_target)
+XBT_PUBLIC_DATA(short ) int graphxml_edge_target_isset;
 XBT_PUBLIC_DATA(AT_graphxml_graph_isDirected ) AX_graphxml_graph_isDirected;
 #define A_graphxml_graph_isDirected AX_graphxml_graph_isDirected
+XBT_PUBLIC_DATA(short ) int graphxml_graph_isDirected_isset;
 XBT_PUBLIC_DATA(AT_graphxml_node_label ) AX_graphxml_node_label;
 #define A_graphxml_node_label (graphxml_bufferstack + AX_graphxml_node_label)
+XBT_PUBLIC_DATA(short ) int graphxml_node_label_isset;
 XBT_PUBLIC_DATA(AT_graphxml_node_data ) AX_graphxml_node_data;
 #define A_graphxml_node_data (graphxml_bufferstack + AX_graphxml_node_data)
+XBT_PUBLIC_DATA(short ) int graphxml_node_data_isset;
 XBT_PUBLIC_DATA(AT_graphxml_edge_label ) AX_graphxml_edge_label;
 #define A_graphxml_edge_label (graphxml_bufferstack + AX_graphxml_edge_label)
+XBT_PUBLIC_DATA(short ) int graphxml_edge_label_isset;
 XBT_PUBLIC_DATA(AT_graphxml_edge_length ) AX_graphxml_edge_length;
 #define A_graphxml_edge_length (graphxml_bufferstack + AX_graphxml_edge_length)
+XBT_PUBLIC_DATA(short ) int graphxml_edge_length_isset;
 XBT_PUBLIC_DATA(AT_graphxml_edge_name ) AX_graphxml_edge_name;
 #define A_graphxml_edge_name (graphxml_bufferstack + AX_graphxml_edge_name)
+XBT_PUBLIC_DATA(short ) int graphxml_edge_name_isset;
 
 /* XML application utilities. */
 XBT_PUBLIC(int ) graphxml_element_context(int);
index ee41fff..8a25ca1 100644 (file)
@@ -81,7 +81,7 @@ typedef struct s_surf_parsing_link_up_down {
        void* link_down;
 } s_surf_parsing_link_up_down_t;
 
-void STag_surfxml_host_cluster(void);
-void STag_surfxml_link_cluster(void);
+void surf_parse_host(void);
+void surf_parse_link(void);
 
 #endif /* SURFXML_PARSE_VALUES_H_ */
index 917a527..f0eae81 100644 (file)
@@ -1259,8 +1259,8 @@ char *dax_text;
  *
  * 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.66 2011/10/30 21:03:48 mquinson Exp).
+ * FleXML is Copyright (C) 2003-2011 Martin Quinson.  All rights reserved.
+ * (Id: flexml.pl,v 1.67 2011/11/01 20:49:21 mquinson Exp).
  * 
  * There are two, intertwined parts to this program, part A and part B.
  *
@@ -1269,7 +1269,7 @@ char *dax_text;
  * 
  * Some parts, here collectively called "Part A", are found in the 
  * FleXML package.  They are Copyright (C) 1999-2005 Kristoffer Rose
- * and Copyright (C) 2003-2006 Martin Quinson. All rights reserved.
+ * and Copyright (C) 2003-2011 Martin Quinson. All rights reserved.
  *
  * You can redistribute, use, perform, display and/or modify "Part A"
  * provided the following two conditions hold:
@@ -1305,7 +1305,7 @@ char *dax_text;
 const char rcs_dax__flexml_skeleton[] =
  "$" "Id: skel,v 1.40 2007/10/11 09:57:24 mquinson Exp $";
 const char rcs_dax__flexml[] =
- "$" "Id: flexml.pl,v 1.66 2011/10/30 21:03:48 mquinson Exp $";
+ "$" "Id: flexml.pl,v 1.67 2011/11/01 20:49:21 mquinson Exp $";
 
 /* ANSI headers. */
 #include <stdlib.h> /* for realloc() -- needed here when using flex 2.5.4 */
@@ -1342,54 +1342,79 @@ extern char *dax__bufferstack;
 #define dax__pcdata (dax__bufferstack + dax__pcdata_ix)
 AT_dax__adag_version AX_dax__adag_version;
 #define A_dax__adag_version (dax__bufferstack + AX_dax__adag_version)
+short int dax__adag_version_isset;
 AT_dax__uses_type AX_dax__uses_type;
 #define A_dax__uses_type (dax__bufferstack + AX_dax__uses_type)
+short int dax__uses_type_isset;
 AT_dax__uses_optional AX_dax__uses_optional;
 #define A_dax__uses_optional AX_dax__uses_optional
+short int dax__uses_optional_isset;
 AT_dax__adag_name AX_dax__adag_name;
 #define A_dax__adag_name (dax__bufferstack + AX_dax__adag_name)
+short int dax__adag_name_isset;
 AT_dax__child_ref AX_dax__child_ref;
 #define A_dax__child_ref (dax__bufferstack + AX_dax__child_ref)
+short int dax__child_ref_isset;
 AT_dax__adag_xmlns AX_dax__adag_xmlns;
 #define A_dax__adag_xmlns (dax__bufferstack + AX_dax__adag_xmlns)
+short int dax__adag_xmlns_isset;
 AT_dax__uses_transfer AX_dax__uses_transfer;
 #define A_dax__uses_transfer AX_dax__uses_transfer
+short int dax__uses_transfer_isset;
 AT_dax__job_id AX_dax__job_id;
 #define A_dax__job_id (dax__bufferstack + AX_dax__job_id)
+short int dax__job_id_isset;
 AT_dax__uses_file AX_dax__uses_file;
 #define A_dax__uses_file (dax__bufferstack + AX_dax__uses_file)
+short int dax__uses_file_isset;
 AT_dax__parent_ref AX_dax__parent_ref;
 #define A_dax__parent_ref (dax__bufferstack + AX_dax__parent_ref)
+short int dax__parent_ref_isset;
 AT_dax__adag_count AX_dax__adag_count;
 #define A_dax__adag_count (dax__bufferstack + AX_dax__adag_count)
+short int dax__adag_count_isset;
 AT_dax__adag_xmlns_c_xsi AX_dax__adag_xmlns_c_xsi;
 #define A_dax__adag_xmlns_c_xsi (dax__bufferstack + AX_dax__adag_xmlns_c_xsi)
+short int dax__adag_xmlns_c_xsi_isset;
 AT_dax__adag_index AX_dax__adag_index;
 #define A_dax__adag_index (dax__bufferstack + AX_dax__adag_index)
+short int dax__adag_index_isset;
 AT_dax__uses_size AX_dax__uses_size;
 #define A_dax__uses_size (dax__bufferstack + AX_dax__uses_size)
+short int dax__uses_size_isset;
 AT_dax__adag_childCount AX_dax__adag_childCount;
 #define A_dax__adag_childCount (dax__bufferstack + AX_dax__adag_childCount)
+short int dax__adag_childCount_isset;
 AT_dax__uses_link AX_dax__uses_link;
 #define A_dax__uses_link AX_dax__uses_link
+short int dax__uses_link_isset;
 AT_dax__job_runtime AX_dax__job_runtime;
 #define A_dax__job_runtime (dax__bufferstack + AX_dax__job_runtime)
+short int dax__job_runtime_isset;
 AT_dax__job_level AX_dax__job_level;
 #define A_dax__job_level (dax__bufferstack + AX_dax__job_level)
+short int dax__job_level_isset;
 AT_dax__job_namespace AX_dax__job_namespace;
 #define A_dax__job_namespace (dax__bufferstack + AX_dax__job_namespace)
+short int dax__job_namespace_isset;
 AT_dax__job_name AX_dax__job_name;
 #define A_dax__job_name (dax__bufferstack + AX_dax__job_name)
+short int dax__job_name_isset;
 AT_dax__adag_jobCount AX_dax__adag_jobCount;
 #define A_dax__adag_jobCount (dax__bufferstack + AX_dax__adag_jobCount)
+short int dax__adag_jobCount_isset;
 AT_dax__job_version AX_dax__job_version;
 #define A_dax__job_version (dax__bufferstack + AX_dax__job_version)
+short int dax__job_version_isset;
 AT_dax__adag_xsi_c_schemaLocation AX_dax__adag_xsi_c_schemaLocation;
 #define A_dax__adag_xsi_c_schemaLocation (dax__bufferstack + AX_dax__adag_xsi_c_schemaLocation)
+short int dax__adag_xsi_c_schemaLocation_isset;
 AT_dax__uses_register AX_dax__uses_register;
 #define A_dax__uses_register AX_dax__uses_register
+short int dax__uses_register_isset;
 AT_dax__adag_fileCount AX_dax__adag_fileCount;
 #define A_dax__adag_fileCount (dax__bufferstack + AX_dax__adag_fileCount)
+short int dax__adag_fileCount_isset;
 
 /* XML state. */
 #ifdef FLEX_DEBUG
index 3c8c4d5..65c2032 100644 (file)
@@ -2,8 +2,8 @@
  *
  * 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.66 2011/10/30 21:03:48 mquinson Exp).
+ * FleXML is Copyright (C) 2003-2011 Martin Quinson.  All rights reserved.
+ * (Id: flexml.pl,v 1.67 2011/11/01 20:49:21 mquinson Exp).
  * 
  * There are two, intertwined parts to this program, part A and part B.
  *
@@ -12,7 +12,7 @@
  * 
  * Some parts, here collectively called "Part A", are found in the 
  * FleXML package.  They are Copyright (C) 1999-2005 Kristoffer Rose
- * and Copyright (C) 2003-2006 Martin Quinson. All rights reserved.
+ * and Copyright (C) 2003-2011 Martin Quinson. All rights reserved.
  *
  * You can redistribute, use, perform, display and/or modify "Part A"
  * provided the following two conditions hold:
@@ -60,75 +60,50 @@ XBT_PUBLIC(void ) STag_dax__parent(void);
 XBT_PUBLIC(void ) ETag_dax__parent(void);
 
 /* XML application data. */
-short int dax__adag_version_isset;
 typedef int AT_dax__adag_version;
 #define AU_dax__adag_version NULL
-short int dax__uses_type_isset;
 typedef int AT_dax__uses_type;
 #define AU_dax__uses_type NULL
-short int dax__uses_optional_isset;
 typedef enum { AU_dax__uses_optional, A_dax__uses_optional_false,A_dax__uses_optional_true } AT_dax__uses_optional;
-short int dax__adag_name_isset;
 typedef int AT_dax__adag_name;
 #define AU_dax__adag_name NULL
-short int dax__child_ref_isset;
 typedef int AT_dax__child_ref;
 #define AU_dax__child_ref NULL
-short int dax__adag_xmlns_isset;
 typedef int AT_dax__adag_xmlns;
 #define AU_dax__adag_xmlns NULL
-short int dax__uses_transfer_isset;
 typedef enum { AU_dax__uses_transfer, A_dax__uses_transfer_false,A_dax__uses_transfer_true } AT_dax__uses_transfer;
-short int dax__job_id_isset;
 typedef int AT_dax__job_id;
 #define AU_dax__job_id NULL
-short int dax__uses_file_isset;
 typedef int AT_dax__uses_file;
 #define AU_dax__uses_file NULL
-short int dax__parent_ref_isset;
 typedef int AT_dax__parent_ref;
 #define AU_dax__parent_ref NULL
-short int dax__adag_count_isset;
 typedef int AT_dax__adag_count;
 #define AU_dax__adag_count NULL
-short int dax__adag_xmlns_c_xsi_isset;
 typedef int AT_dax__adag_xmlns_c_xsi;
 #define AU_dax__adag_xmlns_c_xsi NULL
-short int dax__adag_index_isset;
 typedef int AT_dax__adag_index;
 #define AU_dax__adag_index NULL
-short int dax__uses_size_isset;
 typedef int AT_dax__uses_size;
 #define AU_dax__uses_size NULL
-short int dax__adag_childCount_isset;
 typedef int AT_dax__adag_childCount;
 #define AU_dax__adag_childCount NULL
-short int dax__uses_link_isset;
 typedef enum { AU_dax__uses_link, A_dax__uses_link_input,A_dax__uses_link_output } AT_dax__uses_link;
-short int dax__job_runtime_isset;
 typedef int AT_dax__job_runtime;
 #define AU_dax__job_runtime NULL
-short int dax__job_level_isset;
 typedef int AT_dax__job_level;
 #define AU_dax__job_level NULL
-short int dax__job_namespace_isset;
 typedef int AT_dax__job_namespace;
 #define AU_dax__job_namespace NULL
-short int dax__job_name_isset;
 typedef int AT_dax__job_name;
 #define AU_dax__job_name NULL
-short int dax__adag_jobCount_isset;
 typedef int AT_dax__adag_jobCount;
 #define AU_dax__adag_jobCount NULL
-short int dax__job_version_isset;
 typedef int AT_dax__job_version;
 #define AU_dax__job_version NULL
-short int dax__adag_xsi_c_schemaLocation_isset;
 typedef int AT_dax__adag_xsi_c_schemaLocation;
 #define AU_dax__adag_xsi_c_schemaLocation NULL
-short int dax__uses_register_isset;
 typedef enum { AU_dax__uses_register, A_dax__uses_register_false,A_dax__uses_register_true } AT_dax__uses_register;
-short int dax__adag_fileCount_isset;
 typedef int AT_dax__adag_fileCount;
 #define AU_dax__adag_fileCount NULL
 
@@ -138,54 +113,79 @@ XBT_PUBLIC_DATA(char *) dax__bufferstack;
 #define dax__pcdata (dax__bufferstack + dax__pcdata_ix)
 XBT_PUBLIC_DATA(AT_dax__adag_version ) AX_dax__adag_version;
 #define A_dax__adag_version (dax__bufferstack + AX_dax__adag_version)
+XBT_PUBLIC_DATA(short ) int dax__adag_version_isset;
 XBT_PUBLIC_DATA(AT_dax__uses_type ) AX_dax__uses_type;
 #define A_dax__uses_type (dax__bufferstack + AX_dax__uses_type)
+XBT_PUBLIC_DATA(short ) int dax__uses_type_isset;
 XBT_PUBLIC_DATA(AT_dax__uses_optional ) AX_dax__uses_optional;
 #define A_dax__uses_optional AX_dax__uses_optional
+XBT_PUBLIC_DATA(short ) int dax__uses_optional_isset;
 XBT_PUBLIC_DATA(AT_dax__adag_name ) AX_dax__adag_name;
 #define A_dax__adag_name (dax__bufferstack + AX_dax__adag_name)
+XBT_PUBLIC_DATA(short ) int dax__adag_name_isset;
 XBT_PUBLIC_DATA(AT_dax__child_ref ) AX_dax__child_ref;
 #define A_dax__child_ref (dax__bufferstack + AX_dax__child_ref)
+XBT_PUBLIC_DATA(short ) int dax__child_ref_isset;
 XBT_PUBLIC_DATA(AT_dax__adag_xmlns ) AX_dax__adag_xmlns;
 #define A_dax__adag_xmlns (dax__bufferstack + AX_dax__adag_xmlns)
+XBT_PUBLIC_DATA(short ) int dax__adag_xmlns_isset;
 XBT_PUBLIC_DATA(AT_dax__uses_transfer ) AX_dax__uses_transfer;
 #define A_dax__uses_transfer AX_dax__uses_transfer
+XBT_PUBLIC_DATA(short ) int dax__uses_transfer_isset;
 XBT_PUBLIC_DATA(AT_dax__job_id ) AX_dax__job_id;
 #define A_dax__job_id (dax__bufferstack + AX_dax__job_id)
+XBT_PUBLIC_DATA(short ) int dax__job_id_isset;
 XBT_PUBLIC_DATA(AT_dax__uses_file ) AX_dax__uses_file;
 #define A_dax__uses_file (dax__bufferstack + AX_dax__uses_file)
+XBT_PUBLIC_DATA(short ) int dax__uses_file_isset;
 XBT_PUBLIC_DATA(AT_dax__parent_ref ) AX_dax__parent_ref;
 #define A_dax__parent_ref (dax__bufferstack + AX_dax__parent_ref)
+XBT_PUBLIC_DATA(short ) int dax__parent_ref_isset;
 XBT_PUBLIC_DATA(AT_dax__adag_count ) AX_dax__adag_count;
 #define A_dax__adag_count (dax__bufferstack + AX_dax__adag_count)
+XBT_PUBLIC_DATA(short ) int dax__adag_count_isset;
 XBT_PUBLIC_DATA(AT_dax__adag_xmlns_c_xsi ) AX_dax__adag_xmlns_c_xsi;
 #define A_dax__adag_xmlns_c_xsi (dax__bufferstack + AX_dax__adag_xmlns_c_xsi)
+XBT_PUBLIC_DATA(short ) int dax__adag_xmlns_c_xsi_isset;
 XBT_PUBLIC_DATA(AT_dax__adag_index ) AX_dax__adag_index;
 #define A_dax__adag_index (dax__bufferstack + AX_dax__adag_index)
+XBT_PUBLIC_DATA(short ) int dax__adag_index_isset;
 XBT_PUBLIC_DATA(AT_dax__uses_size ) AX_dax__uses_size;
 #define A_dax__uses_size (dax__bufferstack + AX_dax__uses_size)
+XBT_PUBLIC_DATA(short ) int dax__uses_size_isset;
 XBT_PUBLIC_DATA(AT_dax__adag_childCount ) AX_dax__adag_childCount;
 #define A_dax__adag_childCount (dax__bufferstack + AX_dax__adag_childCount)
+XBT_PUBLIC_DATA(short ) int dax__adag_childCount_isset;
 XBT_PUBLIC_DATA(AT_dax__uses_link ) AX_dax__uses_link;
 #define A_dax__uses_link AX_dax__uses_link
+XBT_PUBLIC_DATA(short ) int dax__uses_link_isset;
 XBT_PUBLIC_DATA(AT_dax__job_runtime ) AX_dax__job_runtime;
 #define A_dax__job_runtime (dax__bufferstack + AX_dax__job_runtime)
+XBT_PUBLIC_DATA(short ) int dax__job_runtime_isset;
 XBT_PUBLIC_DATA(AT_dax__job_level ) AX_dax__job_level;
 #define A_dax__job_level (dax__bufferstack + AX_dax__job_level)
+XBT_PUBLIC_DATA(short ) int dax__job_level_isset;
 XBT_PUBLIC_DATA(AT_dax__job_namespace ) AX_dax__job_namespace;
 #define A_dax__job_namespace (dax__bufferstack + AX_dax__job_namespace)
+XBT_PUBLIC_DATA(short ) int dax__job_namespace_isset;
 XBT_PUBLIC_DATA(AT_dax__job_name ) AX_dax__job_name;
 #define A_dax__job_name (dax__bufferstack + AX_dax__job_name)
+XBT_PUBLIC_DATA(short ) int dax__job_name_isset;
 XBT_PUBLIC_DATA(AT_dax__adag_jobCount ) AX_dax__adag_jobCount;
 #define A_dax__adag_jobCount (dax__bufferstack + AX_dax__adag_jobCount)
+XBT_PUBLIC_DATA(short ) int dax__adag_jobCount_isset;
 XBT_PUBLIC_DATA(AT_dax__job_version ) AX_dax__job_version;
 #define A_dax__job_version (dax__bufferstack + AX_dax__job_version)
+XBT_PUBLIC_DATA(short ) int dax__job_version_isset;
 XBT_PUBLIC_DATA(AT_dax__adag_xsi_c_schemaLocation ) AX_dax__adag_xsi_c_schemaLocation;
 #define A_dax__adag_xsi_c_schemaLocation (dax__bufferstack + AX_dax__adag_xsi_c_schemaLocation)
+XBT_PUBLIC_DATA(short ) int dax__adag_xsi_c_schemaLocation_isset;
 XBT_PUBLIC_DATA(AT_dax__uses_register ) AX_dax__uses_register;
 #define A_dax__uses_register AX_dax__uses_register
+XBT_PUBLIC_DATA(short ) int dax__uses_register_isset;
 XBT_PUBLIC_DATA(AT_dax__adag_fileCount ) AX_dax__adag_fileCount;
 #define A_dax__adag_fileCount (dax__bufferstack + AX_dax__adag_fileCount)
+XBT_PUBLIC_DATA(short ) int dax__adag_fileCount_isset;
 
 /* XML application utilities. */
 XBT_PUBLIC(int ) dax__element_context(int);
index d2a8194..982ec57 100644 (file)
@@ -3173,8 +3173,8 @@ char *surf_parse_text;
  *
  * 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.66 2011/10/30 21:03:48 mquinson Exp).
+ * FleXML is Copyright (C) 2003-2011 Martin Quinson.  All rights reserved.
+ * (Id: flexml.pl,v 1.67 2011/11/01 20:49:21 mquinson Exp).
  * 
  * There are two, intertwined parts to this program, part A and part B.
  *
@@ -3183,7 +3183,7 @@ char *surf_parse_text;
  * 
  * Some parts, here collectively called "Part A", are found in the 
  * FleXML package.  They are Copyright (C) 1999-2005 Kristoffer Rose
- * and Copyright (C) 2003-2006 Martin Quinson. All rights reserved.
+ * and Copyright (C) 2003-2011 Martin Quinson. All rights reserved.
  *
  * You can redistribute, use, perform, display and/or modify "Part A"
  * provided the following two conditions hold:
@@ -3219,7 +3219,7 @@ char *surf_parse_text;
 const char rcs_surfxml_flexml_skeleton[] =
  "$" "Id: skel,v 1.40 2007/10/11 09:57:24 mquinson Exp $";
 const char rcs_surfxml_flexml[] =
- "$" "Id: flexml.pl,v 1.66 2011/10/30 21:03:48 mquinson Exp $";
+ "$" "Id: flexml.pl,v 1.67 2011/11/01 20:49:21 mquinson Exp $";
 
 /* ANSI headers. */
 #include <stdlib.h> /* for realloc() -- needed here when using flex 2.5.4 */
@@ -3256,166 +3256,247 @@ extern char *surfxml_bufferstack;
 #define surfxml_pcdata (surfxml_bufferstack + surfxml_pcdata_ix)
 AT_surfxml_random_generator AX_surfxml_random_generator;
 #define A_surfxml_random_generator AX_surfxml_random_generator
+short int surfxml_random_generator_isset;
 AT_surfxml_ASroute_gw_dst AX_surfxml_ASroute_gw_dst;
 #define A_surfxml_ASroute_gw_dst (surfxml_bufferstack + AX_surfxml_ASroute_gw_dst)
+short int surfxml_ASroute_gw_dst_isset;
 AT_surfxml_trace_connect_element AX_surfxml_trace_connect_element;
 #define A_surfxml_trace_connect_element (surfxml_bufferstack + AX_surfxml_trace_connect_element)
+short int surfxml_trace_connect_element_isset;
 AT_surfxml_prop_id AX_surfxml_prop_id;
 #define A_surfxml_prop_id (surfxml_bufferstack + AX_surfxml_prop_id)
+short int surfxml_prop_id_isset;
 AT_surfxml_host_id AX_surfxml_host_id;
 #define A_surfxml_host_id (surfxml_bufferstack + AX_surfxml_host_id)
+short int surfxml_host_id_isset;
 AT_surfxml_ASroute_symmetrical AX_surfxml_ASroute_symmetrical;
 #define A_surfxml_ASroute_symmetrical AX_surfxml_ASroute_symmetrical
+short int surfxml_ASroute_symmetrical_isset;
 AT_surfxml_peer_lat AX_surfxml_peer_lat;
 #define A_surfxml_peer_lat (surfxml_bufferstack + AX_surfxml_peer_lat)
+short int surfxml_peer_lat_isset;
 AT_surfxml_link_latency_file AX_surfxml_link_latency_file;
 #define A_surfxml_link_latency_file (surfxml_bufferstack + AX_surfxml_link_latency_file)
+short int surfxml_link_latency_file_isset;
 AT_surfxml_peer_availability_file AX_surfxml_peer_availability_file;
 #define A_surfxml_peer_availability_file (surfxml_bufferstack + AX_surfxml_peer_availability_file)
+short int surfxml_peer_availability_file_isset;
 AT_surfxml_link_ctn_direction AX_surfxml_link_ctn_direction;
 #define A_surfxml_link_ctn_direction AX_surfxml_link_ctn_direction
+short int surfxml_link_ctn_direction_isset;
 AT_surfxml_host_state AX_surfxml_host_state;
 #define A_surfxml_host_state AX_surfxml_host_state
+short int surfxml_host_state_isset;
 AT_surfxml_AS_id AX_surfxml_AS_id;
 #define A_surfxml_AS_id (surfxml_bufferstack + AX_surfxml_AS_id)
+short int surfxml_AS_id_isset;
 AT_surfxml_host_power AX_surfxml_host_power;
 #define A_surfxml_host_power (surfxml_bufferstack + AX_surfxml_host_power)
+short int surfxml_host_power_isset;
 AT_surfxml_router_id AX_surfxml_router_id;
 #define A_surfxml_router_id (surfxml_bufferstack + AX_surfxml_router_id)
+short int surfxml_router_id_isset;
 AT_surfxml_process_start_time AX_surfxml_process_start_time;
 #define A_surfxml_process_start_time (surfxml_bufferstack + AX_surfxml_process_start_time)
+short int surfxml_process_start_time_isset;
 AT_surfxml_cluster_suffix AX_surfxml_cluster_suffix;
 #define A_surfxml_cluster_suffix (surfxml_bufferstack + AX_surfxml_cluster_suffix)
+short int surfxml_cluster_suffix_isset;
 AT_surfxml_ASroute_src AX_surfxml_ASroute_src;
 #define A_surfxml_ASroute_src (surfxml_bufferstack + AX_surfxml_ASroute_src)
+short int surfxml_ASroute_src_isset;
 AT_surfxml_cluster_prefix AX_surfxml_cluster_prefix;
 #define A_surfxml_cluster_prefix (surfxml_bufferstack + AX_surfxml_cluster_prefix)
+short int surfxml_cluster_prefix_isset;
 AT_surfxml_trace_file AX_surfxml_trace_file;
 #define A_surfxml_trace_file (surfxml_bufferstack + AX_surfxml_trace_file)
+short int surfxml_trace_file_isset;
 AT_surfxml_link_sharing_policy AX_surfxml_link_sharing_policy;
 #define A_surfxml_link_sharing_policy AX_surfxml_link_sharing_policy
+short int surfxml_link_sharing_policy_isset;
 AT_surfxml_random_min AX_surfxml_random_min;
 #define A_surfxml_random_min (surfxml_bufferstack + AX_surfxml_random_min)
+short int surfxml_random_min_isset;
 AT_surfxml_link_ctn_id AX_surfxml_link_ctn_id;
 #define A_surfxml_link_ctn_id (surfxml_bufferstack + AX_surfxml_link_ctn_id)
+short int surfxml_link_ctn_id_isset;
 AT_surfxml_peer_bw_out AX_surfxml_peer_bw_out;
 #define A_surfxml_peer_bw_out (surfxml_bufferstack + AX_surfxml_peer_bw_out)
+short int surfxml_peer_bw_out_isset;
 AT_surfxml_cluster_availability_file AX_surfxml_cluster_availability_file;
 #define A_surfxml_cluster_availability_file (surfxml_bufferstack + AX_surfxml_cluster_availability_file)
+short int surfxml_cluster_availability_file_isset;
 AT_surfxml_process_kill_time AX_surfxml_process_kill_time;
 #define A_surfxml_process_kill_time (surfxml_bufferstack + AX_surfxml_process_kill_time)
+short int surfxml_process_kill_time_isset;
 AT_surfxml_cluster_bb_bw AX_surfxml_cluster_bb_bw;
 #define A_surfxml_cluster_bb_bw (surfxml_bufferstack + AX_surfxml_cluster_bb_bw)
+short int surfxml_cluster_bb_bw_isset;
 AT_surfxml_argument_value AX_surfxml_argument_value;
 #define A_surfxml_argument_value (surfxml_bufferstack + AX_surfxml_argument_value)
+short int surfxml_argument_value_isset;
 AT_surfxml_link_state AX_surfxml_link_state;
 #define A_surfxml_link_state AX_surfxml_link_state
+short int surfxml_link_state_isset;
 AT_surfxml_ASroute_gw_src AX_surfxml_ASroute_gw_src;
 #define A_surfxml_ASroute_gw_src (surfxml_bufferstack + AX_surfxml_ASroute_gw_src)
+short int surfxml_ASroute_gw_src_isset;
 AT_surfxml_AS_routing AX_surfxml_AS_routing;
 #define A_surfxml_AS_routing (surfxml_bufferstack + AX_surfxml_AS_routing)
+short int surfxml_AS_routing_isset;
 AT_surfxml_link_bandwidth AX_surfxml_link_bandwidth;
 #define A_surfxml_link_bandwidth (surfxml_bufferstack + AX_surfxml_link_bandwidth)
+short int surfxml_link_bandwidth_isset;
 AT_surfxml_cluster_id AX_surfxml_cluster_id;
 #define A_surfxml_cluster_id (surfxml_bufferstack + AX_surfxml_cluster_id)
+short int surfxml_cluster_id_isset;
 AT_surfxml_peer_bw_in AX_surfxml_peer_bw_in;
 #define A_surfxml_peer_bw_in (surfxml_bufferstack + AX_surfxml_peer_bw_in)
+short int surfxml_peer_bw_in_isset;
 AT_surfxml_random_mean AX_surfxml_random_mean;
 #define A_surfxml_random_mean (surfxml_bufferstack + AX_surfxml_random_mean)
+short int surfxml_random_mean_isset;
 AT_surfxml_cluster_bb_lat AX_surfxml_cluster_bb_lat;
 #define A_surfxml_cluster_bb_lat (surfxml_bufferstack + AX_surfxml_cluster_bb_lat)
+short int surfxml_cluster_bb_lat_isset;
 AT_surfxml_link_latency AX_surfxml_link_latency;
 #define A_surfxml_link_latency (surfxml_bufferstack + AX_surfxml_link_latency)
+short int surfxml_link_latency_isset;
 AT_surfxml_trace_connect_kind AX_surfxml_trace_connect_kind;
 #define A_surfxml_trace_connect_kind AX_surfxml_trace_connect_kind
+short int surfxml_trace_connect_kind_isset;
 AT_surfxml_random_seed AX_surfxml_random_seed;
 #define A_surfxml_random_seed (surfxml_bufferstack + AX_surfxml_random_seed)
+short int surfxml_random_seed_isset;
 AT_surfxml_cluster_state_file AX_surfxml_cluster_state_file;
 #define A_surfxml_cluster_state_file (surfxml_bufferstack + AX_surfxml_cluster_state_file)
+short int surfxml_cluster_state_file_isset;
 AT_surfxml_link_bandwidth_file AX_surfxml_link_bandwidth_file;
 #define A_surfxml_link_bandwidth_file (surfxml_bufferstack + AX_surfxml_link_bandwidth_file)
+short int surfxml_link_bandwidth_file_isset;
 AT_surfxml_route_symmetrical AX_surfxml_route_symmetrical;
 #define A_surfxml_route_symmetrical AX_surfxml_route_symmetrical
+short int surfxml_route_symmetrical_isset;
 AT_surfxml_random_id AX_surfxml_random_id;
 #define A_surfxml_random_id (surfxml_bufferstack + AX_surfxml_random_id)
+short int surfxml_random_id_isset;
 AT_surfxml_random_max AX_surfxml_random_max;
 #define A_surfxml_random_max (surfxml_bufferstack + AX_surfxml_random_max)
+short int surfxml_random_max_isset;
 AT_surfxml_link_id AX_surfxml_link_id;
 #define A_surfxml_link_id (surfxml_bufferstack + AX_surfxml_link_id)
+short int surfxml_link_id_isset;
 AT_surfxml_process_host AX_surfxml_process_host;
 #define A_surfxml_process_host (surfxml_bufferstack + AX_surfxml_process_host)
+short int surfxml_process_host_isset;
 AT_surfxml_host_availability_file AX_surfxml_host_availability_file;
 #define A_surfxml_host_availability_file (surfxml_bufferstack + AX_surfxml_host_availability_file)
+short int surfxml_host_availability_file_isset;
 AT_surfxml_cluster_lat AX_surfxml_cluster_lat;
 #define A_surfxml_cluster_lat (surfxml_bufferstack + AX_surfxml_cluster_lat)
+short int surfxml_cluster_lat_isset;
 AT_surfxml_trace_periodicity AX_surfxml_trace_periodicity;
 #define A_surfxml_trace_periodicity (surfxml_bufferstack + AX_surfxml_trace_periodicity)
+short int surfxml_trace_periodicity_isset;
 AT_surfxml_cluster_bb_sharing_policy AX_surfxml_cluster_bb_sharing_policy;
 #define A_surfxml_cluster_bb_sharing_policy AX_surfxml_cluster_bb_sharing_policy
+short int surfxml_cluster_bb_sharing_policy_isset;
 AT_surfxml_router_coordinates AX_surfxml_router_coordinates;
 #define A_surfxml_router_coordinates (surfxml_bufferstack + AX_surfxml_router_coordinates)
+short int surfxml_router_coordinates_isset;
 AT_surfxml_peer_coordinates AX_surfxml_peer_coordinates;
 #define A_surfxml_peer_coordinates (surfxml_bufferstack + AX_surfxml_peer_coordinates)
+short int surfxml_peer_coordinates_isset;
 AT_surfxml_peer_state_file AX_surfxml_peer_state_file;
 #define A_surfxml_peer_state_file (surfxml_bufferstack + AX_surfxml_peer_state_file)
+short int surfxml_peer_state_file_isset;
 AT_surfxml_prop_value AX_surfxml_prop_value;
 #define A_surfxml_prop_value (surfxml_bufferstack + AX_surfxml_prop_value)
+short int surfxml_prop_value_isset;
 AT_surfxml_ASroute_dst AX_surfxml_ASroute_dst;
 #define A_surfxml_ASroute_dst (surfxml_bufferstack + AX_surfxml_ASroute_dst)
+short int surfxml_ASroute_dst_isset;
 AT_surfxml_random_radical AX_surfxml_random_radical;
 #define A_surfxml_random_radical (surfxml_bufferstack + AX_surfxml_random_radical)
+short int surfxml_random_radical_isset;
 AT_surfxml_link_state_file AX_surfxml_link_state_file;
 #define A_surfxml_link_state_file (surfxml_bufferstack + AX_surfxml_link_state_file)
+short int surfxml_link_state_file_isset;
 AT_surfxml_trace_connect_trace AX_surfxml_trace_connect_trace;
 #define A_surfxml_trace_connect_trace (surfxml_bufferstack + AX_surfxml_trace_connect_trace)
+short int surfxml_trace_connect_trace_isset;
 AT_surfxml_cluster_power AX_surfxml_cluster_power;
 #define A_surfxml_cluster_power (surfxml_bufferstack + AX_surfxml_cluster_power)
+short int surfxml_cluster_power_isset;
 AT_surfxml_process_function AX_surfxml_process_function;
 #define A_surfxml_process_function (surfxml_bufferstack + AX_surfxml_process_function)
+short int surfxml_process_function_isset;
 AT_surfxml_peer_id AX_surfxml_peer_id;
 #define A_surfxml_peer_id (surfxml_bufferstack + AX_surfxml_peer_id)
+short int surfxml_peer_id_isset;
 AT_surfxml_cluster_router_id AX_surfxml_cluster_router_id;
 #define A_surfxml_cluster_router_id (surfxml_bufferstack + AX_surfxml_cluster_router_id)
+short int surfxml_cluster_router_id_isset;
 AT_surfxml_cluster_sharing_policy AX_surfxml_cluster_sharing_policy;
 #define A_surfxml_cluster_sharing_policy AX_surfxml_cluster_sharing_policy
+short int surfxml_cluster_sharing_policy_isset;
 AT_surfxml_bypassRoute_dst AX_surfxml_bypassRoute_dst;
 #define A_surfxml_bypassRoute_dst (surfxml_bufferstack + AX_surfxml_bypassRoute_dst)
+short int surfxml_bypassRoute_dst_isset;
 AT_surfxml_host_core AX_surfxml_host_core;
 #define A_surfxml_host_core (surfxml_bufferstack + AX_surfxml_host_core)
+short int surfxml_host_core_isset;
 AT_surfxml_host_availability AX_surfxml_host_availability;
 #define A_surfxml_host_availability (surfxml_bufferstack + AX_surfxml_host_availability)
+short int surfxml_host_availability_isset;
 AT_surfxml_bypassRoute_src AX_surfxml_bypassRoute_src;
 #define A_surfxml_bypassRoute_src (surfxml_bufferstack + AX_surfxml_bypassRoute_src)
+short int surfxml_bypassRoute_src_isset;
 AT_surfxml_route_src AX_surfxml_route_src;
 #define A_surfxml_route_src (surfxml_bufferstack + AX_surfxml_route_src)
+short int surfxml_route_src_isset;
 AT_surfxml_bypassRoute_gw_dst AX_surfxml_bypassRoute_gw_dst;
 #define A_surfxml_bypassRoute_gw_dst (surfxml_bufferstack + AX_surfxml_bypassRoute_gw_dst)
+short int surfxml_bypassRoute_gw_dst_isset;
 AT_surfxml_host_coordinates AX_surfxml_host_coordinates;
 #define A_surfxml_host_coordinates (surfxml_bufferstack + AX_surfxml_host_coordinates)
+short int surfxml_host_coordinates_isset;
 AT_surfxml_trace_id AX_surfxml_trace_id;
 #define A_surfxml_trace_id (surfxml_bufferstack + AX_surfxml_trace_id)
+short int surfxml_trace_id_isset;
 AT_surfxml_peer_power AX_surfxml_peer_power;
 #define A_surfxml_peer_power (surfxml_bufferstack + AX_surfxml_peer_power)
+short int surfxml_peer_power_isset;
 AT_surfxml_cluster_radical AX_surfxml_cluster_radical;
 #define A_surfxml_cluster_radical (surfxml_bufferstack + AX_surfxml_cluster_radical)
+short int surfxml_cluster_radical_isset;
 AT_surfxml_config_id AX_surfxml_config_id;
 #define A_surfxml_config_id (surfxml_bufferstack + AX_surfxml_config_id)
+short int surfxml_config_id_isset;
 AT_surfxml_bypassRoute_gw_src AX_surfxml_bypassRoute_gw_src;
 #define A_surfxml_bypassRoute_gw_src (surfxml_bufferstack + AX_surfxml_bypassRoute_gw_src)
+short int surfxml_bypassRoute_gw_src_isset;
 AT_surfxml_cluster_core AX_surfxml_cluster_core;
 #define A_surfxml_cluster_core (surfxml_bufferstack + AX_surfxml_cluster_core)
+short int surfxml_cluster_core_isset;
 AT_surfxml_include_file AX_surfxml_include_file;
 #define A_surfxml_include_file (surfxml_bufferstack + AX_surfxml_include_file)
+short int surfxml_include_file_isset;
 AT_surfxml_random_std_deviation AX_surfxml_random_std_deviation;
 #define A_surfxml_random_std_deviation (surfxml_bufferstack + AX_surfxml_random_std_deviation)
+short int surfxml_random_std_deviation_isset;
 AT_surfxml_host_state_file AX_surfxml_host_state_file;
 #define A_surfxml_host_state_file (surfxml_bufferstack + AX_surfxml_host_state_file)
+short int surfxml_host_state_file_isset;
 AT_surfxml_route_dst AX_surfxml_route_dst;
 #define A_surfxml_route_dst (surfxml_bufferstack + AX_surfxml_route_dst)
+short int surfxml_route_dst_isset;
 AT_surfxml_cluster_bw AX_surfxml_cluster_bw;
 #define A_surfxml_cluster_bw (surfxml_bufferstack + AX_surfxml_cluster_bw)
+short int surfxml_cluster_bw_isset;
 AT_surfxml_platform_version AX_surfxml_platform_version;
 #define A_surfxml_platform_version (surfxml_bufferstack + AX_surfxml_platform_version)
+short int surfxml_platform_version_isset;
 
 /* XML state. */
 #ifdef FLEX_DEBUG
index 9c7b5fb..dfef12f 100644 (file)
@@ -1637,16 +1637,163 @@ void routing_parse_Scluster(void)
     switch (xbt_dynar_length(radical_ends)) {
     case 1:
                surf_parse_get_int(&start, xbt_dynar_get_as(radical_ends, 0, char *));
-               parse_create_host_link(start);
+               host_id = bprintf("%s%d%s", struct_cluster->V_cluster_prefix, start, struct_cluster->V_cluster_suffix);
+               link_id = bprintf("%s_link_%d", struct_cluster->V_cluster_id, start);
+
+               XBT_DEBUG("<host\tid=\"%s\"\tpower=\"%f\">", host_id, struct_cluster->S_cluster_power);
+               struct_host = xbt_new0(s_surf_parsing_host_arg_t, 1);
+               struct_host->V_host_id = host_id;
+               if(strcmp(struct_cluster->V_cluster_availability_file,"")){
+                 xbt_dict_set(patterns, "radical", bprintf("%d", start), xbt_free);
+                 char* tmp_availability_file = xbt_strdup(struct_cluster->V_cluster_availability_file);
+                 xbt_str_varsubst(tmp_availability_file,patterns);
+                 XBT_DEBUG("\tavailability_file=\"%s\"",tmp_availability_file);
+                 struct_host->V_host_power_trace = tmgr_trace_new(tmp_availability_file);
+                 xbt_free(tmp_availability_file);
+               }
+               else
+               {
+                 XBT_DEBUG("\tavailability_file=\"\"");
+               }
+               if(strcmp(struct_cluster->V_cluster_state_file,"")){
+                 char *tmp_state_file = xbt_strdup(struct_cluster->V_cluster_state_file);
+                 xbt_str_varsubst(tmp_state_file,patterns);
+                 XBT_DEBUG("\tstate_file=\"%s\"",tmp_state_file);
+                 struct_host->V_host_state_trace = tmgr_trace_new(tmp_state_file);
+                 xbt_free(tmp_state_file);
+               }
+               else
+               {
+                 XBT_DEBUG("\tstate_file=\"\"");
+               }
+
+               struct_host->V_host_power_peak = struct_cluster->S_cluster_power;
+               struct_host->V_host_power_scale = 1.0;
+               struct_host->V_host_core = struct_cluster->S_cluster_core;
+               struct_host->V_host_state_initial = SURF_RESOURCE_ON;
+               struct_host->V_host_coord = "";
+               surf_parse_host();
+               XBT_DEBUG("</host>");
+
+               A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
+               if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
+               {A_surfxml_link_sharing_policy =  A_surfxml_link_sharing_policy_FULLDUPLEX;}
+               if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FATPIPE)
+               {A_surfxml_link_sharing_policy =  A_surfxml_link_sharing_policy_FATPIPE;}
+
+               XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%f\"\tlat=\"%f\"/>", link_id,struct_cluster->S_cluster_bw, struct_cluster->S_cluster_lat);
+
+               struct_lnk = xbt_new0(s_surf_parsing_link_arg_t, 1);
+               struct_lnk->V_link_id = link_id;
+               struct_lnk->V_link_bandwidth = struct_cluster->S_cluster_bw;
+               struct_lnk->V_link_latency = struct_cluster->S_cluster_lat;
+               struct_lnk->V_link_bandwidth_file = NULL;
+               struct_lnk->V_link_latency_file = NULL;
+               struct_lnk->V_link_state_file = NULL;
+               struct_lnk->V_link_state = SURF_RESOURCE_ON;
+               struct_lnk->V_link_sharing_policy = A_surfxml_link_sharing_policy;
+
+               if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_SHARED)
+                       struct_lnk->V_policy_initial_link = SURF_LINK_SHARED;
+               else
+               {
+                if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FATPIPE)
+                        struct_lnk->V_policy_initial_link = SURF_LINK_FATPIPE;
+                else if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FULLDUPLEX)
+                        struct_lnk->V_policy_initial_link = SURF_LINK_FULLDUPLEX;
+               }
+               surf_parse_link();
+
+               xbt_dict_set(cluster_host_link,host_id,strdup(link_id),free);
+//             XBT_INFO("key '%s' Value '%s'",host_id,link_id);
+               ETag_surfxml_host();
+               ETag_surfxml_link();
+
                break;
 
     case 2:
-               surf_parse_get_int(&start, xbt_dynar_get_as(radical_ends, 0, char *));
-               surf_parse_get_int(&end, xbt_dynar_get_as(radical_ends, 1, char *));
-               for (i = start; i <= end; i++) {
-                 parse_create_host_link(i);
+
+      surf_parse_get_int(&start,
+                         xbt_dynar_get_as(radical_ends, 0, char *));
+      surf_parse_get_int(&end, xbt_dynar_get_as(radical_ends, 1, char *));
+      for (i = start; i <= end; i++) {
+               host_id = bprintf("%s%d%s", struct_cluster->V_cluster_prefix, i, struct_cluster->V_cluster_suffix);
+               link_id = bprintf("%s_link_%d", struct_cluster->V_cluster_id, i);
+
+               A_surfxml_host_state = A_surfxml_host_state_ON;
+
+               XBT_DEBUG("<host\tid=\"%s\"\tpower=\"%f\">", host_id, struct_cluster->S_cluster_power);
+               struct_host = xbt_new0(s_surf_parsing_host_arg_t, 1);
+               struct_host->V_host_id = host_id;
+               if(strcmp(struct_cluster->V_cluster_availability_file,"")){
+                 xbt_dict_set(patterns, "radical", bprintf("%d", i), xbt_free);
+                 char* tmp_availability_file = xbt_strdup(struct_cluster->V_cluster_availability_file);
+                 xbt_str_varsubst(tmp_availability_file,patterns);
+                 XBT_DEBUG("\tavailability_file=\"%s\"",tmp_availability_file);
+                 struct_host->V_host_power_trace = tmgr_trace_new(tmp_availability_file);
+                 xbt_free(tmp_availability_file);
                }
-               break;
+               else
+               {
+                 XBT_DEBUG("\tavailability_file=\"\"");
+               }
+               if(strcmp(struct_cluster->V_cluster_state_file,"")){
+                 char *tmp_state_file = xbt_strdup(struct_cluster->V_cluster_state_file);
+                 xbt_str_varsubst(tmp_state_file,patterns);
+                 XBT_DEBUG("\tstate_file=\"%s\"",tmp_state_file);
+                 struct_host->V_host_state_trace = tmgr_trace_new(tmp_state_file);
+                 xbt_free(tmp_state_file);
+               }
+               else
+               {
+                 XBT_DEBUG("\tstate_file=\"\"");
+               }
+
+               struct_host->V_host_power_peak = struct_cluster->S_cluster_power;
+               struct_host->V_host_power_scale = 1.0;
+               struct_host->V_host_core = struct_cluster->S_cluster_core;
+               struct_host->V_host_state_initial = SURF_RESOURCE_ON;
+               struct_host->V_host_coord = "";
+               surf_parse_host();
+               XBT_DEBUG("</host>");
+
+               A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
+               if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
+               {A_surfxml_link_sharing_policy =  A_surfxml_link_sharing_policy_FULLDUPLEX;}
+               if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FATPIPE)
+               {A_surfxml_link_sharing_policy =  A_surfxml_link_sharing_policy_FATPIPE;}
+
+               XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%f\"\tlat=\"%f\"/>", link_id,struct_cluster->S_cluster_bw, struct_cluster->S_cluster_lat);
+
+               struct_lnk = xbt_new0(s_surf_parsing_link_arg_t, 1);
+               struct_lnk->V_link_id = link_id;
+               struct_lnk->V_link_bandwidth = struct_cluster->S_cluster_bw;
+               struct_lnk->V_link_latency = struct_cluster->S_cluster_lat;
+               struct_lnk->V_link_bandwidth_file = NULL;
+               struct_lnk->V_link_latency_file = NULL;
+               struct_lnk->V_link_state_file = NULL;
+               struct_lnk->V_link_state = SURF_RESOURCE_ON;
+               struct_lnk->V_link_sharing_policy = A_surfxml_link_sharing_policy;
+
+               if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_SHARED)
+                       struct_lnk->V_policy_initial_link = SURF_LINK_SHARED;
+               else
+               {
+                if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FATPIPE)
+                        struct_lnk->V_policy_initial_link = SURF_LINK_FATPIPE;
+                else if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FULLDUPLEX)
+                        struct_lnk->V_policy_initial_link = SURF_LINK_FULLDUPLEX;
+               }
+               surf_parse_link();
+
+               xbt_dict_set(cluster_host_link,host_id,strdup(link_id),free);
+//             XBT_INFO("key '%s' Value '%s'",host_id,link_id);
+
+               ETag_surfxml_host();
+               ETag_surfxml_link();
+
+      }
+      break;
 
     default:
       XBT_DEBUG("Malformed radical");
@@ -1689,7 +1836,7 @@ void routing_parse_Scluster(void)
          else
                  struct_lnk->V_policy_initial_link = SURF_LINK_FATPIPE;
 
-         STag_surfxml_link_cluster();
+         surf_parse_link();
          ETag_surfxml_link();
 
          surf_parsing_link_up_down_t info = xbt_new0(s_surf_parsing_link_up_down_t, 1);
index 722d451..b6a745f 100644 (file)
@@ -312,9 +312,9 @@ void STag_surfxml_host(void){
                struct_host->V_host_state_initial = SURF_RESOURCE_OFF;
        struct_host->V_host_coord = xbt_strdup(A_surfxml_host_coordinates);
 
-       surfxml_call_cb_functions(STag_surfxml_host_cb_list);
+       surf_parse_host();
 }
-void STag_surfxml_host_cluster(void){
+void surf_parse_host(void){
        surfxml_call_cb_functions(STag_surfxml_host_cb_list);
 }
 void ETag_surfxml_host(void){
@@ -432,9 +432,9 @@ void STag_surfxml_link(void){
                 struct_lnk->V_policy_initial_link = SURF_LINK_FULLDUPLEX;
        }
 
-       surfxml_call_cb_functions(STag_surfxml_link_cb_list);
+       surf_parse_link();
 }
-void STag_surfxml_link_cluster(void){
+void surf_parse_link(void){
        surfxml_call_cb_functions(STag_surfxml_link_cb_list);
 }
 void ETag_surfxml_link(void){
index 8eff3ec..c3353c3 100644 (file)
@@ -1057,8 +1057,8 @@ char *xbt_graph_parse_text;
  *
  * 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.66 2011/10/30 21:03:48 mquinson Exp).
+ * FleXML is Copyright (C) 2003-2011 Martin Quinson.  All rights reserved.
+ * (Id: flexml.pl,v 1.67 2011/11/01 20:49:21 mquinson Exp).
  * 
  * There are two, intertwined parts to this program, part A and part B.
  *
@@ -1067,7 +1067,7 @@ char *xbt_graph_parse_text;
  * 
  * Some parts, here collectively called "Part A", are found in the 
  * FleXML package.  They are Copyright (C) 1999-2005 Kristoffer Rose
- * and Copyright (C) 2003-2006 Martin Quinson. All rights reserved.
+ * and Copyright (C) 2003-2011 Martin Quinson. All rights reserved.
  *
  * You can redistribute, use, perform, display and/or modify "Part A"
  * provided the following two conditions hold:
@@ -1103,7 +1103,7 @@ char *xbt_graph_parse_text;
 const char rcs_graphxml_flexml_skeleton[] =
  "$" "Id: skel,v 1.40 2007/10/11 09:57:24 mquinson Exp $";
 const char rcs_graphxml_flexml[] =
- "$" "Id: flexml.pl,v 1.66 2011/10/30 21:03:48 mquinson Exp $";
+ "$" "Id: flexml.pl,v 1.67 2011/11/01 20:49:21 mquinson Exp $";
 
 /* ANSI headers. */
 #include <stdlib.h> /* for realloc() -- needed here when using flex 2.5.4 */
@@ -1140,28 +1140,40 @@ extern char *graphxml_bufferstack;
 #define graphxml_pcdata (graphxml_bufferstack + graphxml_pcdata_ix)
 AT_graphxml_node_name AX_graphxml_node_name;
 #define A_graphxml_node_name (graphxml_bufferstack + AX_graphxml_node_name)
+short int graphxml_node_name_isset;
 AT_graphxml_edge_source AX_graphxml_edge_source;
 #define A_graphxml_edge_source (graphxml_bufferstack + AX_graphxml_edge_source)
+short int graphxml_edge_source_isset;
 AT_graphxml_node_position_y AX_graphxml_node_position_y;
 #define A_graphxml_node_position_y (graphxml_bufferstack + AX_graphxml_node_position_y)
+short int graphxml_node_position_y_isset;
 AT_graphxml_node_position_x AX_graphxml_node_position_x;
 #define A_graphxml_node_position_x (graphxml_bufferstack + AX_graphxml_node_position_x)
+short int graphxml_node_position_x_isset;
 AT_graphxml_edge_data AX_graphxml_edge_data;
 #define A_graphxml_edge_data (graphxml_bufferstack + AX_graphxml_edge_data)
+short int graphxml_edge_data_isset;
 AT_graphxml_edge_target AX_graphxml_edge_target;
 #define A_graphxml_edge_target (graphxml_bufferstack + AX_graphxml_edge_target)
+short int graphxml_edge_target_isset;
 AT_graphxml_graph_isDirected AX_graphxml_graph_isDirected;
 #define A_graphxml_graph_isDirected AX_graphxml_graph_isDirected
+short int graphxml_graph_isDirected_isset;
 AT_graphxml_node_label AX_graphxml_node_label;
 #define A_graphxml_node_label (graphxml_bufferstack + AX_graphxml_node_label)
+short int graphxml_node_label_isset;
 AT_graphxml_node_data AX_graphxml_node_data;
 #define A_graphxml_node_data (graphxml_bufferstack + AX_graphxml_node_data)
+short int graphxml_node_data_isset;
 AT_graphxml_edge_label AX_graphxml_edge_label;
 #define A_graphxml_edge_label (graphxml_bufferstack + AX_graphxml_edge_label)
+short int graphxml_edge_label_isset;
 AT_graphxml_edge_length AX_graphxml_edge_length;
 #define A_graphxml_edge_length (graphxml_bufferstack + AX_graphxml_edge_length)
+short int graphxml_edge_length_isset;
 AT_graphxml_edge_name AX_graphxml_edge_name;
 #define A_graphxml_edge_name (graphxml_bufferstack + AX_graphxml_edge_name)
+short int graphxml_edge_name_isset;
 
 /* XML state. */
 #ifdef FLEX_DEBUG