From: navarro Date: Mon, 23 Jan 2012 10:06:54 +0000 (+0100) Subject: Change cluster sharing policy for FULLDUPLEX by default. X-Git-Tag: exp_20120216~119^2~35 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/3035b8928b4573e170d9268ece8ff474442b99ad?hp=9ba853e045bd240d5416327245ed9a9bc5273273 Change cluster sharing policy for FULLDUPLEX by default. Update tesh files. --- diff --git a/include/surf/simgrid_dtd.h b/include/surf/simgrid_dtd.h index 1a960fd438..32f728a9e5 100644 --- a/include/surf/simgrid_dtd.h +++ b/include/surf/simgrid_dtd.h @@ -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-2011 Martin Quinson. All rights reserved. - * (Id: flexml.pl,v 1.67 2011/11/01 20:49:21 mquinson Exp). + * FleXML is Copyright (C) 2003-2006 Martin Quinson. All rights reserved. + * (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. * @@ -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-2011 Martin Quinson. All rights reserved. + * and Copyright (C) 2003-2006 Martin Quinson. All rights reserved. * * You can redistribute, use, perform, display and/or modify "Part A" * provided the following two conditions hold: @@ -247,247 +247,166 @@ 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); diff --git a/include/xbt/graphxml.h b/include/xbt/graphxml.h index 9c5fdbfe60..556b0c0ec1 100644 --- a/include/xbt/graphxml.h +++ b/include/xbt/graphxml.h @@ -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-2011 Martin Quinson. All rights reserved. - * (Id: flexml.pl,v 1.67 2011/11/01 20:49:21 mquinson Exp). + * FleXML is Copyright (C) 2003-2006 Martin Quinson. All rights reserved. + * (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. * @@ -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-2011 Martin Quinson. All rights reserved. + * and Copyright (C) 2003-2006 Martin Quinson. All rights reserved. * * You can redistribute, use, perform, display and/or modify "Part A" * provided the following two conditions hold: @@ -86,40 +86,28 @@ 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); diff --git a/src/simdag/dax_dtd.c b/src/simdag/dax_dtd.c index f0eae8158a..94df9368b5 100644 --- a/src/simdag/dax_dtd.c +++ b/src/simdag/dax_dtd.c @@ -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-2011 Martin Quinson. All rights reserved. - * (Id: flexml.pl,v 1.67 2011/11/01 20:49:21 mquinson Exp). + * FleXML is Copyright (C) 2003-2006 Martin Quinson. All rights reserved. + * (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. * @@ -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-2011 Martin Quinson. All rights reserved. + * and Copyright (C) 2003-2006 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.67 2011/11/01 20:49:21 mquinson Exp $"; + "$" "Id: flexml.pl,v 1.62 2007/10/11 10:00:14 mquinson Exp $"; /* ANSI headers. */ #include /* for realloc() -- needed here when using flex 2.5.4 */ @@ -1342,79 +1342,54 @@ 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 @@ -2024,25 +1999,15 @@ case 17: YY_RULE_SETUP { AX_dax__adag_xmlns = 1; - dax__adag_xmlns_isset = 0; AX_dax__adag_xmlns_c_xsi = 35; - dax__adag_xmlns_c_xsi_isset = 0; AX_dax__adag_xsi_c_schemaLocation = 77; - dax__adag_xsi_c_schemaLocation_isset = 0; AX_dax__adag_version = 153; - dax__adag_version_isset = 0; AX_dax__adag_count = 0; - dax__adag_count_isset = 0; AX_dax__adag_index = 0; - dax__adag_index_isset = 0; AX_dax__adag_name = 0; - dax__adag_name_isset = 0; AX_dax__adag_jobCount = 0; - dax__adag_jobCount_isset = 0; AX_dax__adag_fileCount = 0; - dax__adag_fileCount_isset = 0; AX_dax__adag_childCount = 0; - dax__adag_childCount_isset = 0; ENTER(AL_dax__adag); pushbuffer(0); } YY_BREAK @@ -2050,102 +2015,102 @@ YY_RULE_SETUP case 18: /* rule 18 can match eol */ YY_RULE_SETUP -if (dax__adag_xmlns_isset != 0) {FAIL("Multiple definition of attribute xmlns in ");} dax__adag_xmlns_isset = 1; ENTER(VALUE1); BUFFERSET(AX_dax__adag_xmlns); +ENTER(VALUE1); BUFFERSET(AX_dax__adag_xmlns); YY_BREAK case 19: /* rule 19 can match eol */ YY_RULE_SETUP -if (dax__adag_xmlns_isset != 0) {FAIL("Multiple definition of attribute xmlns in ");} dax__adag_xmlns_isset = 1; ENTER(VALUE2); BUFFERSET(AX_dax__adag_xmlns); +ENTER(VALUE2); BUFFERSET(AX_dax__adag_xmlns); YY_BREAK case 20: /* rule 20 can match eol */ YY_RULE_SETUP -if (dax__adag_xmlns_c_xsi_isset != 0) {FAIL("Multiple definition of attribute xmlns:xsi in ");} dax__adag_xmlns_c_xsi_isset = 1; ENTER(VALUE1); BUFFERSET(AX_dax__adag_xmlns_c_xsi); +ENTER(VALUE1); BUFFERSET(AX_dax__adag_xmlns_c_xsi); YY_BREAK case 21: /* rule 21 can match eol */ YY_RULE_SETUP -if (dax__adag_xmlns_c_xsi_isset != 0) {FAIL("Multiple definition of attribute xmlns:xsi in ");} dax__adag_xmlns_c_xsi_isset = 1; ENTER(VALUE2); BUFFERSET(AX_dax__adag_xmlns_c_xsi); +ENTER(VALUE2); BUFFERSET(AX_dax__adag_xmlns_c_xsi); YY_BREAK case 22: /* rule 22 can match eol */ YY_RULE_SETUP -if (dax__adag_xsi_c_schemaLocation_isset != 0) {FAIL("Multiple definition of attribute xsi:schemaLocation in ");} dax__adag_xsi_c_schemaLocation_isset = 1; ENTER(VALUE1); BUFFERSET(AX_dax__adag_xsi_c_schemaLocation); +ENTER(VALUE1); BUFFERSET(AX_dax__adag_xsi_c_schemaLocation); YY_BREAK case 23: /* rule 23 can match eol */ YY_RULE_SETUP -if (dax__adag_xsi_c_schemaLocation_isset != 0) {FAIL("Multiple definition of attribute xsi:schemaLocation in ");} dax__adag_xsi_c_schemaLocation_isset = 1; ENTER(VALUE2); BUFFERSET(AX_dax__adag_xsi_c_schemaLocation); +ENTER(VALUE2); BUFFERSET(AX_dax__adag_xsi_c_schemaLocation); YY_BREAK case 24: /* rule 24 can match eol */ YY_RULE_SETUP -if (dax__adag_version_isset != 0) {FAIL("Multiple definition of attribute version in ");} dax__adag_version_isset = 1; ENTER(VALUE1); BUFFERSET(AX_dax__adag_version); +ENTER(VALUE1); BUFFERSET(AX_dax__adag_version); YY_BREAK case 25: /* rule 25 can match eol */ YY_RULE_SETUP -if (dax__adag_version_isset != 0) {FAIL("Multiple definition of attribute version in ");} dax__adag_version_isset = 1; ENTER(VALUE2); BUFFERSET(AX_dax__adag_version); +ENTER(VALUE2); BUFFERSET(AX_dax__adag_version); YY_BREAK case 26: /* rule 26 can match eol */ YY_RULE_SETUP -if (dax__adag_count_isset != 0) {FAIL("Multiple definition of attribute count in ");} dax__adag_count_isset = 1; ENTER(VALUE1); BUFFERSET(AX_dax__adag_count); +ENTER(VALUE1); BUFFERSET(AX_dax__adag_count); YY_BREAK case 27: /* rule 27 can match eol */ YY_RULE_SETUP -if (dax__adag_count_isset != 0) {FAIL("Multiple definition of attribute count in ");} dax__adag_count_isset = 1; ENTER(VALUE2); BUFFERSET(AX_dax__adag_count); +ENTER(VALUE2); BUFFERSET(AX_dax__adag_count); YY_BREAK case 28: /* rule 28 can match eol */ YY_RULE_SETUP -if (dax__adag_index_isset != 0) {FAIL("Multiple definition of attribute index in ");} dax__adag_index_isset = 1; ENTER(VALUE1); BUFFERSET(AX_dax__adag_index); +ENTER(VALUE1); BUFFERSET(AX_dax__adag_index); YY_BREAK case 29: /* rule 29 can match eol */ YY_RULE_SETUP -if (dax__adag_index_isset != 0) {FAIL("Multiple definition of attribute index in ");} dax__adag_index_isset = 1; ENTER(VALUE2); BUFFERSET(AX_dax__adag_index); +ENTER(VALUE2); BUFFERSET(AX_dax__adag_index); YY_BREAK case 30: /* rule 30 can match eol */ YY_RULE_SETUP -if (dax__adag_name_isset != 0) {FAIL("Multiple definition of attribute name in ");} dax__adag_name_isset = 1; ENTER(VALUE1); BUFFERSET(AX_dax__adag_name); +ENTER(VALUE1); BUFFERSET(AX_dax__adag_name); YY_BREAK case 31: /* rule 31 can match eol */ YY_RULE_SETUP -if (dax__adag_name_isset != 0) {FAIL("Multiple definition of attribute name in ");} dax__adag_name_isset = 1; ENTER(VALUE2); BUFFERSET(AX_dax__adag_name); +ENTER(VALUE2); BUFFERSET(AX_dax__adag_name); YY_BREAK case 32: /* rule 32 can match eol */ YY_RULE_SETUP -if (dax__adag_jobCount_isset != 0) {FAIL("Multiple definition of attribute jobCount in ");} dax__adag_jobCount_isset = 1; ENTER(VALUE1); BUFFERSET(AX_dax__adag_jobCount); +ENTER(VALUE1); BUFFERSET(AX_dax__adag_jobCount); YY_BREAK case 33: /* rule 33 can match eol */ YY_RULE_SETUP -if (dax__adag_jobCount_isset != 0) {FAIL("Multiple definition of attribute jobCount in ");} dax__adag_jobCount_isset = 1; ENTER(VALUE2); BUFFERSET(AX_dax__adag_jobCount); +ENTER(VALUE2); BUFFERSET(AX_dax__adag_jobCount); YY_BREAK case 34: /* rule 34 can match eol */ YY_RULE_SETUP -if (dax__adag_fileCount_isset != 0) {FAIL("Multiple definition of attribute fileCount in ");} dax__adag_fileCount_isset = 1; ENTER(VALUE1); BUFFERSET(AX_dax__adag_fileCount); +ENTER(VALUE1); BUFFERSET(AX_dax__adag_fileCount); YY_BREAK case 35: /* rule 35 can match eol */ YY_RULE_SETUP -if (dax__adag_fileCount_isset != 0) {FAIL("Multiple definition of attribute fileCount in ");} dax__adag_fileCount_isset = 1; ENTER(VALUE2); BUFFERSET(AX_dax__adag_fileCount); +ENTER(VALUE2); BUFFERSET(AX_dax__adag_fileCount); YY_BREAK case 36: /* rule 36 can match eol */ YY_RULE_SETUP -if (dax__adag_childCount_isset != 0) {FAIL("Multiple definition of attribute childCount in ");} dax__adag_childCount_isset = 1; ENTER(VALUE1); BUFFERSET(AX_dax__adag_childCount); +ENTER(VALUE1); BUFFERSET(AX_dax__adag_childCount); YY_BREAK case 37: /* rule 37 can match eol */ YY_RULE_SETUP -if (dax__adag_childCount_isset != 0) {FAIL("Multiple definition of attribute childCount in ");} dax__adag_childCount_isset = 1; ENTER(VALUE2); BUFFERSET(AX_dax__adag_childCount); +ENTER(VALUE2); BUFFERSET(AX_dax__adag_childCount); YY_BREAK case 38: YY_RULE_SETUP @@ -2213,17 +2178,11 @@ case 46: YY_RULE_SETUP { AX_dax__job_id = 0; - dax__job_id_isset = 0; AX_dax__job_namespace = 0; - dax__job_namespace_isset = 0; AX_dax__job_name = 0; - dax__job_name_isset = 0; AX_dax__job_version = 157; - dax__job_version_isset = 0; AX_dax__job_runtime = 0; - dax__job_runtime_isset = 0; AX_dax__job_level = 0; - dax__job_level_isset = 0; ENTER(AL_dax__job); pushbuffer(0); } YY_BREAK @@ -2231,62 +2190,62 @@ YY_RULE_SETUP case 47: /* rule 47 can match eol */ YY_RULE_SETUP -if (dax__job_id_isset != 0) {FAIL("Multiple definition of attribute id in ");} dax__job_id_isset = 1; ENTER(VALUE1); BUFFERSET(AX_dax__job_id); +ENTER(VALUE1); BUFFERSET(AX_dax__job_id); YY_BREAK case 48: /* rule 48 can match eol */ YY_RULE_SETUP -if (dax__job_id_isset != 0) {FAIL("Multiple definition of attribute id in ");} dax__job_id_isset = 1; ENTER(VALUE2); BUFFERSET(AX_dax__job_id); +ENTER(VALUE2); BUFFERSET(AX_dax__job_id); YY_BREAK case 49: /* rule 49 can match eol */ YY_RULE_SETUP -if (dax__job_namespace_isset != 0) {FAIL("Multiple definition of attribute namespace in ");} dax__job_namespace_isset = 1; ENTER(VALUE1); BUFFERSET(AX_dax__job_namespace); +ENTER(VALUE1); BUFFERSET(AX_dax__job_namespace); YY_BREAK case 50: /* rule 50 can match eol */ YY_RULE_SETUP -if (dax__job_namespace_isset != 0) {FAIL("Multiple definition of attribute namespace in ");} dax__job_namespace_isset = 1; ENTER(VALUE2); BUFFERSET(AX_dax__job_namespace); +ENTER(VALUE2); BUFFERSET(AX_dax__job_namespace); YY_BREAK case 51: /* rule 51 can match eol */ YY_RULE_SETUP -if (dax__job_name_isset != 0) {FAIL("Multiple definition of attribute name in ");} dax__job_name_isset = 1; ENTER(VALUE1); BUFFERSET(AX_dax__job_name); +ENTER(VALUE1); BUFFERSET(AX_dax__job_name); YY_BREAK case 52: /* rule 52 can match eol */ YY_RULE_SETUP -if (dax__job_name_isset != 0) {FAIL("Multiple definition of attribute name in ");} dax__job_name_isset = 1; ENTER(VALUE2); BUFFERSET(AX_dax__job_name); +ENTER(VALUE2); BUFFERSET(AX_dax__job_name); YY_BREAK case 53: /* rule 53 can match eol */ YY_RULE_SETUP -if (dax__job_version_isset != 0) {FAIL("Multiple definition of attribute version in ");} dax__job_version_isset = 1; ENTER(VALUE1); BUFFERSET(AX_dax__job_version); +ENTER(VALUE1); BUFFERSET(AX_dax__job_version); YY_BREAK case 54: /* rule 54 can match eol */ YY_RULE_SETUP -if (dax__job_version_isset != 0) {FAIL("Multiple definition of attribute version in ");} dax__job_version_isset = 1; ENTER(VALUE2); BUFFERSET(AX_dax__job_version); +ENTER(VALUE2); BUFFERSET(AX_dax__job_version); YY_BREAK case 55: /* rule 55 can match eol */ YY_RULE_SETUP -if (dax__job_runtime_isset != 0) {FAIL("Multiple definition of attribute runtime in ");} dax__job_runtime_isset = 1; ENTER(VALUE1); BUFFERSET(AX_dax__job_runtime); +ENTER(VALUE1); BUFFERSET(AX_dax__job_runtime); YY_BREAK case 56: /* rule 56 can match eol */ YY_RULE_SETUP -if (dax__job_runtime_isset != 0) {FAIL("Multiple definition of attribute runtime in ");} dax__job_runtime_isset = 1; ENTER(VALUE2); BUFFERSET(AX_dax__job_runtime); +ENTER(VALUE2); BUFFERSET(AX_dax__job_runtime); YY_BREAK case 57: /* rule 57 can match eol */ YY_RULE_SETUP -if (dax__job_level_isset != 0) {FAIL("Multiple definition of attribute level in ");} dax__job_level_isset = 1; ENTER(VALUE1); BUFFERSET(AX_dax__job_level); +ENTER(VALUE1); BUFFERSET(AX_dax__job_level); YY_BREAK case 58: /* rule 58 can match eol */ YY_RULE_SETUP -if (dax__job_level_isset != 0) {FAIL("Multiple definition of attribute level in ");} dax__job_level_isset = 1; ENTER(VALUE2); BUFFERSET(AX_dax__job_level); +ENTER(VALUE2); BUFFERSET(AX_dax__job_level); YY_BREAK case 59: YY_RULE_SETUP @@ -2360,19 +2319,12 @@ case 67: YY_RULE_SETUP { AX_dax__uses_file = 0; - dax__uses_file_isset = 0; AX_dax__uses_link = AU_dax__uses_link; - dax__uses_link_isset = 0; AX_dax__uses_register = A_dax__uses_register_true; - dax__uses_register_isset = 0; AX_dax__uses_transfer = A_dax__uses_transfer_true; - dax__uses_transfer_isset = 0; AX_dax__uses_optional = A_dax__uses_optional_false; - dax__uses_optional_isset = 0; AX_dax__uses_type = 161; - dax__uses_type_isset = 0; AX_dax__uses_size = 0; - dax__uses_size_isset = 0; ENTER(AL_dax__uses); pushbuffer(0); } YY_BREAK @@ -2380,12 +2332,12 @@ YY_RULE_SETUP case 68: /* rule 68 can match eol */ YY_RULE_SETUP -if (dax__uses_file_isset != 0) {FAIL("Multiple definition of attribute file in ");} dax__uses_file_isset = 1; ENTER(VALUE1); BUFFERSET(AX_dax__uses_file); +ENTER(VALUE1); BUFFERSET(AX_dax__uses_file); YY_BREAK case 69: /* rule 69 can match eol */ YY_RULE_SETUP -if (dax__uses_file_isset != 0) {FAIL("Multiple definition of attribute file in ");} dax__uses_file_isset = 1; ENTER(VALUE2); BUFFERSET(AX_dax__uses_file); +ENTER(VALUE2); BUFFERSET(AX_dax__uses_file); YY_BREAK case 70: /* rule 70 can match eol */ @@ -2446,22 +2398,22 @@ A_dax__uses_optional = A_dax__uses_optional_true; case 86: /* rule 86 can match eol */ YY_RULE_SETUP -if (dax__uses_type_isset != 0) {FAIL("Multiple definition of attribute type in ");} dax__uses_type_isset = 1; ENTER(VALUE1); BUFFERSET(AX_dax__uses_type); +ENTER(VALUE1); BUFFERSET(AX_dax__uses_type); YY_BREAK case 87: /* rule 87 can match eol */ YY_RULE_SETUP -if (dax__uses_type_isset != 0) {FAIL("Multiple definition of attribute type in ");} dax__uses_type_isset = 1; ENTER(VALUE2); BUFFERSET(AX_dax__uses_type); +ENTER(VALUE2); BUFFERSET(AX_dax__uses_type); YY_BREAK case 88: /* rule 88 can match eol */ YY_RULE_SETUP -if (dax__uses_size_isset != 0) {FAIL("Multiple definition of attribute size in ");} dax__uses_size_isset = 1; ENTER(VALUE1); BUFFERSET(AX_dax__uses_size); +ENTER(VALUE1); BUFFERSET(AX_dax__uses_size); YY_BREAK case 89: /* rule 89 can match eol */ YY_RULE_SETUP -if (dax__uses_size_isset != 0) {FAIL("Multiple definition of attribute size in ");} dax__uses_size_isset = 1; ENTER(VALUE2); BUFFERSET(AX_dax__uses_size); +ENTER(VALUE2); BUFFERSET(AX_dax__uses_size); YY_BREAK case 90: YY_RULE_SETUP @@ -2529,7 +2481,6 @@ case 98: YY_RULE_SETUP { AX_dax__child_ref = 0; - dax__child_ref_isset = 0; ENTER(AL_dax__child); pushbuffer(0); } YY_BREAK @@ -2537,12 +2488,12 @@ YY_RULE_SETUP case 99: /* rule 99 can match eol */ YY_RULE_SETUP -if (dax__child_ref_isset != 0) {FAIL("Multiple definition of attribute ref in ");} dax__child_ref_isset = 1; ENTER(VALUE1); BUFFERSET(AX_dax__child_ref); +ENTER(VALUE1); BUFFERSET(AX_dax__child_ref); YY_BREAK case 100: /* rule 100 can match eol */ YY_RULE_SETUP -if (dax__child_ref_isset != 0) {FAIL("Multiple definition of attribute ref in ");} dax__child_ref_isset = 1; ENTER(VALUE2); BUFFERSET(AX_dax__child_ref); +ENTER(VALUE2); BUFFERSET(AX_dax__child_ref); YY_BREAK case 101: YY_RULE_SETUP @@ -2610,7 +2561,6 @@ case 109: YY_RULE_SETUP { AX_dax__parent_ref = 0; - dax__parent_ref_isset = 0; ENTER(AL_dax__parent); pushbuffer(0); } YY_BREAK @@ -2618,12 +2568,12 @@ YY_RULE_SETUP case 110: /* rule 110 can match eol */ YY_RULE_SETUP -if (dax__parent_ref_isset != 0) {FAIL("Multiple definition of attribute ref in ");} dax__parent_ref_isset = 1; ENTER(VALUE1); BUFFERSET(AX_dax__parent_ref); +ENTER(VALUE1); BUFFERSET(AX_dax__parent_ref); YY_BREAK case 111: /* rule 111 can match eol */ YY_RULE_SETUP -if (dax__parent_ref_isset != 0) {FAIL("Multiple definition of attribute ref in ");} dax__parent_ref_isset = 1; ENTER(VALUE2); BUFFERSET(AX_dax__parent_ref); +ENTER(VALUE2); BUFFERSET(AX_dax__parent_ref); YY_BREAK case 112: YY_RULE_SETUP diff --git a/src/simdag/dax_dtd.h b/src/simdag/dax_dtd.h index 65c2032a6e..de7b9574b9 100644 --- a/src/simdag/dax_dtd.h +++ b/src/simdag/dax_dtd.h @@ -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-2011 Martin Quinson. All rights reserved. - * (Id: flexml.pl,v 1.67 2011/11/01 20:49:21 mquinson Exp). + * FleXML is Copyright (C) 2003-2006 Martin Quinson. All rights reserved. + * (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. * @@ -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-2011 Martin Quinson. All rights reserved. + * and Copyright (C) 2003-2006 Martin Quinson. All rights reserved. * * You can redistribute, use, perform, display and/or modify "Part A" * provided the following two conditions hold: @@ -113,79 +113,54 @@ 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); diff --git a/src/surf/simgrid.dtd b/src/surf/simgrid.dtd index 9aae03f99b..8f06110297 100644 --- a/src/surf/simgrid.dtd +++ b/src/surf/simgrid.dtd @@ -49,7 +49,7 @@ - + diff --git a/src/surf/simgrid_dtd.c b/src/surf/simgrid_dtd.c index 982ec57420..f2ec56a62c 100644 --- a/src/surf/simgrid_dtd.c +++ b/src/surf/simgrid_dtd.c @@ -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-2011 Martin Quinson. All rights reserved. - * (Id: flexml.pl,v 1.67 2011/11/01 20:49:21 mquinson Exp). + * FleXML is Copyright (C) 2003-2006 Martin Quinson. All rights reserved. + * (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. * @@ -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-2011 Martin Quinson. All rights reserved. + * and Copyright (C) 2003-2006 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.67 2011/11/01 20:49:21 mquinson Exp $"; + "$" "Id: flexml.pl,v 1.62 2007/10/11 10:00:14 mquinson Exp $"; /* ANSI headers. */ #include /* for realloc() -- needed here when using flex 2.5.4 */ @@ -3256,247 +3256,166 @@ 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 @@ -4234,7 +4153,6 @@ case 17: YY_RULE_SETUP { AX_surfxml_platform_version = 1; - surfxml_platform_version_isset = 0; ENTER(AL_surfxml_platform); pushbuffer(0); } YY_BREAK @@ -4242,12 +4160,12 @@ YY_RULE_SETUP case 18: /* rule 18 can match eol */ YY_RULE_SETUP -if (surfxml_platform_version_isset != 0) {FAIL("Multiple definition of attribute version in ");} surfxml_platform_version_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_platform_version); +ENTER(VALUE1); BUFFERSET(AX_surfxml_platform_version); YY_BREAK case 19: /* rule 19 can match eol */ YY_RULE_SETUP -if (surfxml_platform_version_isset != 0) {FAIL("Multiple definition of attribute version in ");} surfxml_platform_version_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_platform_version); +ENTER(VALUE2); BUFFERSET(AX_surfxml_platform_version); YY_BREAK case 20: YY_RULE_SETUP @@ -4317,7 +4235,6 @@ case 28: YY_RULE_SETUP { AX_surfxml_include_file = 0; - surfxml_include_file_isset = 0; ENTER(AL_surfxml_include); pushbuffer(0); } YY_BREAK @@ -4325,12 +4242,12 @@ YY_RULE_SETUP case 29: /* rule 29 can match eol */ YY_RULE_SETUP -if (surfxml_include_file_isset != 0) {FAIL("Multiple definition of attribute file in ");} surfxml_include_file_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_include_file); +ENTER(VALUE1); BUFFERSET(AX_surfxml_include_file); YY_BREAK case 30: /* rule 30 can match eol */ YY_RULE_SETUP -if (surfxml_include_file_isset != 0) {FAIL("Multiple definition of attribute file in ");} surfxml_include_file_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_include_file); +ENTER(VALUE2); BUFFERSET(AX_surfxml_include_file); YY_BREAK case 31: YY_RULE_SETUP @@ -4402,11 +4319,8 @@ case 39: YY_RULE_SETUP { AX_surfxml_trace_id = 0; - surfxml_trace_id_isset = 0; AX_surfxml_trace_file = 0; - surfxml_trace_file_isset = 0; AX_surfxml_trace_periodicity = 0; - surfxml_trace_periodicity_isset = 0; ENTER(AL_surfxml_trace); pushbuffer(0); } YY_BREAK @@ -4414,32 +4328,32 @@ YY_RULE_SETUP case 40: /* rule 40 can match eol */ YY_RULE_SETUP -if (surfxml_trace_id_isset != 0) {FAIL("Multiple definition of attribute id in ");} surfxml_trace_id_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_trace_id); +ENTER(VALUE1); BUFFERSET(AX_surfxml_trace_id); YY_BREAK case 41: /* rule 41 can match eol */ YY_RULE_SETUP -if (surfxml_trace_id_isset != 0) {FAIL("Multiple definition of attribute id in ");} surfxml_trace_id_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_trace_id); +ENTER(VALUE2); BUFFERSET(AX_surfxml_trace_id); YY_BREAK case 42: /* rule 42 can match eol */ YY_RULE_SETUP -if (surfxml_trace_file_isset != 0) {FAIL("Multiple definition of attribute file in ");} surfxml_trace_file_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_trace_file); +ENTER(VALUE1); BUFFERSET(AX_surfxml_trace_file); YY_BREAK case 43: /* rule 43 can match eol */ YY_RULE_SETUP -if (surfxml_trace_file_isset != 0) {FAIL("Multiple definition of attribute file in ");} surfxml_trace_file_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_trace_file); +ENTER(VALUE2); BUFFERSET(AX_surfxml_trace_file); YY_BREAK case 44: /* rule 44 can match eol */ YY_RULE_SETUP -if (surfxml_trace_periodicity_isset != 0) {FAIL("Multiple definition of attribute periodicity in ");} surfxml_trace_periodicity_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_trace_periodicity); +ENTER(VALUE1); BUFFERSET(AX_surfxml_trace_periodicity); YY_BREAK case 45: /* rule 45 can match eol */ YY_RULE_SETUP -if (surfxml_trace_periodicity_isset != 0) {FAIL("Multiple definition of attribute periodicity in ");} surfxml_trace_periodicity_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_trace_periodicity); +ENTER(VALUE2); BUFFERSET(AX_surfxml_trace_periodicity); YY_BREAK case 46: YY_RULE_SETUP @@ -4515,21 +4429,13 @@ case 53: YY_RULE_SETUP { AX_surfxml_random_id = 0; - surfxml_random_id_isset = 0; AX_surfxml_random_min = 0; - surfxml_random_min_isset = 0; AX_surfxml_random_max = 0; - surfxml_random_max_isset = 0; AX_surfxml_random_mean = 0; - surfxml_random_mean_isset = 0; AX_surfxml_random_std_deviation = 0; - surfxml_random_std_deviation_isset = 0; AX_surfxml_random_seed = 5; - surfxml_random_seed_isset = 0; AX_surfxml_random_radical = 0; - surfxml_random_radical_isset = 0; AX_surfxml_random_generator = A_surfxml_random_generator_DRAND48; - surfxml_random_generator_isset = 0; ENTER(AL_surfxml_random); pushbuffer(0); } YY_BREAK @@ -4537,72 +4443,72 @@ YY_RULE_SETUP case 54: /* rule 54 can match eol */ YY_RULE_SETUP -if (surfxml_random_id_isset != 0) {FAIL("Multiple definition of attribute id in ");} surfxml_random_id_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_random_id); +ENTER(VALUE1); BUFFERSET(AX_surfxml_random_id); YY_BREAK case 55: /* rule 55 can match eol */ YY_RULE_SETUP -if (surfxml_random_id_isset != 0) {FAIL("Multiple definition of attribute id in ");} surfxml_random_id_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_random_id); +ENTER(VALUE2); BUFFERSET(AX_surfxml_random_id); YY_BREAK case 56: /* rule 56 can match eol */ YY_RULE_SETUP -if (surfxml_random_min_isset != 0) {FAIL("Multiple definition of attribute min in ");} surfxml_random_min_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_random_min); +ENTER(VALUE1); BUFFERSET(AX_surfxml_random_min); YY_BREAK case 57: /* rule 57 can match eol */ YY_RULE_SETUP -if (surfxml_random_min_isset != 0) {FAIL("Multiple definition of attribute min in ");} surfxml_random_min_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_random_min); +ENTER(VALUE2); BUFFERSET(AX_surfxml_random_min); YY_BREAK case 58: /* rule 58 can match eol */ YY_RULE_SETUP -if (surfxml_random_max_isset != 0) {FAIL("Multiple definition of attribute max in ");} surfxml_random_max_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_random_max); +ENTER(VALUE1); BUFFERSET(AX_surfxml_random_max); YY_BREAK case 59: /* rule 59 can match eol */ YY_RULE_SETUP -if (surfxml_random_max_isset != 0) {FAIL("Multiple definition of attribute max in ");} surfxml_random_max_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_random_max); +ENTER(VALUE2); BUFFERSET(AX_surfxml_random_max); YY_BREAK case 60: /* rule 60 can match eol */ YY_RULE_SETUP -if (surfxml_random_mean_isset != 0) {FAIL("Multiple definition of attribute mean in ");} surfxml_random_mean_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_random_mean); +ENTER(VALUE1); BUFFERSET(AX_surfxml_random_mean); YY_BREAK case 61: /* rule 61 can match eol */ YY_RULE_SETUP -if (surfxml_random_mean_isset != 0) {FAIL("Multiple definition of attribute mean in ");} surfxml_random_mean_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_random_mean); +ENTER(VALUE2); BUFFERSET(AX_surfxml_random_mean); YY_BREAK case 62: /* rule 62 can match eol */ YY_RULE_SETUP -if (surfxml_random_std_deviation_isset != 0) {FAIL("Multiple definition of attribute std_deviation in ");} surfxml_random_std_deviation_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_random_std_deviation); +ENTER(VALUE1); BUFFERSET(AX_surfxml_random_std_deviation); YY_BREAK case 63: /* rule 63 can match eol */ YY_RULE_SETUP -if (surfxml_random_std_deviation_isset != 0) {FAIL("Multiple definition of attribute std_deviation in ");} surfxml_random_std_deviation_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_random_std_deviation); +ENTER(VALUE2); BUFFERSET(AX_surfxml_random_std_deviation); YY_BREAK case 64: /* rule 64 can match eol */ YY_RULE_SETUP -if (surfxml_random_seed_isset != 0) {FAIL("Multiple definition of attribute seed in ");} surfxml_random_seed_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_random_seed); +ENTER(VALUE1); BUFFERSET(AX_surfxml_random_seed); YY_BREAK case 65: /* rule 65 can match eol */ YY_RULE_SETUP -if (surfxml_random_seed_isset != 0) {FAIL("Multiple definition of attribute seed in ");} surfxml_random_seed_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_random_seed); +ENTER(VALUE2); BUFFERSET(AX_surfxml_random_seed); YY_BREAK case 66: /* rule 66 can match eol */ YY_RULE_SETUP -if (surfxml_random_radical_isset != 0) {FAIL("Multiple definition of attribute radical in ");} surfxml_random_radical_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_random_radical); +ENTER(VALUE1); BUFFERSET(AX_surfxml_random_radical); YY_BREAK case 67: /* rule 67 can match eol */ YY_RULE_SETUP -if (surfxml_random_radical_isset != 0) {FAIL("Multiple definition of attribute radical in ");} surfxml_random_radical_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_random_radical); +ENTER(VALUE2); BUFFERSET(AX_surfxml_random_radical); YY_BREAK case 68: /* rule 68 can match eol */ @@ -4706,11 +4612,8 @@ case 84: YY_RULE_SETUP { AX_surfxml_trace_connect_kind = A_surfxml_trace_connect_kind_HOST_AVAIL; - surfxml_trace_connect_kind_isset = 0; AX_surfxml_trace_connect_trace = 0; - surfxml_trace_connect_trace_isset = 0; AX_surfxml_trace_connect_element = 0; - surfxml_trace_connect_element_isset = 0; ENTER(AL_surfxml_trace_connect); pushbuffer(0); } YY_BREAK @@ -4753,22 +4656,22 @@ A_surfxml_trace_connect_kind = A_surfxml_trace_connect_kind_LATENCY; case 95: /* rule 95 can match eol */ YY_RULE_SETUP -if (surfxml_trace_connect_trace_isset != 0) {FAIL("Multiple definition of attribute trace in ");} surfxml_trace_connect_trace_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_trace_connect_trace); +ENTER(VALUE1); BUFFERSET(AX_surfxml_trace_connect_trace); YY_BREAK case 96: /* rule 96 can match eol */ YY_RULE_SETUP -if (surfxml_trace_connect_trace_isset != 0) {FAIL("Multiple definition of attribute trace in ");} surfxml_trace_connect_trace_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_trace_connect_trace); +ENTER(VALUE2); BUFFERSET(AX_surfxml_trace_connect_trace); YY_BREAK case 97: /* rule 97 can match eol */ YY_RULE_SETUP -if (surfxml_trace_connect_element_isset != 0) {FAIL("Multiple definition of attribute element in ");} surfxml_trace_connect_element_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_trace_connect_element); +ENTER(VALUE1); BUFFERSET(AX_surfxml_trace_connect_element); YY_BREAK case 98: /* rule 98 can match eol */ YY_RULE_SETUP -if (surfxml_trace_connect_element_isset != 0) {FAIL("Multiple definition of attribute element in ");} surfxml_trace_connect_element_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_trace_connect_element); +ENTER(VALUE2); BUFFERSET(AX_surfxml_trace_connect_element); YY_BREAK case 99: YY_RULE_SETUP @@ -4846,9 +4749,7 @@ case 107: YY_RULE_SETUP { AX_surfxml_AS_id = 0; - surfxml_AS_id_isset = 0; AX_surfxml_AS_routing = 0; - surfxml_AS_routing_isset = 0; ENTER(AL_surfxml_AS); pushbuffer(0); } YY_BREAK @@ -4856,22 +4757,22 @@ YY_RULE_SETUP case 108: /* rule 108 can match eol */ YY_RULE_SETUP -if (surfxml_AS_id_isset != 0) {FAIL("Multiple definition of attribute id in ");} surfxml_AS_id_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_AS_id); +ENTER(VALUE1); BUFFERSET(AX_surfxml_AS_id); YY_BREAK case 109: /* rule 109 can match eol */ YY_RULE_SETUP -if (surfxml_AS_id_isset != 0) {FAIL("Multiple definition of attribute id in ");} surfxml_AS_id_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_AS_id); +ENTER(VALUE2); BUFFERSET(AX_surfxml_AS_id); YY_BREAK case 110: /* rule 110 can match eol */ YY_RULE_SETUP -if (surfxml_AS_routing_isset != 0) {FAIL("Multiple definition of attribute routing in ");} surfxml_AS_routing_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_AS_routing); +ENTER(VALUE1); BUFFERSET(AX_surfxml_AS_routing); YY_BREAK case 111: /* rule 111 can match eol */ YY_RULE_SETUP -if (surfxml_AS_routing_isset != 0) {FAIL("Multiple definition of attribute routing in ");} surfxml_AS_routing_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_AS_routing); +ENTER(VALUE2); BUFFERSET(AX_surfxml_AS_routing); YY_BREAK case 112: YY_RULE_SETUP @@ -4950,21 +4851,13 @@ case 120: YY_RULE_SETUP { AX_surfxml_host_id = 0; - surfxml_host_id_isset = 0; AX_surfxml_host_power = 0; - surfxml_host_power_isset = 0; AX_surfxml_host_core = 16; - surfxml_host_core_isset = 0; AX_surfxml_host_availability = 18; - surfxml_host_availability_isset = 0; AX_surfxml_host_availability_file = 0; - surfxml_host_availability_file_isset = 0; AX_surfxml_host_state = A_surfxml_host_state_ON; - surfxml_host_state_isset = 0; AX_surfxml_host_state_file = 0; - surfxml_host_state_file_isset = 0; AX_surfxml_host_coordinates = 0; - surfxml_host_coordinates_isset = 0; ENTER(AL_surfxml_host); pushbuffer(0); } YY_BREAK @@ -4972,52 +4865,52 @@ YY_RULE_SETUP case 121: /* rule 121 can match eol */ YY_RULE_SETUP -if (surfxml_host_id_isset != 0) {FAIL("Multiple definition of attribute id in ");} surfxml_host_id_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_host_id); +ENTER(VALUE1); BUFFERSET(AX_surfxml_host_id); YY_BREAK case 122: /* rule 122 can match eol */ YY_RULE_SETUP -if (surfxml_host_id_isset != 0) {FAIL("Multiple definition of attribute id in ");} surfxml_host_id_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_host_id); +ENTER(VALUE2); BUFFERSET(AX_surfxml_host_id); YY_BREAK case 123: /* rule 123 can match eol */ YY_RULE_SETUP -if (surfxml_host_power_isset != 0) {FAIL("Multiple definition of attribute power in ");} surfxml_host_power_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_host_power); +ENTER(VALUE1); BUFFERSET(AX_surfxml_host_power); YY_BREAK case 124: /* rule 124 can match eol */ YY_RULE_SETUP -if (surfxml_host_power_isset != 0) {FAIL("Multiple definition of attribute power in ");} surfxml_host_power_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_host_power); +ENTER(VALUE2); BUFFERSET(AX_surfxml_host_power); YY_BREAK case 125: /* rule 125 can match eol */ YY_RULE_SETUP -if (surfxml_host_core_isset != 0) {FAIL("Multiple definition of attribute core in ");} surfxml_host_core_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_host_core); +ENTER(VALUE1); BUFFERSET(AX_surfxml_host_core); YY_BREAK case 126: /* rule 126 can match eol */ YY_RULE_SETUP -if (surfxml_host_core_isset != 0) {FAIL("Multiple definition of attribute core in ");} surfxml_host_core_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_host_core); +ENTER(VALUE2); BUFFERSET(AX_surfxml_host_core); YY_BREAK case 127: /* rule 127 can match eol */ YY_RULE_SETUP -if (surfxml_host_availability_isset != 0) {FAIL("Multiple definition of attribute availability in ");} surfxml_host_availability_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_host_availability); +ENTER(VALUE1); BUFFERSET(AX_surfxml_host_availability); YY_BREAK case 128: /* rule 128 can match eol */ YY_RULE_SETUP -if (surfxml_host_availability_isset != 0) {FAIL("Multiple definition of attribute availability in ");} surfxml_host_availability_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_host_availability); +ENTER(VALUE2); BUFFERSET(AX_surfxml_host_availability); YY_BREAK case 129: /* rule 129 can match eol */ YY_RULE_SETUP -if (surfxml_host_availability_file_isset != 0) {FAIL("Multiple definition of attribute availability_file in ");} surfxml_host_availability_file_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_host_availability_file); +ENTER(VALUE1); BUFFERSET(AX_surfxml_host_availability_file); YY_BREAK case 130: /* rule 130 can match eol */ YY_RULE_SETUP -if (surfxml_host_availability_file_isset != 0) {FAIL("Multiple definition of attribute availability_file in ");} surfxml_host_availability_file_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_host_availability_file); +ENTER(VALUE2); BUFFERSET(AX_surfxml_host_availability_file); YY_BREAK case 131: /* rule 131 can match eol */ @@ -5036,22 +4929,22 @@ A_surfxml_host_state = A_surfxml_host_state_OFF; case 135: /* rule 135 can match eol */ YY_RULE_SETUP -if (surfxml_host_state_file_isset != 0) {FAIL("Multiple definition of attribute state_file in ");} surfxml_host_state_file_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_host_state_file); +ENTER(VALUE1); BUFFERSET(AX_surfxml_host_state_file); YY_BREAK case 136: /* rule 136 can match eol */ YY_RULE_SETUP -if (surfxml_host_state_file_isset != 0) {FAIL("Multiple definition of attribute state_file in ");} surfxml_host_state_file_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_host_state_file); +ENTER(VALUE2); BUFFERSET(AX_surfxml_host_state_file); YY_BREAK case 137: /* rule 137 can match eol */ YY_RULE_SETUP -if (surfxml_host_coordinates_isset != 0) {FAIL("Multiple definition of attribute coordinates in ");} surfxml_host_coordinates_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_host_coordinates); +ENTER(VALUE1); BUFFERSET(AX_surfxml_host_coordinates); YY_BREAK case 138: /* rule 138 can match eol */ YY_RULE_SETUP -if (surfxml_host_coordinates_isset != 0) {FAIL("Multiple definition of attribute coordinates in ");} surfxml_host_coordinates_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_host_coordinates); +ENTER(VALUE2); BUFFERSET(AX_surfxml_host_coordinates); YY_BREAK case 139: YY_RULE_SETUP @@ -5121,35 +5014,20 @@ case 147: YY_RULE_SETUP { AX_surfxml_cluster_id = 0; - surfxml_cluster_id_isset = 0; AX_surfxml_cluster_prefix = 0; - surfxml_cluster_prefix_isset = 0; AX_surfxml_cluster_suffix = 0; - surfxml_cluster_suffix_isset = 0; AX_surfxml_cluster_radical = 0; - surfxml_cluster_radical_isset = 0; AX_surfxml_cluster_power = 0; - surfxml_cluster_power_isset = 0; AX_surfxml_cluster_core = 22; - surfxml_cluster_core_isset = 0; AX_surfxml_cluster_bw = 0; - surfxml_cluster_bw_isset = 0; AX_surfxml_cluster_lat = 0; - surfxml_cluster_lat_isset = 0; - AX_surfxml_cluster_sharing_policy = A_surfxml_cluster_sharing_policy_SHARED; - surfxml_cluster_sharing_policy_isset = 0; + AX_surfxml_cluster_sharing_policy = A_surfxml_cluster_sharing_policy_FULLDUPLEX; AX_surfxml_cluster_bb_bw = 0; - surfxml_cluster_bb_bw_isset = 0; AX_surfxml_cluster_bb_lat = 0; - surfxml_cluster_bb_lat_isset = 0; AX_surfxml_cluster_bb_sharing_policy = A_surfxml_cluster_bb_sharing_policy_SHARED; - surfxml_cluster_bb_sharing_policy_isset = 0; AX_surfxml_cluster_availability_file = 0; - surfxml_cluster_availability_file_isset = 0; AX_surfxml_cluster_state_file = 0; - surfxml_cluster_state_file_isset = 0; AX_surfxml_cluster_router_id = 0; - surfxml_cluster_router_id_isset = 0; ENTER(AL_surfxml_cluster); pushbuffer(0); } YY_BREAK @@ -5157,82 +5035,82 @@ YY_RULE_SETUP case 148: /* rule 148 can match eol */ YY_RULE_SETUP -if (surfxml_cluster_id_isset != 0) {FAIL("Multiple definition of attribute id in ");} surfxml_cluster_id_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_id); +ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_id); YY_BREAK case 149: /* rule 149 can match eol */ YY_RULE_SETUP -if (surfxml_cluster_id_isset != 0) {FAIL("Multiple definition of attribute id in ");} surfxml_cluster_id_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_id); +ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_id); YY_BREAK case 150: /* rule 150 can match eol */ YY_RULE_SETUP -if (surfxml_cluster_prefix_isset != 0) {FAIL("Multiple definition of attribute prefix in ");} surfxml_cluster_prefix_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_prefix); +ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_prefix); YY_BREAK case 151: /* rule 151 can match eol */ YY_RULE_SETUP -if (surfxml_cluster_prefix_isset != 0) {FAIL("Multiple definition of attribute prefix in ");} surfxml_cluster_prefix_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_prefix); +ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_prefix); YY_BREAK case 152: /* rule 152 can match eol */ YY_RULE_SETUP -if (surfxml_cluster_suffix_isset != 0) {FAIL("Multiple definition of attribute suffix in ");} surfxml_cluster_suffix_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_suffix); +ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_suffix); YY_BREAK case 153: /* rule 153 can match eol */ YY_RULE_SETUP -if (surfxml_cluster_suffix_isset != 0) {FAIL("Multiple definition of attribute suffix in ");} surfxml_cluster_suffix_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_suffix); +ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_suffix); YY_BREAK case 154: /* rule 154 can match eol */ YY_RULE_SETUP -if (surfxml_cluster_radical_isset != 0) {FAIL("Multiple definition of attribute radical in ");} surfxml_cluster_radical_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_radical); +ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_radical); YY_BREAK case 155: /* rule 155 can match eol */ YY_RULE_SETUP -if (surfxml_cluster_radical_isset != 0) {FAIL("Multiple definition of attribute radical in ");} surfxml_cluster_radical_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_radical); +ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_radical); YY_BREAK case 156: /* rule 156 can match eol */ YY_RULE_SETUP -if (surfxml_cluster_power_isset != 0) {FAIL("Multiple definition of attribute power in ");} surfxml_cluster_power_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_power); +ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_power); YY_BREAK case 157: /* rule 157 can match eol */ YY_RULE_SETUP -if (surfxml_cluster_power_isset != 0) {FAIL("Multiple definition of attribute power in ");} surfxml_cluster_power_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_power); +ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_power); YY_BREAK case 158: /* rule 158 can match eol */ YY_RULE_SETUP -if (surfxml_cluster_core_isset != 0) {FAIL("Multiple definition of attribute core in ");} surfxml_cluster_core_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_core); +ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_core); YY_BREAK case 159: /* rule 159 can match eol */ YY_RULE_SETUP -if (surfxml_cluster_core_isset != 0) {FAIL("Multiple definition of attribute core in ");} surfxml_cluster_core_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_core); +ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_core); YY_BREAK case 160: /* rule 160 can match eol */ YY_RULE_SETUP -if (surfxml_cluster_bw_isset != 0) {FAIL("Multiple definition of attribute bw in ");} surfxml_cluster_bw_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_bw); +ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_bw); YY_BREAK case 161: /* rule 161 can match eol */ YY_RULE_SETUP -if (surfxml_cluster_bw_isset != 0) {FAIL("Multiple definition of attribute bw in ");} surfxml_cluster_bw_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_bw); +ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_bw); YY_BREAK case 162: /* rule 162 can match eol */ YY_RULE_SETUP -if (surfxml_cluster_lat_isset != 0) {FAIL("Multiple definition of attribute lat in ");} surfxml_cluster_lat_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_lat); +ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_lat); YY_BREAK case 163: /* rule 163 can match eol */ YY_RULE_SETUP -if (surfxml_cluster_lat_isset != 0) {FAIL("Multiple definition of attribute lat in ");} surfxml_cluster_lat_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_lat); +ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_lat); YY_BREAK case 164: /* rule 164 can match eol */ @@ -5258,22 +5136,22 @@ A_surfxml_cluster_sharing_policy = A_surfxml_cluster_sharing_policy_FATPIPE; case 170: /* rule 170 can match eol */ YY_RULE_SETUP -if (surfxml_cluster_bb_bw_isset != 0) {FAIL("Multiple definition of attribute bb_bw in ");} surfxml_cluster_bb_bw_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_bb_bw); +ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_bb_bw); YY_BREAK case 171: /* rule 171 can match eol */ YY_RULE_SETUP -if (surfxml_cluster_bb_bw_isset != 0) {FAIL("Multiple definition of attribute bb_bw in ");} surfxml_cluster_bb_bw_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_bb_bw); +ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_bb_bw); YY_BREAK case 172: /* rule 172 can match eol */ YY_RULE_SETUP -if (surfxml_cluster_bb_lat_isset != 0) {FAIL("Multiple definition of attribute bb_lat in ");} surfxml_cluster_bb_lat_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_bb_lat); +ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_bb_lat); YY_BREAK case 173: /* rule 173 can match eol */ YY_RULE_SETUP -if (surfxml_cluster_bb_lat_isset != 0) {FAIL("Multiple definition of attribute bb_lat in ");} surfxml_cluster_bb_lat_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_bb_lat); +ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_bb_lat); YY_BREAK case 174: /* rule 174 can match eol */ @@ -5292,32 +5170,32 @@ A_surfxml_cluster_bb_sharing_policy = A_surfxml_cluster_bb_sharing_policy_FATPIP case 178: /* rule 178 can match eol */ YY_RULE_SETUP -if (surfxml_cluster_availability_file_isset != 0) {FAIL("Multiple definition of attribute availability_file in ");} surfxml_cluster_availability_file_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_availability_file); +ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_availability_file); YY_BREAK case 179: /* rule 179 can match eol */ YY_RULE_SETUP -if (surfxml_cluster_availability_file_isset != 0) {FAIL("Multiple definition of attribute availability_file in ");} surfxml_cluster_availability_file_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_availability_file); +ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_availability_file); YY_BREAK case 180: /* rule 180 can match eol */ YY_RULE_SETUP -if (surfxml_cluster_state_file_isset != 0) {FAIL("Multiple definition of attribute state_file in ");} surfxml_cluster_state_file_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_state_file); +ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_state_file); YY_BREAK case 181: /* rule 181 can match eol */ YY_RULE_SETUP -if (surfxml_cluster_state_file_isset != 0) {FAIL("Multiple definition of attribute state_file in ");} surfxml_cluster_state_file_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_state_file); +ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_state_file); YY_BREAK case 182: /* rule 182 can match eol */ YY_RULE_SETUP -if (surfxml_cluster_router_id_isset != 0) {FAIL("Multiple definition of attribute router_id in ");} surfxml_cluster_router_id_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_router_id); +ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_router_id); YY_BREAK case 183: /* rule 183 can match eol */ YY_RULE_SETUP -if (surfxml_cluster_router_id_isset != 0) {FAIL("Multiple definition of attribute router_id in ");} surfxml_cluster_router_id_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_router_id); +ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_router_id); YY_BREAK case 184: YY_RULE_SETUP @@ -5397,21 +5275,13 @@ case 192: YY_RULE_SETUP { AX_surfxml_peer_id = 0; - surfxml_peer_id_isset = 0; AX_surfxml_peer_power = 0; - surfxml_peer_power_isset = 0; AX_surfxml_peer_bw_in = 0; - surfxml_peer_bw_in_isset = 0; AX_surfxml_peer_bw_out = 0; - surfxml_peer_bw_out_isset = 0; AX_surfxml_peer_lat = 0; - surfxml_peer_lat_isset = 0; AX_surfxml_peer_coordinates = 0; - surfxml_peer_coordinates_isset = 0; AX_surfxml_peer_availability_file = 0; - surfxml_peer_availability_file_isset = 0; AX_surfxml_peer_state_file = 0; - surfxml_peer_state_file_isset = 0; ENTER(AL_surfxml_peer); pushbuffer(0); } YY_BREAK @@ -5419,82 +5289,82 @@ YY_RULE_SETUP case 193: /* rule 193 can match eol */ YY_RULE_SETUP -if (surfxml_peer_id_isset != 0) {FAIL("Multiple definition of attribute id in ");} surfxml_peer_id_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_peer_id); +ENTER(VALUE1); BUFFERSET(AX_surfxml_peer_id); YY_BREAK case 194: /* rule 194 can match eol */ YY_RULE_SETUP -if (surfxml_peer_id_isset != 0) {FAIL("Multiple definition of attribute id in ");} surfxml_peer_id_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_peer_id); +ENTER(VALUE2); BUFFERSET(AX_surfxml_peer_id); YY_BREAK case 195: /* rule 195 can match eol */ YY_RULE_SETUP -if (surfxml_peer_power_isset != 0) {FAIL("Multiple definition of attribute power in ");} surfxml_peer_power_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_peer_power); +ENTER(VALUE1); BUFFERSET(AX_surfxml_peer_power); YY_BREAK case 196: /* rule 196 can match eol */ YY_RULE_SETUP -if (surfxml_peer_power_isset != 0) {FAIL("Multiple definition of attribute power in ");} surfxml_peer_power_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_peer_power); +ENTER(VALUE2); BUFFERSET(AX_surfxml_peer_power); YY_BREAK case 197: /* rule 197 can match eol */ YY_RULE_SETUP -if (surfxml_peer_bw_in_isset != 0) {FAIL("Multiple definition of attribute bw_in in ");} surfxml_peer_bw_in_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_peer_bw_in); +ENTER(VALUE1); BUFFERSET(AX_surfxml_peer_bw_in); YY_BREAK case 198: /* rule 198 can match eol */ YY_RULE_SETUP -if (surfxml_peer_bw_in_isset != 0) {FAIL("Multiple definition of attribute bw_in in ");} surfxml_peer_bw_in_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_peer_bw_in); +ENTER(VALUE2); BUFFERSET(AX_surfxml_peer_bw_in); YY_BREAK case 199: /* rule 199 can match eol */ YY_RULE_SETUP -if (surfxml_peer_bw_out_isset != 0) {FAIL("Multiple definition of attribute bw_out in ");} surfxml_peer_bw_out_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_peer_bw_out); +ENTER(VALUE1); BUFFERSET(AX_surfxml_peer_bw_out); YY_BREAK case 200: /* rule 200 can match eol */ YY_RULE_SETUP -if (surfxml_peer_bw_out_isset != 0) {FAIL("Multiple definition of attribute bw_out in ");} surfxml_peer_bw_out_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_peer_bw_out); +ENTER(VALUE2); BUFFERSET(AX_surfxml_peer_bw_out); YY_BREAK case 201: /* rule 201 can match eol */ YY_RULE_SETUP -if (surfxml_peer_lat_isset != 0) {FAIL("Multiple definition of attribute lat in ");} surfxml_peer_lat_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_peer_lat); +ENTER(VALUE1); BUFFERSET(AX_surfxml_peer_lat); YY_BREAK case 202: /* rule 202 can match eol */ YY_RULE_SETUP -if (surfxml_peer_lat_isset != 0) {FAIL("Multiple definition of attribute lat in ");} surfxml_peer_lat_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_peer_lat); +ENTER(VALUE2); BUFFERSET(AX_surfxml_peer_lat); YY_BREAK case 203: /* rule 203 can match eol */ YY_RULE_SETUP -if (surfxml_peer_coordinates_isset != 0) {FAIL("Multiple definition of attribute coordinates in ");} surfxml_peer_coordinates_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_peer_coordinates); +ENTER(VALUE1); BUFFERSET(AX_surfxml_peer_coordinates); YY_BREAK case 204: /* rule 204 can match eol */ YY_RULE_SETUP -if (surfxml_peer_coordinates_isset != 0) {FAIL("Multiple definition of attribute coordinates in ");} surfxml_peer_coordinates_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_peer_coordinates); +ENTER(VALUE2); BUFFERSET(AX_surfxml_peer_coordinates); YY_BREAK case 205: /* rule 205 can match eol */ YY_RULE_SETUP -if (surfxml_peer_availability_file_isset != 0) {FAIL("Multiple definition of attribute availability_file in ");} surfxml_peer_availability_file_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_peer_availability_file); +ENTER(VALUE1); BUFFERSET(AX_surfxml_peer_availability_file); YY_BREAK case 206: /* rule 206 can match eol */ YY_RULE_SETUP -if (surfxml_peer_availability_file_isset != 0) {FAIL("Multiple definition of attribute availability_file in ");} surfxml_peer_availability_file_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_peer_availability_file); +ENTER(VALUE2); BUFFERSET(AX_surfxml_peer_availability_file); YY_BREAK case 207: /* rule 207 can match eol */ YY_RULE_SETUP -if (surfxml_peer_state_file_isset != 0) {FAIL("Multiple definition of attribute state_file in ");} surfxml_peer_state_file_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_peer_state_file); +ENTER(VALUE1); BUFFERSET(AX_surfxml_peer_state_file); YY_BREAK case 208: /* rule 208 can match eol */ YY_RULE_SETUP -if (surfxml_peer_state_file_isset != 0) {FAIL("Multiple definition of attribute state_file in ");} surfxml_peer_state_file_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_peer_state_file); +ENTER(VALUE2); BUFFERSET(AX_surfxml_peer_state_file); YY_BREAK case 209: YY_RULE_SETUP @@ -5570,9 +5440,7 @@ case 217: YY_RULE_SETUP { AX_surfxml_router_id = 0; - surfxml_router_id_isset = 0; AX_surfxml_router_coordinates = 0; - surfxml_router_coordinates_isset = 0; ENTER(AL_surfxml_router); pushbuffer(0); } YY_BREAK @@ -5580,22 +5448,22 @@ YY_RULE_SETUP case 218: /* rule 218 can match eol */ YY_RULE_SETUP -if (surfxml_router_id_isset != 0) {FAIL("Multiple definition of attribute id in ");} surfxml_router_id_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_router_id); +ENTER(VALUE1); BUFFERSET(AX_surfxml_router_id); YY_BREAK case 219: /* rule 219 can match eol */ YY_RULE_SETUP -if (surfxml_router_id_isset != 0) {FAIL("Multiple definition of attribute id in ");} surfxml_router_id_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_router_id); +ENTER(VALUE2); BUFFERSET(AX_surfxml_router_id); YY_BREAK case 220: /* rule 220 can match eol */ YY_RULE_SETUP -if (surfxml_router_coordinates_isset != 0) {FAIL("Multiple definition of attribute coordinates in ");} surfxml_router_coordinates_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_router_coordinates); +ENTER(VALUE1); BUFFERSET(AX_surfxml_router_coordinates); YY_BREAK case 221: /* rule 221 can match eol */ YY_RULE_SETUP -if (surfxml_router_coordinates_isset != 0) {FAIL("Multiple definition of attribute coordinates in ");} surfxml_router_coordinates_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_router_coordinates); +ENTER(VALUE2); BUFFERSET(AX_surfxml_router_coordinates); YY_BREAK case 222: YY_RULE_SETUP @@ -5661,21 +5529,13 @@ case 230: YY_RULE_SETUP { AX_surfxml_link_id = 0; - surfxml_link_id_isset = 0; AX_surfxml_link_bandwidth = 0; - surfxml_link_bandwidth_isset = 0; AX_surfxml_link_bandwidth_file = 0; - surfxml_link_bandwidth_file_isset = 0; AX_surfxml_link_latency = 24; - surfxml_link_latency_isset = 0; AX_surfxml_link_latency_file = 0; - surfxml_link_latency_file_isset = 0; AX_surfxml_link_state = A_surfxml_link_state_ON; - surfxml_link_state_isset = 0; AX_surfxml_link_state_file = 0; - surfxml_link_state_file_isset = 0; AX_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED; - surfxml_link_sharing_policy_isset = 0; ENTER(AL_surfxml_link); pushbuffer(0); } YY_BREAK @@ -5683,52 +5543,52 @@ YY_RULE_SETUP case 231: /* rule 231 can match eol */ YY_RULE_SETUP -if (surfxml_link_id_isset != 0) {FAIL("Multiple definition of attribute id in ");} surfxml_link_id_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_link_id); +ENTER(VALUE1); BUFFERSET(AX_surfxml_link_id); YY_BREAK case 232: /* rule 232 can match eol */ YY_RULE_SETUP -if (surfxml_link_id_isset != 0) {FAIL("Multiple definition of attribute id in ");} surfxml_link_id_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_link_id); +ENTER(VALUE2); BUFFERSET(AX_surfxml_link_id); YY_BREAK case 233: /* rule 233 can match eol */ YY_RULE_SETUP -if (surfxml_link_bandwidth_isset != 0) {FAIL("Multiple definition of attribute bandwidth in ");} surfxml_link_bandwidth_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_link_bandwidth); +ENTER(VALUE1); BUFFERSET(AX_surfxml_link_bandwidth); YY_BREAK case 234: /* rule 234 can match eol */ YY_RULE_SETUP -if (surfxml_link_bandwidth_isset != 0) {FAIL("Multiple definition of attribute bandwidth in ");} surfxml_link_bandwidth_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_link_bandwidth); +ENTER(VALUE2); BUFFERSET(AX_surfxml_link_bandwidth); YY_BREAK case 235: /* rule 235 can match eol */ YY_RULE_SETUP -if (surfxml_link_bandwidth_file_isset != 0) {FAIL("Multiple definition of attribute bandwidth_file in ");} surfxml_link_bandwidth_file_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_link_bandwidth_file); +ENTER(VALUE1); BUFFERSET(AX_surfxml_link_bandwidth_file); YY_BREAK case 236: /* rule 236 can match eol */ YY_RULE_SETUP -if (surfxml_link_bandwidth_file_isset != 0) {FAIL("Multiple definition of attribute bandwidth_file in ");} surfxml_link_bandwidth_file_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_link_bandwidth_file); +ENTER(VALUE2); BUFFERSET(AX_surfxml_link_bandwidth_file); YY_BREAK case 237: /* rule 237 can match eol */ YY_RULE_SETUP -if (surfxml_link_latency_isset != 0) {FAIL("Multiple definition of attribute latency in ");} surfxml_link_latency_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_link_latency); +ENTER(VALUE1); BUFFERSET(AX_surfxml_link_latency); YY_BREAK case 238: /* rule 238 can match eol */ YY_RULE_SETUP -if (surfxml_link_latency_isset != 0) {FAIL("Multiple definition of attribute latency in ");} surfxml_link_latency_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_link_latency); +ENTER(VALUE2); BUFFERSET(AX_surfxml_link_latency); YY_BREAK case 239: /* rule 239 can match eol */ YY_RULE_SETUP -if (surfxml_link_latency_file_isset != 0) {FAIL("Multiple definition of attribute latency_file in ");} surfxml_link_latency_file_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_link_latency_file); +ENTER(VALUE1); BUFFERSET(AX_surfxml_link_latency_file); YY_BREAK case 240: /* rule 240 can match eol */ YY_RULE_SETUP -if (surfxml_link_latency_file_isset != 0) {FAIL("Multiple definition of attribute latency_file in ");} surfxml_link_latency_file_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_link_latency_file); +ENTER(VALUE2); BUFFERSET(AX_surfxml_link_latency_file); YY_BREAK case 241: /* rule 241 can match eol */ @@ -5747,12 +5607,12 @@ A_surfxml_link_state = A_surfxml_link_state_OFF; case 245: /* rule 245 can match eol */ YY_RULE_SETUP -if (surfxml_link_state_file_isset != 0) {FAIL("Multiple definition of attribute state_file in ");} surfxml_link_state_file_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_link_state_file); +ENTER(VALUE1); BUFFERSET(AX_surfxml_link_state_file); YY_BREAK case 246: /* rule 246 can match eol */ YY_RULE_SETUP -if (surfxml_link_state_file_isset != 0) {FAIL("Multiple definition of attribute state_file in ");} surfxml_link_state_file_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_link_state_file); +ENTER(VALUE2); BUFFERSET(AX_surfxml_link_state_file); YY_BREAK case 247: /* rule 247 can match eol */ @@ -5845,11 +5705,8 @@ case 261: YY_RULE_SETUP { AX_surfxml_route_src = 0; - surfxml_route_src_isset = 0; AX_surfxml_route_dst = 0; - surfxml_route_dst_isset = 0; AX_surfxml_route_symmetrical = A_surfxml_route_symmetrical_YES; - surfxml_route_symmetrical_isset = 0; ENTER(AL_surfxml_route); pushbuffer(0); } YY_BREAK @@ -5857,22 +5714,22 @@ YY_RULE_SETUP case 262: /* rule 262 can match eol */ YY_RULE_SETUP -if (surfxml_route_src_isset != 0) {FAIL("Multiple definition of attribute src in ");} surfxml_route_src_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_route_src); +ENTER(VALUE1); BUFFERSET(AX_surfxml_route_src); YY_BREAK case 263: /* rule 263 can match eol */ YY_RULE_SETUP -if (surfxml_route_src_isset != 0) {FAIL("Multiple definition of attribute src in ");} surfxml_route_src_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_route_src); +ENTER(VALUE2); BUFFERSET(AX_surfxml_route_src); YY_BREAK case 264: /* rule 264 can match eol */ YY_RULE_SETUP -if (surfxml_route_dst_isset != 0) {FAIL("Multiple definition of attribute dst in ");} surfxml_route_dst_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_route_dst); +ENTER(VALUE1); BUFFERSET(AX_surfxml_route_dst); YY_BREAK case 265: /* rule 265 can match eol */ YY_RULE_SETUP -if (surfxml_route_dst_isset != 0) {FAIL("Multiple definition of attribute dst in ");} surfxml_route_dst_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_route_dst); +ENTER(VALUE2); BUFFERSET(AX_surfxml_route_dst); YY_BREAK case 266: /* rule 266 can match eol */ @@ -5956,15 +5813,10 @@ case 278: YY_RULE_SETUP { AX_surfxml_ASroute_src = 0; - surfxml_ASroute_src_isset = 0; AX_surfxml_ASroute_dst = 0; - surfxml_ASroute_dst_isset = 0; AX_surfxml_ASroute_gw_src = 0; - surfxml_ASroute_gw_src_isset = 0; AX_surfxml_ASroute_gw_dst = 0; - surfxml_ASroute_gw_dst_isset = 0; AX_surfxml_ASroute_symmetrical = A_surfxml_ASroute_symmetrical_YES; - surfxml_ASroute_symmetrical_isset = 0; ENTER(AL_surfxml_ASroute); pushbuffer(0); } YY_BREAK @@ -5972,42 +5824,42 @@ YY_RULE_SETUP case 279: /* rule 279 can match eol */ YY_RULE_SETUP -if (surfxml_ASroute_src_isset != 0) {FAIL("Multiple definition of attribute src in ");} surfxml_ASroute_src_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_ASroute_src); +ENTER(VALUE1); BUFFERSET(AX_surfxml_ASroute_src); YY_BREAK case 280: /* rule 280 can match eol */ YY_RULE_SETUP -if (surfxml_ASroute_src_isset != 0) {FAIL("Multiple definition of attribute src in ");} surfxml_ASroute_src_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_ASroute_src); +ENTER(VALUE2); BUFFERSET(AX_surfxml_ASroute_src); YY_BREAK case 281: /* rule 281 can match eol */ YY_RULE_SETUP -if (surfxml_ASroute_dst_isset != 0) {FAIL("Multiple definition of attribute dst in ");} surfxml_ASroute_dst_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_ASroute_dst); +ENTER(VALUE1); BUFFERSET(AX_surfxml_ASroute_dst); YY_BREAK case 282: /* rule 282 can match eol */ YY_RULE_SETUP -if (surfxml_ASroute_dst_isset != 0) {FAIL("Multiple definition of attribute dst in ");} surfxml_ASroute_dst_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_ASroute_dst); +ENTER(VALUE2); BUFFERSET(AX_surfxml_ASroute_dst); YY_BREAK case 283: /* rule 283 can match eol */ YY_RULE_SETUP -if (surfxml_ASroute_gw_src_isset != 0) {FAIL("Multiple definition of attribute gw_src in ");} surfxml_ASroute_gw_src_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_ASroute_gw_src); +ENTER(VALUE1); BUFFERSET(AX_surfxml_ASroute_gw_src); YY_BREAK case 284: /* rule 284 can match eol */ YY_RULE_SETUP -if (surfxml_ASroute_gw_src_isset != 0) {FAIL("Multiple definition of attribute gw_src in ");} surfxml_ASroute_gw_src_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_ASroute_gw_src); +ENTER(VALUE2); BUFFERSET(AX_surfxml_ASroute_gw_src); YY_BREAK case 285: /* rule 285 can match eol */ YY_RULE_SETUP -if (surfxml_ASroute_gw_dst_isset != 0) {FAIL("Multiple definition of attribute gw_dst in ");} surfxml_ASroute_gw_dst_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_ASroute_gw_dst); +ENTER(VALUE1); BUFFERSET(AX_surfxml_ASroute_gw_dst); YY_BREAK case 286: /* rule 286 can match eol */ YY_RULE_SETUP -if (surfxml_ASroute_gw_dst_isset != 0) {FAIL("Multiple definition of attribute gw_dst in ");} surfxml_ASroute_gw_dst_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_ASroute_gw_dst); +ENTER(VALUE2); BUFFERSET(AX_surfxml_ASroute_gw_dst); YY_BREAK case 287: /* rule 287 can match eol */ @@ -6095,9 +5947,7 @@ case 299: YY_RULE_SETUP { AX_surfxml_link_ctn_id = 0; - surfxml_link_ctn_id_isset = 0; AX_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE; - surfxml_link_ctn_direction_isset = 0; ENTER(AL_surfxml_link_ctn); pushbuffer(0); } YY_BREAK @@ -6105,12 +5955,12 @@ YY_RULE_SETUP case 300: /* rule 300 can match eol */ YY_RULE_SETUP -if (surfxml_link_ctn_id_isset != 0) {FAIL("Multiple definition of attribute id in ");} surfxml_link_ctn_id_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_link_ctn_id); +ENTER(VALUE1); BUFFERSET(AX_surfxml_link_ctn_id); YY_BREAK case 301: /* rule 301 can match eol */ YY_RULE_SETUP -if (surfxml_link_ctn_id_isset != 0) {FAIL("Multiple definition of attribute id in ");} surfxml_link_ctn_id_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_link_ctn_id); +ENTER(VALUE2); BUFFERSET(AX_surfxml_link_ctn_id); YY_BREAK case 302: /* rule 302 can match eol */ @@ -6201,13 +6051,9 @@ case 316: YY_RULE_SETUP { AX_surfxml_bypassRoute_src = 0; - surfxml_bypassRoute_src_isset = 0; AX_surfxml_bypassRoute_dst = 0; - surfxml_bypassRoute_dst_isset = 0; AX_surfxml_bypassRoute_gw_src = 0; - surfxml_bypassRoute_gw_src_isset = 0; AX_surfxml_bypassRoute_gw_dst = 0; - surfxml_bypassRoute_gw_dst_isset = 0; ENTER(AL_surfxml_bypassRoute); pushbuffer(0); } YY_BREAK @@ -6215,42 +6061,42 @@ YY_RULE_SETUP case 317: /* rule 317 can match eol */ YY_RULE_SETUP -if (surfxml_bypassRoute_src_isset != 0) {FAIL("Multiple definition of attribute src in ");} surfxml_bypassRoute_src_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_bypassRoute_src); +ENTER(VALUE1); BUFFERSET(AX_surfxml_bypassRoute_src); YY_BREAK case 318: /* rule 318 can match eol */ YY_RULE_SETUP -if (surfxml_bypassRoute_src_isset != 0) {FAIL("Multiple definition of attribute src in ");} surfxml_bypassRoute_src_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_bypassRoute_src); +ENTER(VALUE2); BUFFERSET(AX_surfxml_bypassRoute_src); YY_BREAK case 319: /* rule 319 can match eol */ YY_RULE_SETUP -if (surfxml_bypassRoute_dst_isset != 0) {FAIL("Multiple definition of attribute dst in ");} surfxml_bypassRoute_dst_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_bypassRoute_dst); +ENTER(VALUE1); BUFFERSET(AX_surfxml_bypassRoute_dst); YY_BREAK case 320: /* rule 320 can match eol */ YY_RULE_SETUP -if (surfxml_bypassRoute_dst_isset != 0) {FAIL("Multiple definition of attribute dst in ");} surfxml_bypassRoute_dst_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_bypassRoute_dst); +ENTER(VALUE2); BUFFERSET(AX_surfxml_bypassRoute_dst); YY_BREAK case 321: /* rule 321 can match eol */ YY_RULE_SETUP -if (surfxml_bypassRoute_gw_src_isset != 0) {FAIL("Multiple definition of attribute gw_src in ");} surfxml_bypassRoute_gw_src_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_bypassRoute_gw_src); +ENTER(VALUE1); BUFFERSET(AX_surfxml_bypassRoute_gw_src); YY_BREAK case 322: /* rule 322 can match eol */ YY_RULE_SETUP -if (surfxml_bypassRoute_gw_src_isset != 0) {FAIL("Multiple definition of attribute gw_src in ");} surfxml_bypassRoute_gw_src_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_bypassRoute_gw_src); +ENTER(VALUE2); BUFFERSET(AX_surfxml_bypassRoute_gw_src); YY_BREAK case 323: /* rule 323 can match eol */ YY_RULE_SETUP -if (surfxml_bypassRoute_gw_dst_isset != 0) {FAIL("Multiple definition of attribute gw_dst in ");} surfxml_bypassRoute_gw_dst_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_bypassRoute_gw_dst); +ENTER(VALUE1); BUFFERSET(AX_surfxml_bypassRoute_gw_dst); YY_BREAK case 324: /* rule 324 can match eol */ YY_RULE_SETUP -if (surfxml_bypassRoute_gw_dst_isset != 0) {FAIL("Multiple definition of attribute gw_dst in ");} surfxml_bypassRoute_gw_dst_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_bypassRoute_gw_dst); +ENTER(VALUE2); BUFFERSET(AX_surfxml_bypassRoute_gw_dst); YY_BREAK case 325: YY_RULE_SETUP @@ -6324,13 +6170,9 @@ case 333: YY_RULE_SETUP { AX_surfxml_process_host = 0; - surfxml_process_host_isset = 0; AX_surfxml_process_function = 0; - surfxml_process_function_isset = 0; AX_surfxml_process_start_time = 28; - surfxml_process_start_time_isset = 0; AX_surfxml_process_kill_time = 33; - surfxml_process_kill_time_isset = 0; ENTER(AL_surfxml_process); pushbuffer(0); } YY_BREAK @@ -6338,42 +6180,42 @@ YY_RULE_SETUP case 334: /* rule 334 can match eol */ YY_RULE_SETUP -if (surfxml_process_host_isset != 0) {FAIL("Multiple definition of attribute host in ");} surfxml_process_host_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_process_host); +ENTER(VALUE1); BUFFERSET(AX_surfxml_process_host); YY_BREAK case 335: /* rule 335 can match eol */ YY_RULE_SETUP -if (surfxml_process_host_isset != 0) {FAIL("Multiple definition of attribute host in ");} surfxml_process_host_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_process_host); +ENTER(VALUE2); BUFFERSET(AX_surfxml_process_host); YY_BREAK case 336: /* rule 336 can match eol */ YY_RULE_SETUP -if (surfxml_process_function_isset != 0) {FAIL("Multiple definition of attribute function in ");} surfxml_process_function_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_process_function); +ENTER(VALUE1); BUFFERSET(AX_surfxml_process_function); YY_BREAK case 337: /* rule 337 can match eol */ YY_RULE_SETUP -if (surfxml_process_function_isset != 0) {FAIL("Multiple definition of attribute function in ");} surfxml_process_function_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_process_function); +ENTER(VALUE2); BUFFERSET(AX_surfxml_process_function); YY_BREAK case 338: /* rule 338 can match eol */ YY_RULE_SETUP -if (surfxml_process_start_time_isset != 0) {FAIL("Multiple definition of attribute start_time in ");} surfxml_process_start_time_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_process_start_time); +ENTER(VALUE1); BUFFERSET(AX_surfxml_process_start_time); YY_BREAK case 339: /* rule 339 can match eol */ YY_RULE_SETUP -if (surfxml_process_start_time_isset != 0) {FAIL("Multiple definition of attribute start_time in ");} surfxml_process_start_time_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_process_start_time); +ENTER(VALUE2); BUFFERSET(AX_surfxml_process_start_time); YY_BREAK case 340: /* rule 340 can match eol */ YY_RULE_SETUP -if (surfxml_process_kill_time_isset != 0) {FAIL("Multiple definition of attribute kill_time in ");} surfxml_process_kill_time_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_process_kill_time); +ENTER(VALUE1); BUFFERSET(AX_surfxml_process_kill_time); YY_BREAK case 341: /* rule 341 can match eol */ YY_RULE_SETUP -if (surfxml_process_kill_time_isset != 0) {FAIL("Multiple definition of attribute kill_time in ");} surfxml_process_kill_time_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_process_kill_time); +ENTER(VALUE2); BUFFERSET(AX_surfxml_process_kill_time); YY_BREAK case 342: YY_RULE_SETUP @@ -6443,7 +6285,6 @@ case 350: YY_RULE_SETUP { AX_surfxml_argument_value = 0; - surfxml_argument_value_isset = 0; ENTER(AL_surfxml_argument); pushbuffer(0); } YY_BREAK @@ -6451,12 +6292,12 @@ YY_RULE_SETUP case 351: /* rule 351 can match eol */ YY_RULE_SETUP -if (surfxml_argument_value_isset != 0) {FAIL("Multiple definition of attribute value in ");} surfxml_argument_value_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_argument_value); +ENTER(VALUE1); BUFFERSET(AX_surfxml_argument_value); YY_BREAK case 352: /* rule 352 can match eol */ YY_RULE_SETUP -if (surfxml_argument_value_isset != 0) {FAIL("Multiple definition of attribute value in ");} surfxml_argument_value_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_argument_value); +ENTER(VALUE2); BUFFERSET(AX_surfxml_argument_value); YY_BREAK case 353: YY_RULE_SETUP @@ -6522,7 +6363,6 @@ case 361: YY_RULE_SETUP { AX_surfxml_config_id = 0; - surfxml_config_id_isset = 0; ENTER(AL_surfxml_config); pushbuffer(0); } YY_BREAK @@ -6530,12 +6370,12 @@ YY_RULE_SETUP case 362: /* rule 362 can match eol */ YY_RULE_SETUP -if (surfxml_config_id_isset != 0) {FAIL("Multiple definition of attribute id in ");} surfxml_config_id_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_config_id); +ENTER(VALUE1); BUFFERSET(AX_surfxml_config_id); YY_BREAK case 363: /* rule 363 can match eol */ YY_RULE_SETUP -if (surfxml_config_id_isset != 0) {FAIL("Multiple definition of attribute id in ");} surfxml_config_id_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_config_id); +ENTER(VALUE2); BUFFERSET(AX_surfxml_config_id); YY_BREAK case 364: YY_RULE_SETUP @@ -6603,9 +6443,7 @@ case 372: YY_RULE_SETUP { AX_surfxml_prop_id = 0; - surfxml_prop_id_isset = 0; AX_surfxml_prop_value = 0; - surfxml_prop_value_isset = 0; ENTER(AL_surfxml_prop); pushbuffer(0); } YY_BREAK @@ -6613,22 +6451,22 @@ YY_RULE_SETUP case 373: /* rule 373 can match eol */ YY_RULE_SETUP -if (surfxml_prop_id_isset != 0) {FAIL("Multiple definition of attribute id in ");} surfxml_prop_id_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_prop_id); +ENTER(VALUE1); BUFFERSET(AX_surfxml_prop_id); YY_BREAK case 374: /* rule 374 can match eol */ YY_RULE_SETUP -if (surfxml_prop_id_isset != 0) {FAIL("Multiple definition of attribute id in ");} surfxml_prop_id_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_prop_id); +ENTER(VALUE2); BUFFERSET(AX_surfxml_prop_id); YY_BREAK case 375: /* rule 375 can match eol */ YY_RULE_SETUP -if (surfxml_prop_value_isset != 0) {FAIL("Multiple definition of attribute value in ");} surfxml_prop_value_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_prop_value); +ENTER(VALUE1); BUFFERSET(AX_surfxml_prop_value); YY_BREAK case 376: /* rule 376 can match eol */ YY_RULE_SETUP -if (surfxml_prop_value_isset != 0) {FAIL("Multiple definition of attribute value in ");} surfxml_prop_value_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_prop_value); +ENTER(VALUE2); BUFFERSET(AX_surfxml_prop_value); YY_BREAK case 377: YY_RULE_SETUP diff --git a/src/xbt/graphxml.c b/src/xbt/graphxml.c index c3353c3761..59d9895d55 100644 --- a/src/xbt/graphxml.c +++ b/src/xbt/graphxml.c @@ -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-2011 Martin Quinson. All rights reserved. - * (Id: flexml.pl,v 1.67 2011/11/01 20:49:21 mquinson Exp). + * FleXML is Copyright (C) 2003-2006 Martin Quinson. All rights reserved. + * (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. * @@ -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-2011 Martin Quinson. All rights reserved. + * and Copyright (C) 2003-2006 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.67 2011/11/01 20:49:21 mquinson Exp $"; + "$" "Id: flexml.pl,v 1.62 2007/10/11 10:00:14 mquinson Exp $"; /* ANSI headers. */ #include /* for realloc() -- needed here when using flex 2.5.4 */ @@ -1140,40 +1140,28 @@ 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 @@ -1776,7 +1764,6 @@ case 19: YY_RULE_SETUP { AX_graphxml_graph_isDirected = A_graphxml_graph_isDirected_true; - graphxml_graph_isDirected_isset = 0; ENTER(AL_graphxml_graph); pushbuffer(0); } YY_BREAK @@ -1867,15 +1854,10 @@ case 32: YY_RULE_SETUP { AX_graphxml_node_label = 0; - graphxml_node_label_isset = 0; AX_graphxml_node_name = 0; - graphxml_node_name_isset = 0; AX_graphxml_node_data = 0; - graphxml_node_data_isset = 0; AX_graphxml_node_position_x = 1; - graphxml_node_position_x_isset = 0; AX_graphxml_node_position_y = 6; - graphxml_node_position_y_isset = 0; ENTER(AL_graphxml_node); pushbuffer(0); } YY_BREAK @@ -1883,52 +1865,52 @@ YY_RULE_SETUP case 33: /* rule 33 can match eol */ YY_RULE_SETUP -if (graphxml_node_label_isset != 0) {FAIL("Multiple definition of attribute label in ");} graphxml_node_label_isset = 1; ENTER(VALUE1); BUFFERSET(AX_graphxml_node_label); +ENTER(VALUE1); BUFFERSET(AX_graphxml_node_label); YY_BREAK case 34: /* rule 34 can match eol */ YY_RULE_SETUP -if (graphxml_node_label_isset != 0) {FAIL("Multiple definition of attribute label in ");} graphxml_node_label_isset = 1; ENTER(VALUE2); BUFFERSET(AX_graphxml_node_label); +ENTER(VALUE2); BUFFERSET(AX_graphxml_node_label); YY_BREAK case 35: /* rule 35 can match eol */ YY_RULE_SETUP -if (graphxml_node_name_isset != 0) {FAIL("Multiple definition of attribute name in ");} graphxml_node_name_isset = 1; ENTER(VALUE1); BUFFERSET(AX_graphxml_node_name); +ENTER(VALUE1); BUFFERSET(AX_graphxml_node_name); YY_BREAK case 36: /* rule 36 can match eol */ YY_RULE_SETUP -if (graphxml_node_name_isset != 0) {FAIL("Multiple definition of attribute name in ");} graphxml_node_name_isset = 1; ENTER(VALUE2); BUFFERSET(AX_graphxml_node_name); +ENTER(VALUE2); BUFFERSET(AX_graphxml_node_name); YY_BREAK case 37: /* rule 37 can match eol */ YY_RULE_SETUP -if (graphxml_node_data_isset != 0) {FAIL("Multiple definition of attribute data in ");} graphxml_node_data_isset = 1; ENTER(VALUE1); BUFFERSET(AX_graphxml_node_data); +ENTER(VALUE1); BUFFERSET(AX_graphxml_node_data); YY_BREAK case 38: /* rule 38 can match eol */ YY_RULE_SETUP -if (graphxml_node_data_isset != 0) {FAIL("Multiple definition of attribute data in ");} graphxml_node_data_isset = 1; ENTER(VALUE2); BUFFERSET(AX_graphxml_node_data); +ENTER(VALUE2); BUFFERSET(AX_graphxml_node_data); YY_BREAK case 39: /* rule 39 can match eol */ YY_RULE_SETUP -if (graphxml_node_position_x_isset != 0) {FAIL("Multiple definition of attribute position_x in ");} graphxml_node_position_x_isset = 1; ENTER(VALUE1); BUFFERSET(AX_graphxml_node_position_x); +ENTER(VALUE1); BUFFERSET(AX_graphxml_node_position_x); YY_BREAK case 40: /* rule 40 can match eol */ YY_RULE_SETUP -if (graphxml_node_position_x_isset != 0) {FAIL("Multiple definition of attribute position_x in ");} graphxml_node_position_x_isset = 1; ENTER(VALUE2); BUFFERSET(AX_graphxml_node_position_x); +ENTER(VALUE2); BUFFERSET(AX_graphxml_node_position_x); YY_BREAK case 41: /* rule 41 can match eol */ YY_RULE_SETUP -if (graphxml_node_position_y_isset != 0) {FAIL("Multiple definition of attribute position_y in ");} graphxml_node_position_y_isset = 1; ENTER(VALUE1); BUFFERSET(AX_graphxml_node_position_y); +ENTER(VALUE1); BUFFERSET(AX_graphxml_node_position_y); YY_BREAK case 42: /* rule 42 can match eol */ YY_RULE_SETUP -if (graphxml_node_position_y_isset != 0) {FAIL("Multiple definition of attribute position_y in ");} graphxml_node_position_y_isset = 1; ENTER(VALUE2); BUFFERSET(AX_graphxml_node_position_y); +ENTER(VALUE2); BUFFERSET(AX_graphxml_node_position_y); YY_BREAK case 43: YY_RULE_SETUP @@ -2003,17 +1985,11 @@ case 51: YY_RULE_SETUP { AX_graphxml_edge_label = 0; - graphxml_edge_label_isset = 0; AX_graphxml_edge_name = 0; - graphxml_edge_name_isset = 0; AX_graphxml_edge_source = 0; - graphxml_edge_source_isset = 0; AX_graphxml_edge_target = 0; - graphxml_edge_target_isset = 0; AX_graphxml_edge_length = 11; - graphxml_edge_length_isset = 0; AX_graphxml_edge_data = 0; - graphxml_edge_data_isset = 0; ENTER(AL_graphxml_edge); pushbuffer(0); } YY_BREAK @@ -2021,62 +1997,62 @@ YY_RULE_SETUP case 52: /* rule 52 can match eol */ YY_RULE_SETUP -if (graphxml_edge_label_isset != 0) {FAIL("Multiple definition of attribute label in ");} graphxml_edge_label_isset = 1; ENTER(VALUE1); BUFFERSET(AX_graphxml_edge_label); +ENTER(VALUE1); BUFFERSET(AX_graphxml_edge_label); YY_BREAK case 53: /* rule 53 can match eol */ YY_RULE_SETUP -if (graphxml_edge_label_isset != 0) {FAIL("Multiple definition of attribute label in ");} graphxml_edge_label_isset = 1; ENTER(VALUE2); BUFFERSET(AX_graphxml_edge_label); +ENTER(VALUE2); BUFFERSET(AX_graphxml_edge_label); YY_BREAK case 54: /* rule 54 can match eol */ YY_RULE_SETUP -if (graphxml_edge_name_isset != 0) {FAIL("Multiple definition of attribute name in ");} graphxml_edge_name_isset = 1; ENTER(VALUE1); BUFFERSET(AX_graphxml_edge_name); +ENTER(VALUE1); BUFFERSET(AX_graphxml_edge_name); YY_BREAK case 55: /* rule 55 can match eol */ YY_RULE_SETUP -if (graphxml_edge_name_isset != 0) {FAIL("Multiple definition of attribute name in ");} graphxml_edge_name_isset = 1; ENTER(VALUE2); BUFFERSET(AX_graphxml_edge_name); +ENTER(VALUE2); BUFFERSET(AX_graphxml_edge_name); YY_BREAK case 56: /* rule 56 can match eol */ YY_RULE_SETUP -if (graphxml_edge_source_isset != 0) {FAIL("Multiple definition of attribute source in ");} graphxml_edge_source_isset = 1; ENTER(VALUE1); BUFFERSET(AX_graphxml_edge_source); +ENTER(VALUE1); BUFFERSET(AX_graphxml_edge_source); YY_BREAK case 57: /* rule 57 can match eol */ YY_RULE_SETUP -if (graphxml_edge_source_isset != 0) {FAIL("Multiple definition of attribute source in ");} graphxml_edge_source_isset = 1; ENTER(VALUE2); BUFFERSET(AX_graphxml_edge_source); +ENTER(VALUE2); BUFFERSET(AX_graphxml_edge_source); YY_BREAK case 58: /* rule 58 can match eol */ YY_RULE_SETUP -if (graphxml_edge_target_isset != 0) {FAIL("Multiple definition of attribute target in ");} graphxml_edge_target_isset = 1; ENTER(VALUE1); BUFFERSET(AX_graphxml_edge_target); +ENTER(VALUE1); BUFFERSET(AX_graphxml_edge_target); YY_BREAK case 59: /* rule 59 can match eol */ YY_RULE_SETUP -if (graphxml_edge_target_isset != 0) {FAIL("Multiple definition of attribute target in ");} graphxml_edge_target_isset = 1; ENTER(VALUE2); BUFFERSET(AX_graphxml_edge_target); +ENTER(VALUE2); BUFFERSET(AX_graphxml_edge_target); YY_BREAK case 60: /* rule 60 can match eol */ YY_RULE_SETUP -if (graphxml_edge_length_isset != 0) {FAIL("Multiple definition of attribute length in ");} graphxml_edge_length_isset = 1; ENTER(VALUE1); BUFFERSET(AX_graphxml_edge_length); +ENTER(VALUE1); BUFFERSET(AX_graphxml_edge_length); YY_BREAK case 61: /* rule 61 can match eol */ YY_RULE_SETUP -if (graphxml_edge_length_isset != 0) {FAIL("Multiple definition of attribute length in ");} graphxml_edge_length_isset = 1; ENTER(VALUE2); BUFFERSET(AX_graphxml_edge_length); +ENTER(VALUE2); BUFFERSET(AX_graphxml_edge_length); YY_BREAK case 62: /* rule 62 can match eol */ YY_RULE_SETUP -if (graphxml_edge_data_isset != 0) {FAIL("Multiple definition of attribute data in ");} graphxml_edge_data_isset = 1; ENTER(VALUE1); BUFFERSET(AX_graphxml_edge_data); +ENTER(VALUE1); BUFFERSET(AX_graphxml_edge_data); YY_BREAK case 63: /* rule 63 can match eol */ YY_RULE_SETUP -if (graphxml_edge_data_isset != 0) {FAIL("Multiple definition of attribute data in ");} graphxml_edge_data_isset = 1; ENTER(VALUE2); BUFFERSET(AX_graphxml_edge_data); +ENTER(VALUE2); BUFFERSET(AX_graphxml_edge_data); YY_BREAK case 64: YY_RULE_SETUP diff --git a/teshsuite/simdag/platforms/basic_parsing_test.tesh b/teshsuite/simdag/platforms/basic_parsing_test.tesh index 6561fbbde8..c83d2aed24 100644 --- a/teshsuite/simdag/platforms/basic_parsing_test.tesh +++ b/teshsuite/simdag/platforms/basic_parsing_test.tesh @@ -1,6 +1,6 @@ $ ${bindir:=.}/basic_parsing_test one_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 -> Workstation number: 5, link number: 7 +> Workstation number: 5, link number: 12 $ ${bindir:=.}/basic_parsing_test one_host_availability.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 @@ -56,7 +56,7 @@ $ ${bindir:=.}/basic_parsing_test three_hosts_non_symmetric_route.xml "--log=roo $ ${bindir:=.}/basic_parsing_test two_clusters.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 -> Workstation number: 10, link number: 14 +> Workstation number: 10, link number: 24 $ ${bindir:=.}/basic_parsing_test two_hosts_multi_hop.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 @@ -93,7 +93,7 @@ $ ${bindir:=.}/basic_parsing_test ./properties.xml --cfg=cpu/optim:TI $ ${bindir:=.}/basic_parsing_test ./one_cluster_file.xml > [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 -> Workstation number: 2, link number: 4 +> Workstation number: 2, link number: 6 $ ${bindir:=.}/is_router_test ./test_of_is_router.xml > [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 @@ -122,12 +122,12 @@ $ ${bindir:=.}/is_router_test ./test_of_is_router.xml $ ${bindir:=.}/basic_parsing_test ./Two_clusters_rulebased.xml ONE_LINK > [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 -> Workstation number: 4, link number: 8 +> Workstation number: 4, link number: 12 > Route between c-0.me and c-3.me > Route size 5 -> Link my_cluster_1_link_0: latency = 0.000050, bandwidth = 125000000.000000 +> Link my_cluster_1_link_0_UP: latency = 0.000050, bandwidth = 125000000.000000 > Link my_cluster_1_backbone: latency = 0.000500, bandwidth = 2250000000.000000 > Link backbone: latency = 0.000500, bandwidth = 1250000000.000000 > Link my_cluster_2_backbone: latency = 0.000500, bandwidth = 2250000000.000000 -> Link my_cluster_2_link_3: latency = 0.000050, bandwidth = 125000000.000000 -> Route latency = 0.001600, route bandwidth = 125000000.000000 \ No newline at end of file +> Link my_cluster_2_link_3_DOWN: latency = 0.000050, bandwidth = 125000000.000000 +> Route latency = 0.001600, route bandwidth = 125000000.000000 diff --git a/teshsuite/simdag/platforms/basic_parsing_test_bypass.tesh b/teshsuite/simdag/platforms/basic_parsing_test_bypass.tesh index 3226af8829..c51b83c6f2 100644 --- a/teshsuite/simdag/platforms/basic_parsing_test_bypass.tesh +++ b/teshsuite/simdag/platforms/basic_parsing_test_bypass.tesh @@ -1,10 +1,10 @@ $ ${bindir:=.}/basic_parsing_test ./three_clusters_bypass.xml FULL_LINK > [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 -> Workstation number: 3, link number: 8 +> Workstation number: 3, link number: 11 > Route between 1 and 1 > Route size 2 -> Link my_cluster_1_link_1: latency = 0.000050, bandwidth = 125000000.000000 -> Link my_cluster_1_link_1: latency = 0.000050, bandwidth = 125000000.000000 +> Link my_cluster_1_link_1_UP: latency = 0.000050, bandwidth = 125000000.000000 +> Link my_cluster_1_link_1_DOWN: latency = 0.000050, bandwidth = 125000000.000000 > Route latency = 0.000100, route bandwidth = 125000000.000000 > Route between 1 and 2 > Route size 1 @@ -12,46 +12,46 @@ $ ${bindir:=.}/basic_parsing_test ./three_clusters_bypass.xml FULL_LINK > Route latency = 0.000500, route bandwidth = 1250000000.000000 > Route between 1 and 3 > Route size 4 -> Link my_cluster_1_link_1: latency = 0.000050, bandwidth = 125000000.000000 +> Link my_cluster_1_link_1_UP: latency = 0.000050, bandwidth = 125000000.000000 > Link link1: latency = 0.000500, bandwidth = 1250000000.000000 > Link link3: latency = 0.000500, bandwidth = 1250000000.000000 -> Link my_cluster_3_link_3: latency = 0.000050, bandwidth = 125000000.000000 +> Link my_cluster_3_link_3_DOWN: latency = 0.000050, bandwidth = 125000000.000000 > Route latency = 0.001100, route bandwidth = 125000000.000000 > Route between 2 and 1 > Route size 4 -> Link my_cluster_2_link_2: latency = 0.000050, bandwidth = 125000000.000000 +> Link my_cluster_2_link_2_UP: latency = 0.000050, bandwidth = 125000000.000000 > Link link2: latency = 0.000500, bandwidth = 1250000000.000000 > Link link1: latency = 0.000500, bandwidth = 1250000000.000000 -> Link my_cluster_1_link_1: latency = 0.000050, bandwidth = 125000000.000000 +> Link my_cluster_1_link_1_DOWN: latency = 0.000050, bandwidth = 125000000.000000 > Route latency = 0.001100, route bandwidth = 125000000.000000 > Route between 2 and 2 > Route size 2 -> Link my_cluster_2_link_2: latency = 0.000050, bandwidth = 125000000.000000 -> Link my_cluster_2_link_2: latency = 0.000050, bandwidth = 125000000.000000 +> Link my_cluster_2_link_2_UP: latency = 0.000050, bandwidth = 125000000.000000 +> Link my_cluster_2_link_2_DOWN: latency = 0.000050, bandwidth = 125000000.000000 > Route latency = 0.000100, route bandwidth = 125000000.000000 > Route between 2 and 3 > Route size 4 -> Link my_cluster_2_link_2: latency = 0.000050, bandwidth = 125000000.000000 +> Link my_cluster_2_link_2_UP: latency = 0.000050, bandwidth = 125000000.000000 > Link link2: latency = 0.000500, bandwidth = 1250000000.000000 > Link link3: latency = 0.000500, bandwidth = 1250000000.000000 -> Link my_cluster_3_link_3: latency = 0.000050, bandwidth = 125000000.000000 +> Link my_cluster_3_link_3_DOWN: latency = 0.000050, bandwidth = 125000000.000000 > Route latency = 0.001100, route bandwidth = 125000000.000000 > Route between 3 and 1 > Route size 4 -> Link my_cluster_3_link_3: latency = 0.000050, bandwidth = 125000000.000000 +> Link my_cluster_3_link_3_UP: latency = 0.000050, bandwidth = 125000000.000000 > Link link3: latency = 0.000500, bandwidth = 1250000000.000000 > Link link1: latency = 0.000500, bandwidth = 1250000000.000000 -> Link my_cluster_1_link_1: latency = 0.000050, bandwidth = 125000000.000000 +> Link my_cluster_1_link_1_DOWN: latency = 0.000050, bandwidth = 125000000.000000 > Route latency = 0.001100, route bandwidth = 125000000.000000 > Route between 3 and 2 > Route size 4 -> Link my_cluster_3_link_3: latency = 0.000050, bandwidth = 125000000.000000 +> Link my_cluster_3_link_3_UP: latency = 0.000050, bandwidth = 125000000.000000 > Link link3: latency = 0.000500, bandwidth = 1250000000.000000 > Link link2: latency = 0.000500, bandwidth = 1250000000.000000 -> Link my_cluster_2_link_2: latency = 0.000050, bandwidth = 125000000.000000 +> Link my_cluster_2_link_2_DOWN: latency = 0.000050, bandwidth = 125000000.000000 > Route latency = 0.001100, route bandwidth = 125000000.000000 > Route between 3 and 3 > Route size 2 -> Link my_cluster_3_link_3: latency = 0.000050, bandwidth = 125000000.000000 -> Link my_cluster_3_link_3: latency = 0.000050, bandwidth = 125000000.000000 -> Route latency = 0.000100, route bandwidth = 125000000.000000 \ No newline at end of file +> Link my_cluster_3_link_3_UP: latency = 0.000050, bandwidth = 125000000.000000 +> Link my_cluster_3_link_3_DOWN: latency = 0.000050, bandwidth = 125000000.000000 +> Route latency = 0.000100, route bandwidth = 125000000.000000 diff --git a/teshsuite/simdag/platforms/basic_parsing_test_sym_full.tesh b/teshsuite/simdag/platforms/basic_parsing_test_sym_full.tesh index fa2352d335..d9a3e38a69 100644 --- a/teshsuite/simdag/platforms/basic_parsing_test_sym_full.tesh +++ b/teshsuite/simdag/platforms/basic_parsing_test_sym_full.tesh @@ -155,118 +155,118 @@ $ ${bindir:=.}/basic_parsing_test one_cluster_fullduplex.xml FULL_LINK "--log=ro $ ${bindir:=.}/basic_parsing_test two_clusters_symmetric.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 -> Workstation number: 4, link number: 8 +> Workstation number: 4, link number: 12 > Route between bob1.hamburger.edu and bob1.hamburger.edu > Route size 3 -> Link bob_cluster_link_1: latency = 0.000050, bandwidth = 125000000.000000 +> Link bob_cluster_link_1_UP: latency = 0.000050, bandwidth = 125000000.000000 > Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000 -> Link bob_cluster_link_1: latency = 0.000050, bandwidth = 125000000.000000 +> Link bob_cluster_link_1_DOWN: latency = 0.000050, bandwidth = 125000000.000000 > Route latency = 0.000600, route bandwidth = 125000000.000000 > Route between bob1.hamburger.edu and bob0.hamburger.edu > Route size 3 -> Link bob_cluster_link_1: latency = 0.000050, bandwidth = 125000000.000000 +> Link bob_cluster_link_1_UP: latency = 0.000050, bandwidth = 125000000.000000 > Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000 -> Link bob_cluster_link_0: latency = 0.000050, bandwidth = 125000000.000000 +> Link bob_cluster_link_0_DOWN: latency = 0.000050, bandwidth = 125000000.000000 > Route latency = 0.000600, route bandwidth = 125000000.000000 > Route between bob1.hamburger.edu and alice0.crepe.fr > Route size 5 -> Link bob_cluster_link_1: latency = 0.000050, bandwidth = 125000000.000000 +> Link bob_cluster_link_1_UP: latency = 0.000050, bandwidth = 125000000.000000 > Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000 > Link backbone: latency = 0.000500, bandwidth = 1250000000.000000 > Link alice_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000 -> Link alice_cluster_link_0: latency = 0.000050, bandwidth = 125000000.000000 +> Link alice_cluster_link_0_DOWN: latency = 0.000050, bandwidth = 125000000.000000 > Route latency = 0.001600, route bandwidth = 125000000.000000 > Route between bob1.hamburger.edu and alice1.crepe.fr > Route size 5 -> Link bob_cluster_link_1: latency = 0.000050, bandwidth = 125000000.000000 +> Link bob_cluster_link_1_UP: latency = 0.000050, bandwidth = 125000000.000000 > Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000 > Link backbone: latency = 0.000500, bandwidth = 1250000000.000000 > Link alice_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000 -> Link alice_cluster_link_1: latency = 0.000050, bandwidth = 125000000.000000 +> Link alice_cluster_link_1_DOWN: latency = 0.000050, bandwidth = 125000000.000000 > Route latency = 0.001600, route bandwidth = 125000000.000000 > Route between bob0.hamburger.edu and bob1.hamburger.edu > Route size 3 -> Link bob_cluster_link_0: latency = 0.000050, bandwidth = 125000000.000000 +> Link bob_cluster_link_0_UP: latency = 0.000050, bandwidth = 125000000.000000 > Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000 -> Link bob_cluster_link_1: latency = 0.000050, bandwidth = 125000000.000000 +> Link bob_cluster_link_1_DOWN: latency = 0.000050, bandwidth = 125000000.000000 > Route latency = 0.000600, route bandwidth = 125000000.000000 > Route between bob0.hamburger.edu and bob0.hamburger.edu > Route size 3 -> Link bob_cluster_link_0: latency = 0.000050, bandwidth = 125000000.000000 +> Link bob_cluster_link_0_UP: latency = 0.000050, bandwidth = 125000000.000000 > Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000 -> Link bob_cluster_link_0: latency = 0.000050, bandwidth = 125000000.000000 +> Link bob_cluster_link_0_DOWN: latency = 0.000050, bandwidth = 125000000.000000 > Route latency = 0.000600, route bandwidth = 125000000.000000 > Route between bob0.hamburger.edu and alice0.crepe.fr > Route size 5 -> Link bob_cluster_link_0: latency = 0.000050, bandwidth = 125000000.000000 +> Link bob_cluster_link_0_UP: latency = 0.000050, bandwidth = 125000000.000000 > Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000 > Link backbone: latency = 0.000500, bandwidth = 1250000000.000000 > Link alice_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000 -> Link alice_cluster_link_0: latency = 0.000050, bandwidth = 125000000.000000 +> Link alice_cluster_link_0_DOWN: latency = 0.000050, bandwidth = 125000000.000000 > Route latency = 0.001600, route bandwidth = 125000000.000000 > Route between bob0.hamburger.edu and alice1.crepe.fr > Route size 5 -> Link bob_cluster_link_0: latency = 0.000050, bandwidth = 125000000.000000 +> Link bob_cluster_link_0_UP: latency = 0.000050, bandwidth = 125000000.000000 > Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000 > Link backbone: latency = 0.000500, bandwidth = 1250000000.000000 > Link alice_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000 -> Link alice_cluster_link_1: latency = 0.000050, bandwidth = 125000000.000000 +> Link alice_cluster_link_1_DOWN: latency = 0.000050, bandwidth = 125000000.000000 > Route latency = 0.001600, route bandwidth = 125000000.000000 > Route between alice0.crepe.fr and bob1.hamburger.edu > Route size 5 -> Link alice_cluster_link_0: latency = 0.000050, bandwidth = 125000000.000000 +> Link alice_cluster_link_0_UP: latency = 0.000050, bandwidth = 125000000.000000 > Link alice_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000 > Link backbone: latency = 0.000500, bandwidth = 1250000000.000000 > Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000 -> Link bob_cluster_link_1: latency = 0.000050, bandwidth = 125000000.000000 +> Link bob_cluster_link_1_DOWN: latency = 0.000050, bandwidth = 125000000.000000 > Route latency = 0.001600, route bandwidth = 125000000.000000 > Route between alice0.crepe.fr and bob0.hamburger.edu > Route size 5 -> Link alice_cluster_link_0: latency = 0.000050, bandwidth = 125000000.000000 +> Link alice_cluster_link_0_UP: latency = 0.000050, bandwidth = 125000000.000000 > Link alice_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000 > Link backbone: latency = 0.000500, bandwidth = 1250000000.000000 > Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000 -> Link bob_cluster_link_0: latency = 0.000050, bandwidth = 125000000.000000 +> Link bob_cluster_link_0_DOWN: latency = 0.000050, bandwidth = 125000000.000000 > Route latency = 0.001600, route bandwidth = 125000000.000000 > Route between alice0.crepe.fr and alice0.crepe.fr > Route size 3 -> Link alice_cluster_link_0: latency = 0.000050, bandwidth = 125000000.000000 +> Link alice_cluster_link_0_UP: latency = 0.000050, bandwidth = 125000000.000000 > Link alice_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000 -> Link alice_cluster_link_0: latency = 0.000050, bandwidth = 125000000.000000 +> Link alice_cluster_link_0_DOWN: latency = 0.000050, bandwidth = 125000000.000000 > Route latency = 0.000600, route bandwidth = 125000000.000000 > Route between alice0.crepe.fr and alice1.crepe.fr > Route size 3 -> Link alice_cluster_link_0: latency = 0.000050, bandwidth = 125000000.000000 +> Link alice_cluster_link_0_UP: latency = 0.000050, bandwidth = 125000000.000000 > Link alice_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000 -> Link alice_cluster_link_1: latency = 0.000050, bandwidth = 125000000.000000 +> Link alice_cluster_link_1_DOWN: latency = 0.000050, bandwidth = 125000000.000000 > Route latency = 0.000600, route bandwidth = 125000000.000000 > Route between alice1.crepe.fr and bob1.hamburger.edu > Route size 5 -> Link alice_cluster_link_1: latency = 0.000050, bandwidth = 125000000.000000 +> Link alice_cluster_link_1_UP: latency = 0.000050, bandwidth = 125000000.000000 > Link alice_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000 > Link backbone: latency = 0.000500, bandwidth = 1250000000.000000 > Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000 -> Link bob_cluster_link_1: latency = 0.000050, bandwidth = 125000000.000000 +> Link bob_cluster_link_1_DOWN: latency = 0.000050, bandwidth = 125000000.000000 > Route latency = 0.001600, route bandwidth = 125000000.000000 > Route between alice1.crepe.fr and bob0.hamburger.edu > Route size 5 -> Link alice_cluster_link_1: latency = 0.000050, bandwidth = 125000000.000000 +> Link alice_cluster_link_1_UP: latency = 0.000050, bandwidth = 125000000.000000 > Link alice_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000 > Link backbone: latency = 0.000500, bandwidth = 1250000000.000000 > Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000 -> Link bob_cluster_link_0: latency = 0.000050, bandwidth = 125000000.000000 +> Link bob_cluster_link_0_DOWN: latency = 0.000050, bandwidth = 125000000.000000 > Route latency = 0.001600, route bandwidth = 125000000.000000 > Route between alice1.crepe.fr and alice0.crepe.fr > Route size 3 -> Link alice_cluster_link_1: latency = 0.000050, bandwidth = 125000000.000000 +> Link alice_cluster_link_1_UP: latency = 0.000050, bandwidth = 125000000.000000 > Link alice_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000 -> Link alice_cluster_link_0: latency = 0.000050, bandwidth = 125000000.000000 +> Link alice_cluster_link_0_DOWN: latency = 0.000050, bandwidth = 125000000.000000 > Route latency = 0.000600, route bandwidth = 125000000.000000 > Route between alice1.crepe.fr and alice1.crepe.fr > Route size 3 -> Link alice_cluster_link_1: latency = 0.000050, bandwidth = 125000000.000000 +> Link alice_cluster_link_1_UP: latency = 0.000050, bandwidth = 125000000.000000 > Link alice_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000 -> Link alice_cluster_link_1: latency = 0.000050, bandwidth = 125000000.000000 +> Link alice_cluster_link_1_DOWN: latency = 0.000050, bandwidth = 125000000.000000 > Route latency = 0.000600, route bandwidth = 125000000.000000 $ ${bindir:=.}/basic_parsing_test two_hosts_one_link_symmetrical.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" diff --git a/teshsuite/simdag/platforms/flatifier.tesh b/teshsuite/simdag/platforms/flatifier.tesh index bc0ac38a6a..f20b68c2cb 100644 --- a/teshsuite/simdag/platforms/flatifier.tesh +++ b/teshsuite/simdag/platforms/flatifier.tesh @@ -14,123 +14,127 @@ $ ${bindir:=.}/flatifier$EXEEXT one_cluster.xml "--log=root.fmt:[%10.6r]%e[%i:%P > > > -> -> -> -> -> +> +> +> +> +> +> +> +> +> +> > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > > > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > > - $ ${bindir:=.}/flatifier$EXEEXT one_host_availability.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07 > @@ -370,377 +374,387 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:% > > > -> -> -> -> -> +> +> +> +> +> +> +> +> +> +> > > -> -> -> -> -> +> +> +> +> +> +> +> +> +> +> > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > > @@ -749,34 +763,34 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:% > > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > > @@ -785,39 +799,38 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:% > > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > > - $ ${bindir:=.}/flatifier$EXEEXT two_hosts_multi_hop.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07 > @@ -887,62 +900,65 @@ $ ${bindir:=.}/flatifier$EXEEXT three_clusters_bypass.xml "--log=root.fmt:[%10.6 > > > -> -> -> +> +> +> +> +> +> > -> +> > > > > > -> +> > > > > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > > @@ -954,13 +970,13 @@ $ ${bindir:=.}/flatifier$EXEEXT three_clusters_bypass.xml "--log=root.fmt:[%10.6 > > > -> +> > > -> +> > > -> +> > > > @@ -972,13 +988,13 @@ $ ${bindir:=.}/flatifier$EXEEXT three_clusters_bypass.xml "--log=root.fmt:[%10.6 > > > -> +> > > > > > -> +> > > > @@ -990,13 +1006,13 @@ $ ${bindir:=.}/flatifier$EXEEXT three_clusters_bypass.xml "--log=root.fmt:[%10.6 > > > -> +> > > -> +> > > -> +> > > -> \ No newline at end of file +>