"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 5dca233..2c7e893 100644 (file)
--- a/examples/msg/gtnets/dogbone-d.xml
+++ b/examples/msg/gtnets/dogbone-d.xml
@@ -3,12 +3,12 @@
 <platform_description version="1">
 
   <process host="S1" function="master">
 <platform_description version="1">
 
   <process host="S1" function="master">

-      <argument value="100000000"/>
+      <argument value="10000000"/>

       <argument value="C1"/>
   </process>
 
   <process host="S2" function="master">
       <argument value="C1"/>
   </process>
 
   <process host="S2" function="master">

-      <argument value="100000000"/>
+      <argument value="10000000"/>

       <argument value="C2"/>
   </process>
 
       <argument value="C2"/>
   </process>
 

diff --git a/examples/msg/gtnets/dogbone-p.xml b/examples/msg/gtnets/dogbone-p.xml
index 3b0f7ca..d848840 100644 (file)
--- a/examples/msg/gtnets/dogbone-p.xml
+++ b/examples/msg/gtnets/dogbone-p.xml
@@ -43,7 +43,6 @@
      <route_element name="3"/>
   </route>
 
      <route_element name="3"/>
   </route>
 

-

   <route src="S1" dst="R1">
      <route_element name="1"/>
   </route>
   <route src="S1" dst="R1">
      <route_element name="1"/>
   </route>


@@ -63,5 +62,4 @@
   <route src="R2" dst="C2">
      <route_element name="5"/>
   </route>
   <route src="R2" dst="C2">
      <route_element name="5"/>
   </route>

-

 </platform_description>
 </platform_description>

diff --git a/examples/msg/masterslave/masterslave_bypass.c b/examples/msg/masterslave/masterslave_bypass.c
index d881c4c..ef9ef23 100644 (file)
--- 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 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)
 {
 
 static int surf_parse_bypass(void)
 {


@@ -34,13 +36,11 @@ static int surf_parse_bypass(void)
   surfxml_bufferstack = xbt_new0(char, surfxml_bufferstack_size);
   
   /* <platform_description> */
   surfxml_bufferstack = xbt_new0(char, surfxml_bufferstack_size);
   
   /* <platform_description> */

-  SURFXML_BUFFER_RESET();

   SURFXML_BUFFER_SET(platform_description_version,"1");
 
   SURFXML_BUFFER_SET(platform_description_version,"1");
 

-  STag_surfxml_platform_description();
+  STAG(platform_description);

 
 /*   <cpu name="Cpu A" power="100000000.00"/> */
 
 /*   <cpu name="Cpu A" power="100000000.00"/> */

-  SURFXML_BUFFER_RESET();

   SURFXML_BUFFER_SET(cpu_name,"Cpu A");
   SURFXML_BUFFER_SET(cpu_power, "100000000.00");
   SURFXML_BUFFER_SET(cpu_availability, "1.0");
   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");
 
   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);

 
 /*   <cpu name="Cpu B" power="100000000.00"/> */
 
 /*   <cpu name="Cpu B" power="100000000.00"/> */

-  SURFXML_BUFFER_RESET();

   SURFXML_BUFFER_SET(cpu_name, "Cpu B");
   SURFXML_BUFFER_SET(cpu_power, "100000000.00");
   SURFXML_BUFFER_SET(cpu_availability, "1.0");
   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");
 
   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);

 
 /*   <network_link name="LinkA" bandwidth="10000000.0" latency="0.2"/> */
 
 /*   <network_link name="LinkA" bandwidth="10000000.0" latency="0.2"/> */

-  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, "");
   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;
   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);

 
 /*   <route src="Cpu A" dst="Cpu B"><route_element name="LinkA"/></route> */
 
 /*   <route src="Cpu A" dst="Cpu B"><route_element name="LinkA"/></route> */

-  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");
   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");
 
   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");
 
   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);

 
 /*   <route src="Cpu B" dst="Cpu A"><route_element name="LinkA"/></route> */
 
 /*   <route src="Cpu B" dst="Cpu A"><route_element name="LinkA"/></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");
   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");
 
   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");
 
   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);

 
 /*   <process host="Cpu A" function="master"> */
 
 /*   <process host="Cpu A" function="master"> */

-  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");
   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);

 
 /*      <argument value="20"/> */
   SURFXML_BUFFER_SET(argument_value, "20");
 
 /*      <argument value="20"/> */
   SURFXML_BUFFER_SET(argument_value, "20");

-  STag_surfxml_argument();
-  ETag_surfxml_argument();
+  STAG(argument);
+  ETAG(argument);

 
 /*      <argument value="5000000"/> */
   SURFXML_BUFFER_SET(argument_value, "5000000");
 
 /*      <argument value="5000000"/> */
   SURFXML_BUFFER_SET(argument_value, "5000000");

-  STag_surfxml_argument();
-  ETag_surfxml_argument();
+  STAG(argument);
+  ETAG(argument);

 
 /*      <argument value="100000"/> */
   SURFXML_BUFFER_SET(argument_value, "100000");
 
 /*      <argument value="100000"/> */
   SURFXML_BUFFER_SET(argument_value, "100000");

-  STag_surfxml_argument();
-  ETag_surfxml_argument();
+  STAG(argument);
+  ETAG(argument);

 
 /*      <argument value="Cpu B"/> */
   SURFXML_BUFFER_SET(argument_value, "Cpu B");
 
 /*      <argument value="Cpu B"/> */
   SURFXML_BUFFER_SET(argument_value, "Cpu B");

-  STag_surfxml_argument();
-  ETag_surfxml_argument();
+  STAG(argument);
+  ETAG(argument);

 
 /*   </process> */
 
 /*   </process> */

-  ETag_surfxml_process();
+  ETAG(process);

 
 /*   <process host="Cpu B" function="slave"/> */
 
 /*   <process host="Cpu B" function="slave"/> */

-  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");
   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);

 
 /* </platform_description> */
 
 /* </platform_description> */

-  ETag_surfxml_platform_description();
+  ETAG(platform_description);

 
   free(surfxml_bufferstack);
   return 0;
 
   free(surfxml_bufferstack);
   return 0;