Fix tests using link_ctn and route with bypass.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8463 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/examples/msg/masterslave/masterslave_bypass.c b/examples/msg/masterslave/masterslave_bypass.c
index f6d3e28..ebcd543 100644 (file)
--- 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>");
@@ -66,9 +66,11 @@ 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_symetrical = A_surfxml_route_symetrical_YES;
   SURFXML_START_TAG(route);
   DEBUG0("     <link:ctn id=\"LinkA\"/>");
   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>");

diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index b99054e..c7697f5 100644 (file)
--- a/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@ -3108,6 +3108,7 @@ static void routing_full_parse_Scluster(void)
 
   DEBUG1("<link_ctn\tid=\"%s_link_$1src\"/>", cluster_id);
   SURFXML_BUFFER_SET(link_ctn_id, bprintf("%s_link_$1src", cluster_id));
+  A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
   if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
   {A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_UP;}
   SURFXML_START_TAG(link_ctn);
@@ -3121,6 +3122,7 @@ static void routing_full_parse_Scluster(void)
 
   DEBUG1("<link_ctn\tid=\"%s_link_$1dst\"/>", cluster_id);
   SURFXML_BUFFER_SET(link_ctn_id, bprintf("%s_link_$1dst", cluster_id));
+  A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
   if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
   {A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_UP;}
   SURFXML_START_TAG(link_ctn);

diff --git a/teshsuite/simdag/platforms/one_cluster.xml b/teshsuite/simdag/platforms/one_cluster.xml
index ac2c0b4..3581df4 100644 (file)
--- a/teshsuite/simdag/platforms/one_cluster.xml
+++ b/teshsuite/simdag/platforms/one_cluster.xml
@@ -4,7 +4,6 @@
 <AS id="AS0" routing="Full">
   <cluster id="bob_cluster" prefix="bob" suffix=".hamburger.edu"
    radical="0,2-4,6" power="1000000000.00" bw="125000000.00" lat="5e-5"
-   bb_bw="2250000000.00" bb_lat="5e-4"
-   sharing_policy="FULLDUPLEX"/>
+   bb_bw="2250000000.00" bb_lat="5e-4"/>
 </AS>
 </platform>

diff --git a/teshsuite/simdag/platforms/two_hosts_one_link.xml b/teshsuite/simdag/platforms/two_hosts_one_link.xml
index 372e7bc..24c328d 100644 (file)
--- a/teshsuite/simdag/platforms/two_hosts_one_link.xml
+++ b/teshsuite/simdag/platforms/two_hosts_one_link.xml
@@ -6,13 +6,13 @@
    <host id="alice" power="500000000"/>
  
    <link id="link1" bandwidth="125000000" latency="5E-5"/>
-   <link id="link2" bandwidth="125000000" latency="5E-5"/>
-   <link id="link3" bandwidth="125000000" latency="5E-5"/>
    
-   <route src="bob" dst="alice" symetrical="YES">
+   <route src="bob" dst="alice">
+     <link_ctn id="link1"/>
+   </route>
+   
+   <route src="alice" dst="bob">
      <link_ctn id="link1"/>
-        <link_ctn id="link2"/>
-        <link_ctn id="link3"/>
    </route>
 
  </AS>