Remove symetrical for symmetrical.

[simgrid.git] / examples / msg / masterslave / masterslave_bypass.c

diff --git a/examples/msg/masterslave/masterslave_bypass.c b/examples/msg/masterslave/masterslave_bypass.c
index 60dfc3c..d69052d 100644 (file)
--- a/examples/msg/masterslave/masterslave_bypass.c
+++ b/examples/msg/masterslave/masterslave_bypass.c
@@ -18,14 +18,12 @@ static int surf_parse_bypass_platform(void)
 {
   static int AX_ptr = 0;
   static int surfxml_bufferstack_size = 2048;
-  static int surfxml_buffer_stack_stack_ptr = 0;
-  static int surfxml_buffer_stack_stack[1024];
 
   /* allocating memory for the buffer, I think 2kB should be enough */
   surfxml_bufferstack = xbt_new0(char, surfxml_bufferstack_size);
 
   DEBUG0("<platform>");
-  SURFXML_BUFFER_SET(platform_version, "2");
+  SURFXML_BUFFER_SET(platform_version, "3");
   SURFXML_START_TAG(platform);
 
   DEBUG0("<AS>");
@@ -40,10 +38,6 @@ static int surf_parse_bypass_platform(void)
   SURFXML_BUFFER_SET(host_availability_file, "");
   A_surfxml_host_state = A_surfxml_host_state_ON;
   SURFXML_BUFFER_SET(host_state_file, "");
-  SURFXML_BUFFER_SET(host_interference_send, "1.0");
-  SURFXML_BUFFER_SET(host_interference_recv, "1.0");
-  SURFXML_BUFFER_SET(host_interference_send_recv, "1.0");
-  SURFXML_BUFFER_SET(host_max_outgoing_rate, "-1.0");
   SURFXML_START_TAG(host);
   SURFXML_END_TAG(host);
 
@@ -54,10 +48,6 @@ static int surf_parse_bypass_platform(void)
   SURFXML_BUFFER_SET(host_availability_file, "");
   A_surfxml_host_state = A_surfxml_host_state_ON;
   SURFXML_BUFFER_SET(host_state_file, "");
-  SURFXML_BUFFER_SET(host_interference_send, "1.0");
-  SURFXML_BUFFER_SET(host_interference_recv, "1.0");
-  SURFXML_BUFFER_SET(host_interference_send_recv, "1.0");
-  SURFXML_BUFFER_SET(host_max_outgoing_rate, "-1.0");
   SURFXML_START_TAG(host);
   SURFXML_END_TAG(host);
 
@@ -76,11 +66,13 @@ static int surf_parse_bypass_platform(void)
   DEBUG0("<route src=\"host A\" dst=\"host B\">");
   SURFXML_BUFFER_SET(route_src, "host A");
   SURFXML_BUFFER_SET(route_dst, "host B");
+  A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_YES;
   SURFXML_START_TAG(route);
   DEBUG0("     <link:ctn id=\"LinkA\"/>");
-  SURFXML_BUFFER_SET(link_c_ctn_id, "LinkA");
-  SURFXML_START_TAG(link_c_ctn);
-  SURFXML_END_TAG(link_c_ctn);
+  SURFXML_BUFFER_SET(link_ctn_id, "LinkA");
+  A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
+  SURFXML_START_TAG(link_ctn);
+  SURFXML_END_TAG(link_ctn);
   DEBUG0("</route>");
   SURFXML_END_TAG(route);
 
@@ -103,7 +95,7 @@ static int surf_parse_bypass_application(void)
   surfxml_bufferstack = xbt_new0(char, surfxml_bufferstack_size);
 
   /* <platform> */
-  SURFXML_BUFFER_SET(platform_version, "2");
+  SURFXML_BUFFER_SET(platform_version, "3");
 
   SURFXML_START_TAG(platform);
 
@@ -189,7 +181,8 @@ int master(int argc, char *argv[])
     for (i = 0; i < number_of_tasks; i++) {
       sprintf(sprintf_buffer, "Task_%d", i);
       todo[i] =
-        MSG_task_create(sprintf_buffer, task_comp_size, task_comm_size, NULL);
+          MSG_task_create(sprintf_buffer, task_comp_size, task_comm_size,
+                          NULL);
     }
   }
 
@@ -226,7 +219,7 @@ int master(int argc, char *argv[])
   }
 
   INFO0
-    ("All tasks have been dispatched. Let's tell everybody the computation is over.");
+      ("All tasks have been dispatched. Let's tell everybody the computation is over.");
   for (i = 0; i < slaves_count; i++)
     MSG_task_put(MSG_task_create("finalize", 0, 0, FINALIZE),
                  slaves[i], PORT_22);