X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c93a420f2f61da48ace7828257e97b593ae76251..30e53e313b361eadd271dd83184627f43d480491:/include/surf/simgrid_dtd.h diff --git a/include/surf/simgrid_dtd.h b/include/surf/simgrid_dtd.h index 2c648bec97..58c8693121 100644 --- a/include/surf/simgrid_dtd.h +++ b/include/surf/simgrid_dtd.h @@ -112,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; @@ -149,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; @@ -158,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; @@ -168,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; @@ -236,10 +240,10 @@ 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; @@ -301,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; @@ -361,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; @@ -377,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) @@ -391,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; @@ -499,12 +512,12 @@ 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;