X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d3b82ab21c706eff03f671a2a997c20b2e29889e..7576230c94b48b0422725f7dec95dd2831cf57dc:/include/surf/simgrid_dtd.h diff --git a/include/surf/simgrid_dtd.h b/include/surf/simgrid_dtd.h index efcebe11b3..58c8693121 100644 --- a/include/surf/simgrid_dtd.h +++ b/include/surf/simgrid_dtd.h @@ -86,6 +86,8 @@ XBT_PUBLIC(void ) STag_surfxml_link_ctn(void); XBT_PUBLIC(void ) ETag_surfxml_link_ctn(void); XBT_PUBLIC(void ) STag_surfxml_bypassRoute(void); XBT_PUBLIC(void ) ETag_surfxml_bypassRoute(void); +XBT_PUBLIC(void ) STag_surfxml_bypassASroute(void); +XBT_PUBLIC(void ) ETag_surfxml_bypassASroute(void); XBT_PUBLIC(void ) STag_surfxml_process(void); XBT_PUBLIC(void ) ETag_surfxml_process(void); XBT_PUBLIC(void ) STag_surfxml_argument(void); @@ -110,6 +112,7 @@ typedef int AT_surfxml_host_id; typedef enum { AU_surfxml_ASroute_symmetrical, A_surfxml_ASroute_symmetrical_YES,A_surfxml_ASroute_symmetrical_NO } AT_surfxml_ASroute_symmetrical; typedef int AT_surfxml_peer_lat; #define AU_surfxml_peer_lat NULL +typedef enum { AU_surfxml_process_on_failure, A_surfxml_process_on_failure_DIE,A_surfxml_process_on_failure_RESTART } AT_surfxml_process_on_failure; typedef int AT_surfxml_link_latency_file; #define AU_surfxml_link_latency_file NULL typedef int AT_surfxml_peer_availability_file; @@ -128,6 +131,8 @@ typedef int AT_surfxml_process_start_time; #define AU_surfxml_process_start_time NULL typedef int AT_surfxml_cluster_suffix; #define AU_surfxml_cluster_suffix NULL +typedef int AT_surfxml_bypassASroute_dst; +#define AU_surfxml_bypassASroute_dst NULL typedef int AT_surfxml_ASroute_src; #define AU_surfxml_ASroute_src NULL typedef int AT_surfxml_cluster_prefix; @@ -145,6 +150,8 @@ typedef int AT_surfxml_peer_bw_out; #define AU_surfxml_peer_bw_out NULL typedef int AT_surfxml_cluster_availability_file; #define AU_surfxml_cluster_availability_file NULL +typedef int AT_surfxml_storage_content; +#define AU_surfxml_storage_content NULL typedef int AT_surfxml_process_kill_time; #define AU_surfxml_process_kill_time NULL typedef int AT_surfxml_cluster_bb_bw; @@ -154,8 +161,7 @@ typedef int AT_surfxml_argument_value; typedef enum { AU_surfxml_link_state, A_surfxml_link_state_ON,A_surfxml_link_state_OFF } AT_surfxml_link_state; typedef int AT_surfxml_ASroute_gw_src; #define AU_surfxml_ASroute_gw_src NULL -typedef int AT_surfxml_AS_routing; -#define AU_surfxml_AS_routing NULL +typedef enum { AU_surfxml_AS_routing, A_surfxml_AS_routing_Full,A_surfxml_AS_routing_Floyd,A_surfxml_AS_routing_Dijkstra,A_surfxml_AS_routing_DijkstraCache,A_surfxml_AS_routing_None,A_surfxml_AS_routing_RuleBased,A_surfxml_AS_routing_Vivaldi,A_surfxml_AS_routing_Cluster } AT_surfxml_AS_routing; typedef int AT_surfxml_link_bandwidth; #define AU_surfxml_link_bandwidth NULL typedef int AT_surfxml_cluster_id; @@ -164,6 +170,8 @@ typedef int AT_surfxml_peer_bw_in; #define AU_surfxml_peer_bw_in NULL typedef int AT_surfxml_random_mean; #define AU_surfxml_random_mean NULL +typedef int AT_surfxml_storage_type_size; +#define AU_surfxml_storage_type_size NULL typedef int AT_surfxml_cluster_bb_lat; #define AU_surfxml_cluster_bb_lat NULL typedef int AT_surfxml_link_latency; @@ -201,6 +209,8 @@ typedef int AT_surfxml_peer_coordinates; #define AU_surfxml_peer_coordinates NULL typedef int AT_surfxml_peer_state_file; #define AU_surfxml_peer_state_file NULL +typedef int AT_surfxml_bypassASroute_src; +#define AU_surfxml_bypassASroute_src NULL typedef int AT_surfxml_prop_value; #define AU_surfxml_prop_value NULL typedef int AT_surfxml_mstorage_typeId; @@ -211,6 +221,8 @@ typedef int AT_surfxml_link_state_file; #define AU_surfxml_link_state_file NULL typedef int AT_surfxml_random_radical; #define AU_surfxml_random_radical NULL +typedef int AT_surfxml_bypassASroute_gw_src; +#define AU_surfxml_bypassASroute_gw_src NULL typedef int AT_surfxml_trace_connect_trace; #define AU_surfxml_trace_connect_trace NULL typedef int AT_surfxml_mount_id; @@ -228,16 +240,14 @@ typedef int AT_surfxml_bypassRoute_dst; #define AU_surfxml_bypassRoute_dst NULL typedef int AT_surfxml_host_core; #define AU_surfxml_host_core NULL -typedef int AT_surfxml_host_availability; -#define AU_surfxml_host_availability NULL typedef int AT_surfxml_storage_type_model; #define AU_surfxml_storage_type_model NULL +typedef int AT_surfxml_host_availability; +#define AU_surfxml_host_availability NULL typedef int AT_surfxml_bypassRoute_src; #define AU_surfxml_bypassRoute_src NULL typedef int AT_surfxml_route_src; #define AU_surfxml_route_src NULL -typedef int AT_surfxml_bypassRoute_gw_dst; -#define AU_surfxml_bypassRoute_gw_dst NULL typedef int AT_surfxml_storage_id; #define AU_surfxml_storage_id NULL typedef int AT_surfxml_host_coordinates; @@ -250,8 +260,8 @@ typedef int AT_surfxml_cluster_radical; #define AU_surfxml_cluster_radical NULL typedef int AT_surfxml_config_id; #define AU_surfxml_config_id NULL -typedef int AT_surfxml_bypassRoute_gw_src; -#define AU_surfxml_bypassRoute_gw_src NULL +typedef int AT_surfxml_bypassASroute_gw_dst; +#define AU_surfxml_bypassASroute_gw_dst NULL typedef int AT_surfxml_include_file; #define AU_surfxml_include_file NULL typedef int AT_surfxml_random_std_deviation; @@ -295,6 +305,9 @@ 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_process_on_failure ) AX_surfxml_process_on_failure; +#define A_surfxml_process_on_failure AX_surfxml_process_on_failure +XBT_PUBLIC_DATA(short ) int surfxml_process_on_failure_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; @@ -325,6 +338,9 @@ 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_bypassASroute_dst ) AX_surfxml_bypassASroute_dst; +#define A_surfxml_bypassASroute_dst (surfxml_bufferstack + AX_surfxml_bypassASroute_dst) +XBT_PUBLIC_DATA(short ) int surfxml_bypassASroute_dst_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; @@ -352,6 +368,9 @@ 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_storage_content ) AX_surfxml_storage_content; +#define A_surfxml_storage_content (surfxml_bufferstack + AX_surfxml_storage_content) +XBT_PUBLIC_DATA(short ) int surfxml_storage_content_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; @@ -368,7 +387,7 @@ 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) +#define A_surfxml_AS_routing 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) @@ -382,6 +401,9 @@ 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_storage_type_size ) AX_surfxml_storage_type_size; +#define A_surfxml_storage_type_size (surfxml_bufferstack + AX_surfxml_storage_type_size) +XBT_PUBLIC_DATA(short ) int surfxml_storage_type_size_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; @@ -442,6 +464,9 @@ 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_bypassASroute_src ) AX_surfxml_bypassASroute_src; +#define A_surfxml_bypassASroute_src (surfxml_bufferstack + AX_surfxml_bypassASroute_src) +XBT_PUBLIC_DATA(short ) int surfxml_bypassASroute_src_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; @@ -457,6 +482,9 @@ XBT_PUBLIC_DATA(short ) int surfxml_link_state_file_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_bypassASroute_gw_src ) AX_surfxml_bypassASroute_gw_src; +#define A_surfxml_bypassASroute_gw_src (surfxml_bufferstack + AX_surfxml_bypassASroute_gw_src) +XBT_PUBLIC_DATA(short ) int surfxml_bypassASroute_gw_src_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; @@ -484,21 +512,18 @@ 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_storage_type_model ) AX_surfxml_storage_type_model; #define A_surfxml_storage_type_model (surfxml_bufferstack + AX_surfxml_storage_type_model) XBT_PUBLIC_DATA(short ) int surfxml_storage_type_model_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_storage_id ) AX_surfxml_storage_id; #define A_surfxml_storage_id (surfxml_bufferstack + AX_surfxml_storage_id) XBT_PUBLIC_DATA(short ) int surfxml_storage_id_isset; @@ -517,9 +542,9 @@ 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_bypassASroute_gw_dst ) AX_surfxml_bypassASroute_gw_dst; +#define A_surfxml_bypassASroute_gw_dst (surfxml_bufferstack + AX_surfxml_bypassASroute_gw_dst) +XBT_PUBLIC_DATA(short ) int surfxml_bypassASroute_gw_dst_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;