From 48a06dfd54aa94446d88653fff8a5ba8ce6e4add Mon Sep 17 00:00:00 2001
From: jbrv <jean-baptiste.herve@esial.net>
Date: Fri, 8 Jun 2012 09:33:57 +0200
Subject: [PATCH] Changed masterslave with failures test platform

The new platform is simpler, but now includes a case that fails :
if a host fails when it is running a task, simgrid crashes.
The expected outputs in .tesh files have not been updated yet.
---
 examples/msg/bourassa_state.trace             |  3 +
 examples/msg/ginette_state.trace              |  3 +
 examples/msg/jupiter_state.trace              |  2 +-
 examples/msg/link3_state.trace                |  5 ++
 examples/msg/link4_state.trace                |  3 +
 examples/msg/small_platform_with_failures.xml | 57 +++++++++----------
 6 files changed, 42 insertions(+), 31 deletions(-)
 create mode 100644 examples/msg/bourassa_state.trace
 create mode 100644 examples/msg/ginette_state.trace
 create mode 100644 examples/msg/link3_state.trace
 create mode 100644 examples/msg/link4_state.trace

diff --git a/examples/msg/bourassa_state.trace b/examples/msg/bourassa_state.trace
new file mode 100644
index 0000000000..acab9a9a98
--- /dev/null
+++ b/examples/msg/bourassa_state.trace
@@ -0,0 +1,3 @@
+0 1
+67 0
+70 1
diff --git a/examples/msg/ginette_state.trace b/examples/msg/ginette_state.trace
new file mode 100644
index 0000000000..8df97dc295
--- /dev/null
+++ b/examples/msg/ginette_state.trace
@@ -0,0 +1,3 @@
+0 1
+50 0
+60 1
diff --git a/examples/msg/jupiter_state.trace b/examples/msg/jupiter_state.trace
index bd24c43d8d..522699b03c 100644
--- a/examples/msg/jupiter_state.trace
+++ b/examples/msg/jupiter_state.trace
@@ -1,3 +1,3 @@
 0 1
-1.1 0
+1.0 0
 2 1
diff --git a/examples/msg/link3_state.trace b/examples/msg/link3_state.trace
new file mode 100644
index 0000000000..f41d9c7300
--- /dev/null
+++ b/examples/msg/link3_state.trace
@@ -0,0 +1,5 @@
+0 1
+13 0
+14 1
+20 0
+25 1
diff --git a/examples/msg/link4_state.trace b/examples/msg/link4_state.trace
new file mode 100644
index 0000000000..9decbc80b9
--- /dev/null
+++ b/examples/msg/link4_state.trace
@@ -0,0 +1,3 @@
+0 1
+35 0
+40 1
diff --git a/examples/msg/small_platform_with_failures.xml b/examples/msg/small_platform_with_failures.xml
index aae7507fd0..8041c4d245 100644
--- a/examples/msg/small_platform_with_failures.xml
+++ b/examples/msg/small_platform_with_failures.xml
@@ -3,60 +3,57 @@
  <platform version="3">
  <AS  id="AS0"  routing="Full">
    <!-- ljlkj -->
-   <host id="Tremblay" power="98095000"/>
-   <host id="Jupiter" power="76296000" state_file="jupiter_state.trace"/>
-   <host id="Fafard" power="76296000" state_file="fafard_state.trace"/>
-   <host id="Ginette" power="48492000"/>
-   <host id="Bourassa" power="48492000"/>
-   <link id="6" bandwidth="41279125" latency="5.9904e-05"/>
-   <link id="11" bandwidth="252750" latency="0.00570455"/>
-   <link id="3" bandwidth="34285625" latency="0.000514433"/>
-   <link id="7" bandwidth="11618875" latency="0.00018998"/>
-   <link id="9" bandwidth="7209750" latency="0.001461517"/>
-   <link id="12" bandwidth="1792625" latency="0.007877863"/>
-   <link id="2" bandwidth="118682500" latency="0.000136931"/>
-   <link id="8" bandwidth="8158000" latency="0.000270544"/>
-   <link id="1" bandwidth="34285625" latency="0.000514433"/>
-   <link id="4" bandwidth="10099625" latency="0.00047978"/>
-   <link id="0" bandwidth="41279125" latency="5.9904e-05"/>
-   <link id="10" bandwidth="4679750" latency="0.000848712"/>
-   <link id="5" bandwidth="27946250" latency="0.000278066" state_file="link5_state.trace"/>
-   <link id="loopback_FATPIPE" bandwidth="10000000" latency="0.1" sharing_policy="FATPIPE"/>
-   <link id="loopback" bandwidth="498000000" latency="0.000015"/>
+   <host id="Tremblay" power="25000000"/>
+   <host id="Jupiter" power="25000000" state_file="jupiter_state.trace"/>
+   <host id="Fafard" power="25000000" state_file="fafard_state.trace" />
+   <host id="Ginette" power="25000000" state_file="ginette_state.trace"/>
+   <host id="Bourassa" power="25000000"state_file="bourassa_state.trace"/>
+   <link id="1" bandwidth="1000000" latency="0.0"/>
+   <link id="2" bandwidth="1000000" latency="0.0"/>
+   <link id="3" bandwidth="1000000" latency="0.0" state_file="link3_state.trace" />
+   <link id="4" bandwidth="1000000" latency="0.0" state_file="link4_state.trace" />
+   <link id="5" bandwidth="1000000" latency="0.0"/>
+   <link id="6" bandwidth="1000000" latency="0.0"/>
+   <link id="7" bandwidth="1000000" latency="0.0"/>
+   <link id="8" bandwidth="1000000" latency="0.0"/>
+   <link id="9" bandwidth="1000000" latency="0.0"/>
+   <link id="10" bandwidth="1000000" latency="0.0"/>
+   <link id="loopback_FATPIPE" bandwidth="10000000" latency="0.0" sharing_policy="FATPIPE"/>
+   <link id="loopback" bandwidth="100000000" latency="0.0"/>
    <route src="Tremblay" dst="Tremblay"><link_ctn id="loopback"/></route>
    <route src="Jupiter" dst="Jupiter"><link_ctn id="loopback"/></route>
    <route src="Fafard" dst="Fafard"><link_ctn id="loopback"/></route>
    <route src="Ginette" dst="Ginette"><link_ctn id="loopback"/></route>
    <route src="Bourassa" dst="Bourassa"><link_ctn id="loopback"/></route>
    <route src="Tremblay" dst="Jupiter">
-     <link_ctn id="9"/>
+     <link_ctn id="1"/>
    </route>
    <route src="Tremblay" dst="Fafard">
-     <link_ctn id="4"/><link_ctn id="3"/><link_ctn id="2"/><link_ctn id="0"/><link_ctn id="1"/><link_ctn id="8"/>
+     <link_ctn id="2"/>
    </route>
    <route src="Tremblay" dst="Ginette">
-     <link_ctn id="4"/><link_ctn id="3"/><link_ctn id="5"/>
+     <link_ctn id="3"/>
    </route>
    <route src="Tremblay" dst="Bourassa">
-     <link_ctn id="4"/><link_ctn id="3"/><link_ctn id="2"/><link_ctn id="0"/><link_ctn id="1"/><link_ctn id="6"/><link_ctn id="7"/>
+     <link_ctn id="4"/>
    </route>
    <route src="Jupiter" dst="Fafard">
-     <link_ctn id="9"/><link_ctn id="4"/><link_ctn id="3"/><link_ctn id="2"/><link_ctn id="0"/><link_ctn id="1"/><link_ctn id="8"/>
+     <link_ctn id="5"/>
    </route>
    <route src="Jupiter" dst="Ginette">
-     <link_ctn id="9"/><link_ctn id="4"/><link_ctn id="3"/><link_ctn id="5"/>
+     <link_ctn id="6"/>
    </route>
    <route src="Jupiter" dst="Bourassa">
-     <link_ctn id="9"/><link_ctn id="4"/><link_ctn id="3"/><link_ctn id="2"/><link_ctn id="0"/><link_ctn id="1"/><link_ctn id="6"/><link_ctn id="7"/>
+     <link_ctn id="7"/>
    </route>
    <route src="Fafard" dst="Ginette">
-     <link_ctn id="8"/><link_ctn id="1"/><link_ctn id="0"/><link_ctn id="2"/><link_ctn id="5"/>
+     <link_ctn id="8"/>
    </route>
    <route src="Fafard" dst="Bourassa">
-     <link_ctn id="8"/><link_ctn id="6"/><link_ctn id="7"/>
+     <link_ctn id="9"/>
    </route>
    <route src="Ginette" dst="Bourassa">
-     <link_ctn id="5"/><link_ctn id="2"/><link_ctn id="0"/><link_ctn id="1"/><link_ctn id="6"/><link_ctn id="7"/>
+     <link_ctn id="10"/>
    </route>
  </AS>
  </platform>
-- 
2.20.1