From: alegrand Date: Thu, 16 Aug 2007 13:40:43 +0000 (+0000) Subject: "Cleaner" hack. Dude, I love C macros... ;) X-Git-Tag: v3.3~1265 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/0efc36f77ddd89b292a280c204a6b7341f1a9f89 "Cleaner" hack. Dude, I love C macros... ;) git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@4095 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/examples/msg/gtnets/dogbone-d.xml b/examples/msg/gtnets/dogbone-d.xml index 5dca2333cb..2c7e893ec9 100644 --- a/examples/msg/gtnets/dogbone-d.xml +++ b/examples/msg/gtnets/dogbone-d.xml @@ -3,12 +3,12 @@ - + - + diff --git a/examples/msg/gtnets/dogbone-p.xml b/examples/msg/gtnets/dogbone-p.xml index 3b0f7ca4a1..d8488401f2 100644 --- a/examples/msg/gtnets/dogbone-p.xml +++ b/examples/msg/gtnets/dogbone-p.xml @@ -43,7 +43,6 @@ - @@ -63,5 +62,4 @@ - diff --git a/examples/msg/masterslave/masterslave_bypass.c b/examples/msg/masterslave/masterslave_bypass.c index d881c4cc50..ef9ef2320b 100644 --- a/examples/msg/masterslave/masterslave_bypass.c +++ b/examples/msg/masterslave/masterslave_bypass.c @@ -23,7 +23,9 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,"Messages specific for this msg example"); #define SURFXML_BUFFER_RESET() do { \ AX_ptr = 0; \ memset(surfxml_bufferstack,0,surfxml_bufferstack_size); } while(0) - + +#define STAG(tag) STag_surfxml_##tag(); +#define ETAG(tag) do { ETag_surfxml_##tag(); SURFXML_BUFFER_RESET(); } while(0) static int surf_parse_bypass(void) { @@ -34,13 +36,11 @@ static int surf_parse_bypass(void) surfxml_bufferstack = xbt_new0(char, surfxml_bufferstack_size); /* */ - SURFXML_BUFFER_RESET(); SURFXML_BUFFER_SET(platform_description_version,"1"); - STag_surfxml_platform_description(); + STAG(platform_description); /* */ - SURFXML_BUFFER_RESET(); SURFXML_BUFFER_SET(cpu_name,"Cpu A"); SURFXML_BUFFER_SET(cpu_power, "100000000.00"); SURFXML_BUFFER_SET(cpu_availability, "1.0"); @@ -52,11 +52,10 @@ static int surf_parse_bypass(void) SURFXML_BUFFER_SET(cpu_interference_send_recv, "1.0"); SURFXML_BUFFER_SET(cpu_max_outgoing_rate, "-1.0"); - STag_surfxml_cpu(); - ETag_surfxml_cpu(); + STAG(cpu); + ETAG(cpu); /* */ - SURFXML_BUFFER_RESET(); SURFXML_BUFFER_SET(cpu_name, "Cpu B"); SURFXML_BUFFER_SET(cpu_power, "100000000.00"); SURFXML_BUFFER_SET(cpu_availability, "1.0"); @@ -68,11 +67,10 @@ static int surf_parse_bypass(void) SURFXML_BUFFER_SET(cpu_interference_send_recv, "1.0"); SURFXML_BUFFER_SET(cpu_max_outgoing_rate, "-1.0"); - STag_surfxml_cpu(); - ETag_surfxml_cpu(); + STAG(cpu); + ETAG(cpu); /* */ - SURFXML_BUFFER_RESET(); SURFXML_BUFFER_SET(network_link_name, "LinkA"); SURFXML_BUFFER_SET(network_link_bandwidth, "10000000.0"); SURFXML_BUFFER_SET(network_link_bandwidth_file, ""); @@ -81,11 +79,10 @@ static int surf_parse_bypass(void) A_surfxml_network_link_state = A_surfxml_network_link_state_ON; SURFXML_BUFFER_SET(network_link_state_file, ""); A_surfxml_network_link_sharing_policy = A_surfxml_network_link_sharing_policy_SHARED; - STag_surfxml_network_link(); - ETag_surfxml_network_link(); + STAG(network_link); + ETAG(network_link); /* */ - SURFXML_BUFFER_RESET(); SURFXML_BUFFER_SET(route_src, "Cpu A"); SURFXML_BUFFER_SET(route_dst, "Cpu B"); SURFXML_BUFFER_SET(route_impact_on_src, "0.0"); @@ -93,16 +90,15 @@ static int surf_parse_bypass(void) SURFXML_BUFFER_SET(route_impact_on_src_with_other_recv, "0.0"); SURFXML_BUFFER_SET(route_impact_on_dst_with_other_send, "0.0"); - STag_surfxml_route(); + STAG(route); SURFXML_BUFFER_SET(route_element_name, "LinkA"); - STag_surfxml_route_element(); - ETag_surfxml_route_element(); + STAG(route_element); + ETAG(route_element); - ETag_surfxml_route(); + ETAG(route); /* */ - SURFXML_BUFFER_RESET(); SURFXML_BUFFER_SET(route_src, "Cpu B"); SURFXML_BUFFER_SET(route_dst, "Cpu A"); SURFXML_BUFFER_SET(route_impact_on_src, "0.0"); @@ -110,56 +106,54 @@ static int surf_parse_bypass(void) SURFXML_BUFFER_SET(route_impact_on_src_with_other_recv, "0.0"); SURFXML_BUFFER_SET(route_impact_on_dst_with_other_send, "0.0"); - STag_surfxml_route(); + STAG(route); SURFXML_BUFFER_SET(route_element_name, "LinkA"); - STag_surfxml_route_element(); - ETag_surfxml_route_element(); + STAG(route_element); + ETAG(route_element); - ETag_surfxml_route(); + ETAG(route); /* */ - SURFXML_BUFFER_RESET(); SURFXML_BUFFER_SET(process_host, "Cpu A"); SURFXML_BUFFER_SET(process_function, "master"); SURFXML_BUFFER_SET(process_start_time, "-1.0"); SURFXML_BUFFER_SET(process_kill_time, "-1.0"); - STag_surfxml_process(); + STAG(process); /* */ SURFXML_BUFFER_SET(argument_value, "20"); - STag_surfxml_argument(); - ETag_surfxml_argument(); + STAG(argument); + ETAG(argument); /* */ SURFXML_BUFFER_SET(argument_value, "5000000"); - STag_surfxml_argument(); - ETag_surfxml_argument(); + STAG(argument); + ETAG(argument); /* */ SURFXML_BUFFER_SET(argument_value, "100000"); - STag_surfxml_argument(); - ETag_surfxml_argument(); + STAG(argument); + ETAG(argument); /* */ SURFXML_BUFFER_SET(argument_value, "Cpu B"); - STag_surfxml_argument(); - ETag_surfxml_argument(); + STAG(argument); + ETAG(argument); /* */ - ETag_surfxml_process(); + ETAG(process); /* */ - SURFXML_BUFFER_RESET(); SURFXML_BUFFER_SET(process_host, "Cpu B"); SURFXML_BUFFER_SET(process_function, "slave"); SURFXML_BUFFER_SET(process_start_time, "-1.0"); SURFXML_BUFFER_SET(process_kill_time, "-1.0"); - STag_surfxml_process(); - ETag_surfxml_process(); + STAG(process); + ETAG(process); /* */ - ETag_surfxml_platform_description(); + ETAG(platform_description); free(surfxml_bufferstack); return 0;