X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c87c7201f47679626bdce5214c1c914f13c973ae..e6479c2215ac0d41dbebd12e8b48cd8eaef0bd89:/include/surf/simgrid_dtd.h diff --git a/include/surf/simgrid_dtd.h b/include/surf/simgrid_dtd.h index 2c8c3c213a..e6e1eaf62f 100644 --- a/include/surf/simgrid_dtd.h +++ b/include/surf/simgrid_dtd.h @@ -96,7 +96,7 @@ typedef int AT_surfxml_host_id; #define AU_surfxml_host_id NULL typedef int AT_surfxml_link_latency_file; #define AU_surfxml_link_latency_file NULL -typedef enum { AU_surfxml_ASroute_symetrical, A_surfxml_ASroute_symetrical_YES,A_surfxml_ASroute_symetrical_NO } AT_surfxml_ASroute_symetrical; +typedef enum { AU_surfxml_ASroute_symmetrical, A_surfxml_ASroute_symmetrical_YES,A_surfxml_ASroute_symmetrical_NO } AT_surfxml_ASroute_symmetrical; 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; @@ -173,7 +173,7 @@ typedef int AT_surfxml_cluster_power; #define AU_surfxml_cluster_power NULL typedef int AT_surfxml_process_function; #define AU_surfxml_process_function NULL -typedef enum { AU_surfxml_route_symetrical, A_surfxml_route_symetrical_YES,A_surfxml_route_symetrical_NO } AT_surfxml_route_symetrical; +typedef enum { AU_surfxml_route_symmetrical, A_surfxml_route_symmetrical_YES,A_surfxml_route_symmetrical_NO } AT_surfxml_route_symmetrical; 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 @@ -220,8 +220,8 @@ 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(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(AT_surfxml_ASroute_symetrical ) AX_surfxml_ASroute_symetrical; -#define A_surfxml_ASroute_symetrical AX_surfxml_ASroute_symetrical +XBT_PUBLIC_DATA(AT_surfxml_ASroute_symmetrical ) AX_surfxml_ASroute_symmetrical; +#define A_surfxml_ASroute_symmetrical AX_surfxml_ASroute_symmetrical 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(AT_surfxml_host_state ) AX_surfxml_host_state; @@ -304,8 +304,8 @@ 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(AT_surfxml_process_function ) AX_surfxml_process_function; #define A_surfxml_process_function (surfxml_bufferstack + AX_surfxml_process_function) -XBT_PUBLIC_DATA(AT_surfxml_route_symetrical ) AX_surfxml_route_symetrical; -#define A_surfxml_route_symetrical AX_surfxml_route_symetrical +XBT_PUBLIC_DATA(AT_surfxml_route_symmetrical ) AX_surfxml_route_symmetrical; +#define A_surfxml_route_symmetrical AX_surfxml_route_symmetrical 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(AT_surfxml_bypassRoute_dst ) AX_surfxml_bypassRoute_dst;