X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/15badc71ce964f6dae6428c9a4c0198fad5d4936..f2df13795e01302813a6aef10825ec7e922ce530:/include/surf/simgrid_dtd.h diff --git a/include/surf/simgrid_dtd.h b/include/surf/simgrid_dtd.h index d4a8e66ff5..4066bb35bc 100644 --- a/include/surf/simgrid_dtd.h +++ b/include/surf/simgrid_dtd.h @@ -62,14 +62,14 @@ XBT_PUBLIC(void) STag_surfxml_AS(void); XBT_PUBLIC(void) ETag_surfxml_AS(void); XBT_PUBLIC(void) STag_surfxml_storage___type(void); XBT_PUBLIC(void) ETag_surfxml_storage___type(void); -XBT_PUBLIC(void) STag_surfxml_storage(void); -XBT_PUBLIC(void) ETag_surfxml_storage(void); XBT_PUBLIC(void) STag_surfxml_mount(void); XBT_PUBLIC(void) ETag_surfxml_mount(void); XBT_PUBLIC(void) STag_surfxml_mstorage(void); XBT_PUBLIC(void) ETag_surfxml_mstorage(void); XBT_PUBLIC(void) STag_surfxml_host(void); XBT_PUBLIC(void) ETag_surfxml_host(void); +XBT_PUBLIC(void) STag_surfxml_storage(void); +XBT_PUBLIC(void) ETag_surfxml_storage(void); XBT_PUBLIC(void) STag_surfxml_gpu(void); XBT_PUBLIC(void) ETag_surfxml_gpu(void); XBT_PUBLIC(void) STag_surfxml_host___link(void); @@ -104,6 +104,8 @@ XBT_PUBLIC(void) STag_surfxml_config(void); XBT_PUBLIC(void) ETag_surfxml_config(void); XBT_PUBLIC(void) STag_surfxml_prop(void); XBT_PUBLIC(void) ETag_surfxml_prop(void); +XBT_PUBLIC(void) STag_surfxml_model___prop(void); +XBT_PUBLIC(void) ETag_surfxml_model___prop(void); /* XML application data. */ typedef int AT_surfxml_mount_name; @@ -127,6 +129,8 @@ typedef int AT_surfxml_link_latency___file; #define AU_surfxml_link_latency___file NULL typedef int AT_surfxml_peer_availability___file; #define AU_surfxml_peer_availability___file NULL +typedef int AT_surfxml_model___prop_value; +#define AU_surfxml_model___prop_value NULL typedef enum { AU_surfxml_link___ctn_direction, A_surfxml_link___ctn_direction_UP,A_surfxml_link___ctn_direction_DOWN,A_surfxml_link___ctn_direction_NONE } AT_surfxml_link___ctn_direction; typedef enum { AU_surfxml_host_state, A_surfxml_host_state_ON,A_surfxml_host_state_OFF } AT_surfxml_host_state; typedef int AT_surfxml_AS_id; @@ -151,6 +155,8 @@ typedef int AT_surfxml_bypassASroute_dst; #define AU_surfxml_bypassASroute_dst NULL typedef int AT_surfxml_host___link_id; #define AU_surfxml_host___link_id NULL +typedef int AT_surfxml_model___prop_id; +#define AU_surfxml_model___prop_id NULL typedef int AT_surfxml_ASroute_src; #define AU_surfxml_ASroute_src NULL typedef int AT_surfxml_cluster_prefix; @@ -176,6 +182,8 @@ typedef int AT_surfxml_process_kill___time; #define AU_surfxml_process_kill___time NULL typedef int AT_surfxml_cluster_bb___bw; #define AU_surfxml_cluster_bb___bw NULL +typedef int AT_surfxml_host_pstate; +#define AU_surfxml_host_pstate NULL typedef int AT_surfxml_argument_value; #define AU_surfxml_argument_value NULL typedef enum { AU_surfxml_link_state, A_surfxml_link_state_ON,A_surfxml_link_state_OFF } AT_surfxml_link_state; @@ -183,7 +191,7 @@ typedef int AT_surfxml_cluster_loopback___bw; #define AU_surfxml_cluster_loopback___bw NULL typedef int AT_surfxml_ASroute_gw___src; #define AU_surfxml_ASroute_gw___src 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_Vivaldi,A_surfxml_AS_routing_Cluster } AT_surfxml_AS_routing; +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_Vivaldi,A_surfxml_AS_routing_Cluster,A_surfxml_AS_routing_Cluster___torus } AT_surfxml_AS_routing; typedef int AT_surfxml_link_bandwidth; #define AU_surfxml_link_bandwidth NULL typedef int AT_surfxml_cluster_id; @@ -194,6 +202,8 @@ 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_storage_attach; +#define AU_surfxml_storage_attach NULL typedef int AT_surfxml_cluster_bb___lat; #define AU_surfxml_cluster_bb___lat NULL typedef int AT_surfxml_link_latency; @@ -222,6 +232,7 @@ typedef int AT_surfxml_random_max; #define AU_surfxml_random_max NULL typedef int AT_surfxml_link_id; #define AU_surfxml_link_id NULL +typedef enum { AU_surfxml_cluster_topology, A_surfxml_cluster_topology_FLAT,A_surfxml_cluster_topology_TORUS } AT_surfxml_cluster_topology; typedef int AT_surfxml_process_host; #define AU_surfxml_process_host NULL typedef int AT_surfxml_cabinet_id; @@ -251,24 +262,28 @@ 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_mount_storageId; +#define AU_surfxml_mount_storageId 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; -#define AU_surfxml_mount_id NULL typedef int AT_surfxml_cluster_power; #define AU_surfxml_cluster_power NULL +typedef int AT_surfxml_cluster_topo___parameters; +#define AU_surfxml_cluster_topo___parameters NULL typedef int AT_surfxml_process_function; #define AU_surfxml_process_function NULL typedef int AT_surfxml_peer_id; #define AU_surfxml_peer_id NULL -typedef int AT_surfxml_cluster_router___id; -#define AU_surfxml_cluster_router___id NULL -typedef int AT_surfxml_cluster_loopback___lat; -#define AU_surfxml_cluster_loopback___lat NULL typedef int AT_surfxml_cabinet_radical; #define AU_surfxml_cabinet_radical NULL +typedef int AT_surfxml_cluster_loopback___lat; +#define AU_surfxml_cluster_loopback___lat NULL +typedef int AT_surfxml_storage_content___type; +#define AU_surfxml_storage_content___type NULL +typedef int AT_surfxml_cluster_router___id; +#define AU_surfxml_cluster_router___id NULL typedef enum { AU_surfxml_cluster_sharing___policy, A_surfxml_cluster_sharing___policy_SHARED,A_surfxml_cluster_sharing___policy_FULLDUPLEX,A_surfxml_cluster_sharing___policy_FATPIPE } AT_surfxml_cluster_sharing___policy; typedef int AT_surfxml_bypassRoute_dst; #define AU_surfxml_bypassRoute_dst NULL @@ -276,10 +291,10 @@ typedef int AT_surfxml_cabinet_power; #define AU_surfxml_cabinet_power NULL typedef int AT_surfxml_host_core; #define AU_surfxml_host_core 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_storage___type_model; +#define AU_surfxml_storage___type_model NULL typedef int AT_surfxml_bypassRoute_src; #define AU_surfxml_bypassRoute_src NULL typedef int AT_surfxml_backbone_latency; @@ -288,6 +303,8 @@ typedef int AT_surfxml_route_src; #define AU_surfxml_route_src NULL typedef int AT_surfxml_storage_id; #define AU_surfxml_storage_id NULL +typedef int AT_surfxml_storage___type_content___type; +#define AU_surfxml_storage___type_content___type NULL typedef int AT_surfxml_host_coordinates; #define AU_surfxml_host_coordinates NULL typedef int AT_surfxml_trace_id; @@ -359,6 +376,9 @@ 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_model___prop_value) AX_surfxml_model___prop_value; +#define A_surfxml_model___prop_value (surfxml_bufferstack + AX_surfxml_model___prop_value) +XBT_PUBLIC_DATA(short int) surfxml_model___prop_value_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; @@ -398,6 +418,9 @@ XBT_PUBLIC_DATA(short int) surfxml_bypassASroute_dst_isset; XBT_PUBLIC_DATA(AT_surfxml_host___link_id) AX_surfxml_host___link_id; #define A_surfxml_host___link_id (surfxml_bufferstack + AX_surfxml_host___link_id) XBT_PUBLIC_DATA(short int) surfxml_host___link_id_isset; +XBT_PUBLIC_DATA(AT_surfxml_model___prop_id) AX_surfxml_model___prop_id; +#define A_surfxml_model___prop_id (surfxml_bufferstack + AX_surfxml_model___prop_id) +XBT_PUBLIC_DATA(short int) surfxml_model___prop_id_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; @@ -437,6 +460,9 @@ 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_host_pstate) AX_surfxml_host_pstate; +#define A_surfxml_host_pstate (surfxml_bufferstack + AX_surfxml_host_pstate) +XBT_PUBLIC_DATA(short int) surfxml_host_pstate_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; @@ -467,6 +493,9 @@ 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_storage_attach) AX_surfxml_storage_attach; +#define A_surfxml_storage_attach (surfxml_bufferstack + AX_surfxml_storage_attach) +XBT_PUBLIC_DATA(short int) surfxml_storage_attach_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; @@ -512,6 +541,9 @@ 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_cluster_topology) AX_surfxml_cluster_topology; +#define A_surfxml_cluster_topology AX_surfxml_cluster_topology +XBT_PUBLIC_DATA(short int) surfxml_cluster_topology_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; @@ -557,33 +589,39 @@ 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_mount_storageId) AX_surfxml_mount_storageId; +#define A_surfxml_mount_storageId (surfxml_bufferstack + AX_surfxml_mount_storageId) +XBT_PUBLIC_DATA(short int) surfxml_mount_storageId_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; -XBT_PUBLIC_DATA(AT_surfxml_mount_id) AX_surfxml_mount_id; -#define A_surfxml_mount_id (surfxml_bufferstack + AX_surfxml_mount_id) -XBT_PUBLIC_DATA(short int) surfxml_mount_id_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_cluster_topo___parameters) AX_surfxml_cluster_topo___parameters; +#define A_surfxml_cluster_topo___parameters (surfxml_bufferstack + AX_surfxml_cluster_topo___parameters) +XBT_PUBLIC_DATA(short int) surfxml_cluster_topo___parameters_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_loopback___lat) AX_surfxml_cluster_loopback___lat; -#define A_surfxml_cluster_loopback___lat (surfxml_bufferstack + AX_surfxml_cluster_loopback___lat) -XBT_PUBLIC_DATA(short int) surfxml_cluster_loopback___lat_isset; XBT_PUBLIC_DATA(AT_surfxml_cabinet_radical) AX_surfxml_cabinet_radical; #define A_surfxml_cabinet_radical (surfxml_bufferstack + AX_surfxml_cabinet_radical) XBT_PUBLIC_DATA(short int) surfxml_cabinet_radical_isset; +XBT_PUBLIC_DATA(AT_surfxml_cluster_loopback___lat) AX_surfxml_cluster_loopback___lat; +#define A_surfxml_cluster_loopback___lat (surfxml_bufferstack + AX_surfxml_cluster_loopback___lat) +XBT_PUBLIC_DATA(short int) surfxml_cluster_loopback___lat_isset; +XBT_PUBLIC_DATA(AT_surfxml_storage_content___type) AX_surfxml_storage_content___type; +#define A_surfxml_storage_content___type (surfxml_bufferstack + AX_surfxml_storage_content___type) +XBT_PUBLIC_DATA(short int) surfxml_storage_content___type_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; @@ -596,12 +634,12 @@ XBT_PUBLIC_DATA(short int) surfxml_cabinet_power_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_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_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_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; @@ -614,6 +652,9 @@ XBT_PUBLIC_DATA(short int) surfxml_route_src_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; +XBT_PUBLIC_DATA(AT_surfxml_storage___type_content___type) AX_surfxml_storage___type_content___type; +#define A_surfxml_storage___type_content___type (surfxml_bufferstack + AX_surfxml_storage___type_content___type) +XBT_PUBLIC_DATA(short int) surfxml_storage___type_content___type_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;