cleanup the text files around the actions; tesh files should follow soon

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

diff --git a/examples/msg/actions/actions_deployment.xml b/examples/msg/actions/actions_deployment.xml
deleted file mode 100644 (file)
index 7a401b4..0000000
--- a/examples/msg/actions/actions_deployment.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "simgrid.dtd">
-<platform version="2">
-  <process host="Tremblay" function="toto"/>
-  <process host="Jupiter" function="tutu"/>
-  <process host="Fafard" function="titi"/>
-</platform>

diff --git a/examples/msg/actions/actions_split_p0.txt b/examples/msg/actions/actions_split_p0.txt
new file mode 100644 (file)
index 0000000..42c8f9d
--- /dev/null
+++ b/examples/msg/actions/actions_split_p0.txt
@@ -0,0 +1,4 @@
+# sample action file (with only the actions for p1,
+#                     to be launched by deployment file)
+p0 recv p1
+p0 compute 12

diff --git a/examples/msg/actions/actions_split_p1.txt b/examples/msg/actions/actions_split_p1.txt
new file mode 100644 (file)
index 0000000..7f9d5cb
--- /dev/null
+++ b/examples/msg/actions/actions_split_p1.txt
@@ -0,0 +1,4 @@
+# sample action file (with only the actions for p1,
+#                     to be launched by deployment file)
+p1 send p0 1e10
+p1 sleep 12

diff --git a/examples/msg/actions/actions_toto.txt b/examples/msg/actions/actions_toto.txt
deleted file mode 100644 (file)
index de919a8..0000000
--- a/examples/msg/actions/actions_toto.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-# sample action file (with only the actions for toto, 
-#                     to be launched by deployment file)
-toto recv tutu
-toto compute 12

diff --git a/examples/msg/actions/actions_tutu.txt b/examples/msg/actions/actions_tutu.txt
deleted file mode 100644 (file)
index b75c013..0000000
--- a/examples/msg/actions/actions_tutu.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-# sample action file (with only the actions for tutu, 
-#                     to be launched by deployment file)
-tutu send toto 1e10
-tutu sleep 12

diff --git a/examples/msg/actions/actions_with_isend.txt b/examples/msg/actions/actions_with_isend.txt
index 3f0ae37..8793be6 100644 (file)
--- a/examples/msg/actions/actions_with_isend.txt
+++ b/examples/msg/actions/actions_with_isend.txt
@@ -1,15 +1,15 @@
 # sample action file
 # sample action file

-tutu send toto 1e9
-tutu compute 1e9
-tutu recv
+p0 send p1 1e9
+p0 compute 1e9
+p0 recv

 
 

-toto Irecv 
-toto compute 1e9
-toto wait
-toto send titi 1e9
+p1 Irecv 
+p1 compute 1e9
+p1 wait
+p1 send p2 1e9

 
 

-titi Irecv
-titi compute 5e8
-titi wait
-titi Isend tutu 1e9
-titi compute 5e8
+p2 Irecv
+p2 compute 5e8
+p2 wait
+p2 Isend p0 1e9
+p2 compute 5e8

diff --git a/examples/msg/actions/bcast_deployment.xml b/examples/msg/actions/bcast_deployment.xml
deleted file mode 100644 (file)
index 798b9cc..0000000
--- a/examples/msg/actions/bcast_deployment.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "simgrid.dtd">
-<platform version="2">
-  <process host="Tremblay" function="p0"/>
-  <process host="Jupiter" function="p1"/>
-  <process host="Fafard" function="p2"/>
-</platform>

diff --git a/examples/msg/actions/deployment.xml b/examples/msg/actions/deployment.xml
new file mode 100644 (file)
index 0000000..96802f4
--- /dev/null
+++ b/examples/msg/actions/deployment.xml
@@ -0,0 +1,7 @@
+<?xml version='1.0'?>
+<!DOCTYPE platform SYSTEM "simgrid.dtd">
+<platform version="2">
+  <process host="host0" function="p0"/>
+  <process host="host1" function="p1"/>
+  <process host="host2" function="p2"/>
+</platform>

diff --git a/examples/msg/actions/actions_deployment_split.xml b/examples/msg/actions/deployment_split.xml
similarity index 53%
rename from examples/msg/actions/actions_deployment_split.xml
rename to examples/msg/actions/deployment_split.xml
index f62c346..9f3ba8f 100644 (file)
--- a/examples/msg/actions/actions_deployment_split.xml
+++ b/examples/msg/actions/deployment_split.xml
@@ -2,16 +2,16 @@
      separate files, one per process.
      Launch it like this: 
      
      separate files, one per process.
      Launch it like this: 
      

-  ./actions ../small_platform.xml actions_deployment_split.xml 
+  ./actions homogeneous_3_hosts.xml deployment_split.xml 

 -->
 
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "simgrid.dtd">
 <platform version="2">
 -->
 
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "simgrid.dtd">
 <platform version="2">

-  <process host="Tremblay" function="toto">
-    <argument value="actions_toto.txt"/>
+  <process host="host0" function="p0">
+    <argument value="actions_p0.txt"/>

   </process>
   </process>

-  <process host="Jupiter" function="tutu">
-    <argument value="actions_tutu.txt"/>
+  <process host="host1" function="p1">
+    <argument value="actions_p1.txt"/>

   </process>
 </platform>
   </process>
 </platform>

diff --git a/examples/msg/actions/homogeneous_3_hosts.xml b/examples/msg/actions/homogeneous_3_hosts.xml
index eea9ea5..5231b36 100644 (file)
--- a/examples/msg/actions/homogeneous_3_hosts.xml
+++ b/examples/msg/actions/homogeneous_3_hosts.xml
@@ -2,34 +2,20 @@
  <!DOCTYPE platform SYSTEM "simgrid.dtd">
  <platform version="2">
  <AS  id="AS0"  routing="Full">
  <!DOCTYPE platform SYSTEM "simgrid.dtd">
  <platform version="2">
  <AS  id="AS0"  routing="Full">

-   <host id="Tremblay" power="1e7"/>
-   <host id="Jupiter" power="1e7"/>
-   <host id="Fafard" power="1e7"/>
+   <host id="host0" power="1e7"/>
+   <host id="host1" power="1e7"/>
+   <host id="host2" power="1e7"/>

    <link id="0" bandwidth="1e9" latency="5e-4"/>
    <link id="1" bandwidth="1e9" latency="5e-4"/>
    <link id="2" bandwidth="1e9" latency="5e-4"/>
    
    <link id="loopback" bandwidth="498000000" latency="0.000015" sharing_policy="FATPIPE"/>
    <link id="0" bandwidth="1e9" latency="5e-4"/>
    <link id="1" bandwidth="1e9" latency="5e-4"/>
    <link id="2" bandwidth="1e9" latency="5e-4"/>
    
    <link id="loopback" bandwidth="498000000" latency="0.000015" sharing_policy="FATPIPE"/>

-   <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="Tremblay" dst="Jupiter">
-     <link_ctn id="0"/>
-   </route>
-   <route src="Tremblay" dst="Fafard">
-     <link_ctn id="1"/>
-   </route>
-   <route src="Jupiter" dst="Tremblay">
-     <link_ctn id="0"/>
-   </route>
-   <route src="Jupiter" dst="Fafard">
-     <link_ctn id="2"/>
-   </route>
-   <route src="Fafard" dst="Tremblay">
-     <link_ctn id="1"/>
-   </route>
-   <route src="Fafard" dst="Jupiter">
-     <link_ctn id="2"/>
-   </route>
+   <route src="host0" dst="host0"><link_ctn id="loopback"/></route>
+   <route src="host1" dst="host1"><link_ctn id="loopback"/></route>
+   <route src="host2" dst="host2"><link_ctn id="loopback"/></route>
+   
+   <route src="host0" dst="host1"><link_ctn id="0"/></route>
+   <route src="host0" dst="host2"><link_ctn id="1"/></route>
+   <route src="host1" dst="host2"><link_ctn id="2"/></route>

  </AS>
  </platform>
  </AS>
  </platform>