X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/31bfa073530d5b1154c51c5f5f24269a7399409a..5a918cbd59f64eddf384ac657201057ac311633a:/examples/msg/masterslave/masterslave_bypass.c

diff --git a/examples/msg/masterslave/masterslave_bypass.c b/examples/msg/masterslave/masterslave_bypass.c
index 1e3c543642..af49c30c96 100644
--- a/examples/msg/masterslave/masterslave_bypass.c
+++ b/examples/msg/masterslave/masterslave_bypass.c
@@ -23,7 +23,7 @@ static int surf_parse_bypass_platform(void)
   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>");
@@ -36,12 +36,9 @@ static int surf_parse_bypass_platform(void)
   SURFXML_BUFFER_SET(host_power, "100000000.00");
   SURFXML_BUFFER_SET(host_availability, "1.0");
   SURFXML_BUFFER_SET(host_availability_file, "");
+  SURFXML_BUFFER_SET(host_core, "1");
   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);
 
@@ -50,12 +47,9 @@ static int surf_parse_bypass_platform(void)
   SURFXML_BUFFER_SET(host_power, "100000000.00");
   SURFXML_BUFFER_SET(host_availability, "1.0");
   SURFXML_BUFFER_SET(host_availability_file, "");
+  SURFXML_BUFFER_SET(host_core, "1");
   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);
 
@@ -74,11 +68,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);
 
@@ -101,7 +97,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);
 
@@ -187,7 +183,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);
     }
   }
 
@@ -224,7 +221,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);