modified tesh files

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

diff --git a/examples/lua/master_slave.tesh b/examples/lua/master_slave.tesh
index 9db772f..b739b40 100644 (file)
--- a/examples/lua/master_slave.tesh
+++ b/examples/lua/master_slave.tesh
@@ -11,7 +11,6 @@ $ lua master_slave.lua
 > [Tremblay:Master:(1) 0.000000] [lua/INFO] Argc=4 (should be 4)
 > [Tremblay:Master:(1) 0.000000] [lua/INFO] Creating task
 > [Tremblay:Master:(1) 0.000000] [lua/INFO] Master sending  'Task 1' To 'slave 1'
-> [Tremblay:Master:(1) 0.000000] [lua/INFO] send STACK(top=2): Table  `slave 1'  
 > [Bourassa:Slave:(2) 0.000000] [lua/INFO] Hello from lua, I'm a poor slave with mbox: slave 0
 > [Jupiter:Slave:(3) 0.000000] [lua/INFO] Hello from lua, I'm a poor slave with mbox: slave 1
 > [Fafard:Slave:(4) 0.000000] [lua/INFO] Hello from lua, I'm a poor slave with mbox: slave 2
@@ -20,88 +19,73 @@ $ lua master_slave.lua
 > [Tremblay:Master:(1) 0.165962] [lua/INFO] Master done sending 'Task 1' To 'slave 1'
 > [Tremblay:Master:(1) 0.165962] [lua/INFO] Creating task
 > [Tremblay:Master:(1) 0.165962] [lua/INFO] Master sending  'Task 2' To 'slave 2'
-> [Tremblay:Master:(1) 0.165962] [lua/INFO] send STACK(top=2): Table  `slave 2'  
 > [Fafard:Slave:(4) 0.384115] [lua/INFO] Slave 'slave 2' processing Task 2
 > [Tremblay:Master:(1) 0.384115] [lua/INFO] Master done sending 'Task 2' To 'slave 2'
 > [Tremblay:Master:(1) 0.384115] [lua/INFO] Creating task
 > [Tremblay:Master:(1) 0.384115] [lua/INFO] Master sending  'Task 3' To 'slave 3'
-> [Tremblay:Master:(1) 0.384115] [lua/INFO] send STACK(top=2): Table  `slave 3'  
 > [Ginette:Slave:(5) 0.524575] [lua/INFO] Slave 'slave 3' processing Task 3
 > [Tremblay:Master:(1) 0.524575] [lua/INFO] Master done sending 'Task 3' To 'slave 3'
 > [Tremblay:Master:(1) 0.524575] [lua/INFO] Creating task
 > [Tremblay:Master:(1) 0.524575] [lua/INFO] Master sending  'Task 4' To 'slave 0'
-> [Tremblay:Master:(1) 0.524575] [lua/INFO] send STACK(top=2): Table  `slave 0'  
 > [Bourassa:Slave:(2) 0.740447] [lua/INFO] Slave 'slave 0' processing Task 4
 > [Tremblay:Master:(1) 0.740447] [lua/INFO] Master done sending 'Task 4' To 'slave 0'
 > [Tremblay:Master:(1) 0.740447] [lua/INFO] Creating task
 > [Tremblay:Master:(1) 0.740447] [lua/INFO] Master sending  'Task 5' To 'slave 1'
-> [Tremblay:Master:(1) 0.740447] [lua/INFO] send STACK(top=2): Table  `slave 1'  
 > [Jupiter:Slave:(3) 0.821304] [lua/INFO] Slave 'slave 1': task Task 1 done
 > [Jupiter:Slave:(3) 0.987266] [lua/INFO] Slave 'slave 1' processing Task 5
 > [Tremblay:Master:(1) 0.987266] [lua/INFO] Master done sending 'Task 5' To 'slave 1'
 > [Tremblay:Master:(1) 0.987266] [lua/INFO] Creating task
 > [Tremblay:Master:(1) 0.987266] [lua/INFO] Master sending  'Task 6' To 'slave 2'
-> [Tremblay:Master:(1) 0.987266] [lua/INFO] send STACK(top=2): Table  `slave 2'  
 > [Fafard:Slave:(4) 1.039457] [lua/INFO] Slave 'slave 2': task Task 2 done
 > [Fafard:Slave:(4) 1.257610] [lua/INFO] Slave 'slave 2' processing Task 6
 > [Tremblay:Master:(1) 1.257610] [lua/INFO] Master done sending 'Task 6' To 'slave 2'
 > [Tremblay:Master:(1) 1.257610] [lua/INFO] Creating task
 > [Tremblay:Master:(1) 1.257610] [lua/INFO] Master sending  'Task 7' To 'slave 3'
-> [Tremblay:Master:(1) 1.257610] [lua/INFO] send STACK(top=2): Table  `slave 3'  
 > [Ginette:Slave:(5) 1.555672] [lua/INFO] Slave 'slave 3': task Task 3 done
 > [Jupiter:Slave:(3) 1.642608] [lua/INFO] Slave 'slave 1': task Task 5 done
 > [Ginette:Slave:(5) 1.696132] [lua/INFO] Slave 'slave 3' processing Task 7
 > [Tremblay:Master:(1) 1.696132] [lua/INFO] Master done sending 'Task 7' To 'slave 3'
 > [Tremblay:Master:(1) 1.696132] [lua/INFO] Creating task
 > [Tremblay:Master:(1) 1.696132] [lua/INFO] Master sending  'Task 8' To 'slave 0'
-> [Tremblay:Master:(1) 1.696132] [lua/INFO] send STACK(top=2): Table  `slave 0'  
 > [Bourassa:Slave:(2) 1.771545] [lua/INFO] Slave 'slave 0': task Task 4 done
 > [Fafard:Slave:(4) 1.912953] [lua/INFO] Slave 'slave 2': task Task 6 done
 > [Bourassa:Slave:(2) 1.987417] [lua/INFO] Slave 'slave 0' processing Task 8
 > [Tremblay:Master:(1) 1.987417] [lua/INFO] Master done sending 'Task 8' To 'slave 0'
 > [Tremblay:Master:(1) 1.987417] [lua/INFO] Creating task
 > [Tremblay:Master:(1) 1.987417] [lua/INFO] Master sending  'Task 9' To 'slave 1'
-> [Tremblay:Master:(1) 1.987417] [lua/INFO] send STACK(top=2): Table  `slave 1'  
 > [Jupiter:Slave:(3) 2.153379] [lua/INFO] Slave 'slave 1' processing Task 9
 > [Tremblay:Master:(1) 2.153379] [lua/INFO] Master done sending 'Task 9' To 'slave 1'
 > [Tremblay:Master:(1) 2.153379] [lua/INFO] Creating task
 > [Tremblay:Master:(1) 2.153379] [lua/INFO] Master sending  'Task 10' To 'slave 2'
-> [Tremblay:Master:(1) 2.153379] [lua/INFO] send STACK(top=2): Table  `slave 2'  
 > [Fafard:Slave:(4) 2.371532] [lua/INFO] Slave 'slave 2' processing Task 10
 > [Tremblay:Master:(1) 2.371532] [lua/INFO] Master done sending 'Task 10' To 'slave 2'
 > [Tremblay:Master:(1) 2.371532] [lua/INFO] Creating task
 > [Tremblay:Master:(1) 2.371532] [lua/INFO] Master sending  'Task 11' To 'slave 3'
-> [Tremblay:Master:(1) 2.371532] [lua/INFO] send STACK(top=2): Table  `slave 3'  
 > [Ginette:Slave:(5) 2.727230] [lua/INFO] Slave 'slave 3': task Task 7 done
 > [Jupiter:Slave:(3) 2.808721] [lua/INFO] Slave 'slave 1': task Task 9 done
 > [Ginette:Slave:(5) 2.867690] [lua/INFO] Slave 'slave 3' processing Task 11
 > [Tremblay:Master:(1) 2.867690] [lua/INFO] Master done sending 'Task 11' To 'slave 3'
 > [Tremblay:Master:(1) 2.867690] [lua/INFO] Creating task
 > [Tremblay:Master:(1) 2.867690] [lua/INFO] Master sending  'Task 12' To 'slave 0'
-> [Tremblay:Master:(1) 2.867690] [lua/INFO] send STACK(top=2): Table  `slave 0'  
 > [Bourassa:Slave:(2) 3.018515] [lua/INFO] Slave 'slave 0': task Task 8 done
 > [Fafard:Slave:(4) 3.026874] [lua/INFO] Slave 'slave 2': task Task 10 done
 > [Bourassa:Slave:(2) 3.234387] [lua/INFO] Slave 'slave 0' processing Task 12
 > [Tremblay:Master:(1) 3.234387] [lua/INFO] Master done sending 'Task 12' To 'slave 0'
 > [Tremblay:Master:(1) 3.234387] [lua/INFO] Creating task
 > [Tremblay:Master:(1) 3.234387] [lua/INFO] Master sending  'Task 13' To 'slave 1'
-> [Tremblay:Master:(1) 3.234387] [lua/INFO] send STACK(top=2): Table  `slave 1'  
 > [Jupiter:Slave:(3) 3.400349] [lua/INFO] Slave 'slave 1' processing Task 13
 > [Tremblay:Master:(1) 3.400349] [lua/INFO] Master done sending 'Task 13' To 'slave 1'
 > [Tremblay:Master:(1) 3.400349] [lua/INFO] Creating task
 > [Tremblay:Master:(1) 3.400349] [lua/INFO] Master sending  'Task 14' To 'slave 2'
-> [Tremblay:Master:(1) 3.400349] [lua/INFO] send STACK(top=2): Table  `slave 2'  
 > [Fafard:Slave:(4) 3.618502] [lua/INFO] Slave 'slave 2' processing Task 14
 > [Tremblay:Master:(1) 3.618502] [lua/INFO] Master done sending 'Task 14' To 'slave 2'
 > [Tremblay:Master:(1) 3.618502] [lua/INFO] Creating task
 > [Tremblay:Master:(1) 3.618502] [lua/INFO] Master sending  'Task 15' To 'slave 3'
-> [Tremblay:Master:(1) 3.618502] [lua/INFO] send STACK(top=2): Table  `slave 3'  
 > [Ginette:Slave:(5) 3.898788] [lua/INFO] Slave 'slave 3': task Task 11 done
 > [Ginette:Slave:(5) 4.039247] [lua/INFO] Slave 'slave 3' processing Task 15
 > [Tremblay:Master:(1) 4.039247] [lua/INFO] Master done sending 'Task 15' To 'slave 3'
 > [Tremblay:Master:(1) 4.039247] [lua/INFO] Creating task
 > [Tremblay:Master:(1) 4.039247] [lua/INFO] Master sending  'Task 16' To 'slave 0'
-> [Tremblay:Master:(1) 4.039247] [lua/INFO] send STACK(top=2): Table  `slave 0'  
 > [Jupiter:Slave:(3) 4.055691] [lua/INFO] Slave 'slave 1': task Task 13 done
 > [Bourassa:Slave:(2) 4.265485] [lua/INFO] Slave 'slave 0': task Task 12 done
 > [Fafard:Slave:(4) 4.273845] [lua/INFO] Slave 'slave 2': task Task 14 done
@@ -109,23 +93,19 @@ $ lua master_slave.lua
 > [Tremblay:Master:(1) 4.481357] [lua/INFO] Master done sending 'Task 16' To 'slave 0'
 > [Tremblay:Master:(1) 4.481357] [lua/INFO] Creating task
 > [Tremblay:Master:(1) 4.481357] [lua/INFO] Master sending  'Task 17' To 'slave 1'
-> [Tremblay:Master:(1) 4.481357] [lua/INFO] send STACK(top=2): Table  `slave 1'  
 > [Jupiter:Slave:(3) 4.647319] [lua/INFO] Slave 'slave 1' processing Task 17
 > [Tremblay:Master:(1) 4.647319] [lua/INFO] Master done sending 'Task 17' To 'slave 1'
 > [Tremblay:Master:(1) 4.647319] [lua/INFO] Creating task
 > [Tremblay:Master:(1) 4.647319] [lua/INFO] Master sending  'Task 18' To 'slave 2'
-> [Tremblay:Master:(1) 4.647319] [lua/INFO] send STACK(top=2): Table  `slave 2'  
 > [Fafard:Slave:(4) 4.865472] [lua/INFO] Slave 'slave 2' processing Task 18
 > [Tremblay:Master:(1) 4.865472] [lua/INFO] Master done sending 'Task 18' To 'slave 2'
 > [Tremblay:Master:(1) 4.865472] [lua/INFO] Creating task
 > [Tremblay:Master:(1) 4.865472] [lua/INFO] Master sending  'Task 19' To 'slave 3'
-> [Tremblay:Master:(1) 4.865472] [lua/INFO] send STACK(top=2): Table  `slave 3'  
 > [Ginette:Slave:(5) 5.070345] [lua/INFO] Slave 'slave 3': task Task 15 done
 > [Ginette:Slave:(5) 5.210805] [lua/INFO] Slave 'slave 3' processing Task 19
 > [Tremblay:Master:(1) 5.210805] [lua/INFO] Master done sending 'Task 19' To 'slave 3'
 > [Tremblay:Master:(1) 5.210805] [lua/INFO] Creating task
 > [Tremblay:Master:(1) 5.210805] [lua/INFO] Master sending  'Task 20' To 'slave 0'
-> [Tremblay:Master:(1) 5.210805] [lua/INFO] send STACK(top=2): Table  `slave 0'  
 > [Jupiter:Slave:(3) 5.302662] [lua/INFO] Slave 'slave 1': task Task 17 done
 > [Bourassa:Slave:(2) 5.512455] [lua/INFO] Slave 'slave 0': task Task 16 done
 > [Fafard:Slave:(4) 5.520815] [lua/INFO] Slave 'slave 2': task Task 18 done
@@ -134,26 +114,21 @@ $ lua master_slave.lua
 > [Tremblay:Master:(1) 5.728328] [lua/INFO] Master: All tasks have been dispatched. Let's tell everybody the computation is over.
 > [Tremblay:Master:(1) 5.728328] [lua/INFO] Master: sending finalize to slave 0
 > [Tremblay:Master:(1) 5.728328] [lua/INFO] Creating task
-> [Tremblay:Master:(1) 5.728328] [lua/INFO] send STACK(top=2): Table  `slave 0'  
 > [Ginette:Slave:(5) 6.241903] [lua/INFO] Slave 'slave 3': task Task 19 done
 > [Bourassa:Slave:(2) 6.759426] [lua/INFO] Slave 'slave 0': task Task 20 done
 > [Bourassa:Slave:(2) 6.975298] [lua/INFO] Slave 'slave 0' got finalize msg
 > [Bourassa:Slave:(2) 6.975298] [lua/INFO] Slave 'slave 0': I'm Done . See You !!
 > [Tremblay:Master:(1) 6.975298] [lua/INFO] Master: sending finalize to slave 1
 > [Tremblay:Master:(1) 6.975298] [lua/INFO] Creating task
-> [Tremblay:Master:(1) 6.975298] [lua/INFO] send STACK(top=2): Table  `slave 1'  
 > [Jupiter:Slave:(3) 7.141260] [lua/INFO] Slave 'slave 1' got finalize msg
 > [Jupiter:Slave:(3) 7.141260] [lua/INFO] Slave 'slave 1': I'm Done . See You !!
 > [Tremblay:Master:(1) 7.141260] [lua/INFO] Master: sending finalize to slave 2
 > [Tremblay:Master:(1) 7.141260] [lua/INFO] Creating task
-> [Tremblay:Master:(1) 7.141260] [lua/INFO] send STACK(top=2): Table  `slave 2'  
 > [Fafard:Slave:(4) 7.359413] [lua/INFO] Slave 'slave 2' got finalize msg
 > [Fafard:Slave:(4) 7.359413] [lua/INFO] Slave 'slave 2': I'm Done . See You !!
 > [Tremblay:Master:(1) 7.359413] [lua/INFO] Master: sending finalize to slave 3
 > [Tremblay:Master:(1) 7.359413] [lua/INFO] Creating task
-> [Tremblay:Master:(1) 7.359413] [lua/INFO] send STACK(top=2): Table  `slave 3'  
 > [Ginette:Slave:(5) 7.499872] [lua/INFO] Slave 'slave 3' got finalize msg
 > [Ginette:Slave:(5) 7.499872] [lua/INFO] Slave 'slave 3': I'm Done . See You !!
 > [Tremblay:Master:(1) 7.499872] [lua/INFO] Master: Everything's done.
 > [7.499872] [lua/INFO] Simulation's over.See you.
-

diff --git a/examples/lua/mult_matrix.tesh b/examples/lua/mult_matrix.tesh
index 9db772f..ec2cb2d 100644 (file)
--- a/examples/lua/mult_matrix.tesh
+++ b/examples/lua/mult_matrix.tesh
@@ -1,159 +1,14 @@
-# compile the master_slave example
+# compile the mult_matrix example
 
 # Later modify the commande and specify the platform and deployment path
 
-$ lua master_slave.lua
-> [Tremblay:Master:(1) 0.000000] [lua/INFO] Hello from lua, I'm the master
-> [Tremblay:Master:(1) 0.000000] [lua/INFO] Got 20
-> [Tremblay:Master:(1) 0.000000] [lua/INFO] Got 50000000
-> [Tremblay:Master:(1) 0.000000] [lua/INFO] Got 1000000
-> [Tremblay:Master:(1) 0.000000] [lua/INFO] Got 4
-> [Tremblay:Master:(1) 0.000000] [lua/INFO] Argc=4 (should be 4)
-> [Tremblay:Master:(1) 0.000000] [lua/INFO] Creating task
-> [Tremblay:Master:(1) 0.000000] [lua/INFO] Master sending  'Task 1' To 'slave 1'
-> [Tremblay:Master:(1) 0.000000] [lua/INFO] send STACK(top=2): Table  `slave 1'  
-> [Bourassa:Slave:(2) 0.000000] [lua/INFO] Hello from lua, I'm a poor slave with mbox: slave 0
-> [Jupiter:Slave:(3) 0.000000] [lua/INFO] Hello from lua, I'm a poor slave with mbox: slave 1
-> [Fafard:Slave:(4) 0.000000] [lua/INFO] Hello from lua, I'm a poor slave with mbox: slave 2
-> [Ginette:Slave:(5) 0.000000] [lua/INFO] Hello from lua, I'm a poor slave with mbox: slave 3
-> [Jupiter:Slave:(3) 0.165962] [lua/INFO] Slave 'slave 1' processing Task 1
-> [Tremblay:Master:(1) 0.165962] [lua/INFO] Master done sending 'Task 1' To 'slave 1'
-> [Tremblay:Master:(1) 0.165962] [lua/INFO] Creating task
-> [Tremblay:Master:(1) 0.165962] [lua/INFO] Master sending  'Task 2' To 'slave 2'
-> [Tremblay:Master:(1) 0.165962] [lua/INFO] send STACK(top=2): Table  `slave 2'  
-> [Fafard:Slave:(4) 0.384115] [lua/INFO] Slave 'slave 2' processing Task 2
-> [Tremblay:Master:(1) 0.384115] [lua/INFO] Master done sending 'Task 2' To 'slave 2'
-> [Tremblay:Master:(1) 0.384115] [lua/INFO] Creating task
-> [Tremblay:Master:(1) 0.384115] [lua/INFO] Master sending  'Task 3' To 'slave 3'
-> [Tremblay:Master:(1) 0.384115] [lua/INFO] send STACK(top=2): Table  `slave 3'  
-> [Ginette:Slave:(5) 0.524575] [lua/INFO] Slave 'slave 3' processing Task 3
-> [Tremblay:Master:(1) 0.524575] [lua/INFO] Master done sending 'Task 3' To 'slave 3'
-> [Tremblay:Master:(1) 0.524575] [lua/INFO] Creating task
-> [Tremblay:Master:(1) 0.524575] [lua/INFO] Master sending  'Task 4' To 'slave 0'
-> [Tremblay:Master:(1) 0.524575] [lua/INFO] send STACK(top=2): Table  `slave 0'  
-> [Bourassa:Slave:(2) 0.740447] [lua/INFO] Slave 'slave 0' processing Task 4
-> [Tremblay:Master:(1) 0.740447] [lua/INFO] Master done sending 'Task 4' To 'slave 0'
-> [Tremblay:Master:(1) 0.740447] [lua/INFO] Creating task
-> [Tremblay:Master:(1) 0.740447] [lua/INFO] Master sending  'Task 5' To 'slave 1'
-> [Tremblay:Master:(1) 0.740447] [lua/INFO] send STACK(top=2): Table  `slave 1'  
-> [Jupiter:Slave:(3) 0.821304] [lua/INFO] Slave 'slave 1': task Task 1 done
-> [Jupiter:Slave:(3) 0.987266] [lua/INFO] Slave 'slave 1' processing Task 5
-> [Tremblay:Master:(1) 0.987266] [lua/INFO] Master done sending 'Task 5' To 'slave 1'
-> [Tremblay:Master:(1) 0.987266] [lua/INFO] Creating task
-> [Tremblay:Master:(1) 0.987266] [lua/INFO] Master sending  'Task 6' To 'slave 2'
-> [Tremblay:Master:(1) 0.987266] [lua/INFO] send STACK(top=2): Table  `slave 2'  
-> [Fafard:Slave:(4) 1.039457] [lua/INFO] Slave 'slave 2': task Task 2 done
-> [Fafard:Slave:(4) 1.257610] [lua/INFO] Slave 'slave 2' processing Task 6
-> [Tremblay:Master:(1) 1.257610] [lua/INFO] Master done sending 'Task 6' To 'slave 2'
-> [Tremblay:Master:(1) 1.257610] [lua/INFO] Creating task
-> [Tremblay:Master:(1) 1.257610] [lua/INFO] Master sending  'Task 7' To 'slave 3'
-> [Tremblay:Master:(1) 1.257610] [lua/INFO] send STACK(top=2): Table  `slave 3'  
-> [Ginette:Slave:(5) 1.555672] [lua/INFO] Slave 'slave 3': task Task 3 done
-> [Jupiter:Slave:(3) 1.642608] [lua/INFO] Slave 'slave 1': task Task 5 done
-> [Ginette:Slave:(5) 1.696132] [lua/INFO] Slave 'slave 3' processing Task 7
-> [Tremblay:Master:(1) 1.696132] [lua/INFO] Master done sending 'Task 7' To 'slave 3'
-> [Tremblay:Master:(1) 1.696132] [lua/INFO] Creating task
-> [Tremblay:Master:(1) 1.696132] [lua/INFO] Master sending  'Task 8' To 'slave 0'
-> [Tremblay:Master:(1) 1.696132] [lua/INFO] send STACK(top=2): Table  `slave 0'  
-> [Bourassa:Slave:(2) 1.771545] [lua/INFO] Slave 'slave 0': task Task 4 done
-> [Fafard:Slave:(4) 1.912953] [lua/INFO] Slave 'slave 2': task Task 6 done
-> [Bourassa:Slave:(2) 1.987417] [lua/INFO] Slave 'slave 0' processing Task 8
-> [Tremblay:Master:(1) 1.987417] [lua/INFO] Master done sending 'Task 8' To 'slave 0'
-> [Tremblay:Master:(1) 1.987417] [lua/INFO] Creating task
-> [Tremblay:Master:(1) 1.987417] [lua/INFO] Master sending  'Task 9' To 'slave 1'
-> [Tremblay:Master:(1) 1.987417] [lua/INFO] send STACK(top=2): Table  `slave 1'  
-> [Jupiter:Slave:(3) 2.153379] [lua/INFO] Slave 'slave 1' processing Task 9
-> [Tremblay:Master:(1) 2.153379] [lua/INFO] Master done sending 'Task 9' To 'slave 1'
-> [Tremblay:Master:(1) 2.153379] [lua/INFO] Creating task
-> [Tremblay:Master:(1) 2.153379] [lua/INFO] Master sending  'Task 10' To 'slave 2'
-> [Tremblay:Master:(1) 2.153379] [lua/INFO] send STACK(top=2): Table  `slave 2'  
-> [Fafard:Slave:(4) 2.371532] [lua/INFO] Slave 'slave 2' processing Task 10
-> [Tremblay:Master:(1) 2.371532] [lua/INFO] Master done sending 'Task 10' To 'slave 2'
-> [Tremblay:Master:(1) 2.371532] [lua/INFO] Creating task
-> [Tremblay:Master:(1) 2.371532] [lua/INFO] Master sending  'Task 11' To 'slave 3'
-> [Tremblay:Master:(1) 2.371532] [lua/INFO] send STACK(top=2): Table  `slave 3'  
-> [Ginette:Slave:(5) 2.727230] [lua/INFO] Slave 'slave 3': task Task 7 done
-> [Jupiter:Slave:(3) 2.808721] [lua/INFO] Slave 'slave 1': task Task 9 done
-> [Ginette:Slave:(5) 2.867690] [lua/INFO] Slave 'slave 3' processing Task 11
-> [Tremblay:Master:(1) 2.867690] [lua/INFO] Master done sending 'Task 11' To 'slave 3'
-> [Tremblay:Master:(1) 2.867690] [lua/INFO] Creating task
-> [Tremblay:Master:(1) 2.867690] [lua/INFO] Master sending  'Task 12' To 'slave 0'
-> [Tremblay:Master:(1) 2.867690] [lua/INFO] send STACK(top=2): Table  `slave 0'  
-> [Bourassa:Slave:(2) 3.018515] [lua/INFO] Slave 'slave 0': task Task 8 done
-> [Fafard:Slave:(4) 3.026874] [lua/INFO] Slave 'slave 2': task Task 10 done
-> [Bourassa:Slave:(2) 3.234387] [lua/INFO] Slave 'slave 0' processing Task 12
-> [Tremblay:Master:(1) 3.234387] [lua/INFO] Master done sending 'Task 12' To 'slave 0'
-> [Tremblay:Master:(1) 3.234387] [lua/INFO] Creating task
-> [Tremblay:Master:(1) 3.234387] [lua/INFO] Master sending  'Task 13' To 'slave 1'
-> [Tremblay:Master:(1) 3.234387] [lua/INFO] send STACK(top=2): Table  `slave 1'  
-> [Jupiter:Slave:(3) 3.400349] [lua/INFO] Slave 'slave 1' processing Task 13
-> [Tremblay:Master:(1) 3.400349] [lua/INFO] Master done sending 'Task 13' To 'slave 1'
-> [Tremblay:Master:(1) 3.400349] [lua/INFO] Creating task
-> [Tremblay:Master:(1) 3.400349] [lua/INFO] Master sending  'Task 14' To 'slave 2'
-> [Tremblay:Master:(1) 3.400349] [lua/INFO] send STACK(top=2): Table  `slave 2'  
-> [Fafard:Slave:(4) 3.618502] [lua/INFO] Slave 'slave 2' processing Task 14
-> [Tremblay:Master:(1) 3.618502] [lua/INFO] Master done sending 'Task 14' To 'slave 2'
-> [Tremblay:Master:(1) 3.618502] [lua/INFO] Creating task
-> [Tremblay:Master:(1) 3.618502] [lua/INFO] Master sending  'Task 15' To 'slave 3'
-> [Tremblay:Master:(1) 3.618502] [lua/INFO] send STACK(top=2): Table  `slave 3'  
-> [Ginette:Slave:(5) 3.898788] [lua/INFO] Slave 'slave 3': task Task 11 done
-> [Ginette:Slave:(5) 4.039247] [lua/INFO] Slave 'slave 3' processing Task 15
-> [Tremblay:Master:(1) 4.039247] [lua/INFO] Master done sending 'Task 15' To 'slave 3'
-> [Tremblay:Master:(1) 4.039247] [lua/INFO] Creating task
-> [Tremblay:Master:(1) 4.039247] [lua/INFO] Master sending  'Task 16' To 'slave 0'
-> [Tremblay:Master:(1) 4.039247] [lua/INFO] send STACK(top=2): Table  `slave 0'  
-> [Jupiter:Slave:(3) 4.055691] [lua/INFO] Slave 'slave 1': task Task 13 done
-> [Bourassa:Slave:(2) 4.265485] [lua/INFO] Slave 'slave 0': task Task 12 done
-> [Fafard:Slave:(4) 4.273845] [lua/INFO] Slave 'slave 2': task Task 14 done
-> [Bourassa:Slave:(2) 4.481357] [lua/INFO] Slave 'slave 0' processing Task 16
-> [Tremblay:Master:(1) 4.481357] [lua/INFO] Master done sending 'Task 16' To 'slave 0'
-> [Tremblay:Master:(1) 4.481357] [lua/INFO] Creating task
-> [Tremblay:Master:(1) 4.481357] [lua/INFO] Master sending  'Task 17' To 'slave 1'
-> [Tremblay:Master:(1) 4.481357] [lua/INFO] send STACK(top=2): Table  `slave 1'  
-> [Jupiter:Slave:(3) 4.647319] [lua/INFO] Slave 'slave 1' processing Task 17
-> [Tremblay:Master:(1) 4.647319] [lua/INFO] Master done sending 'Task 17' To 'slave 1'
-> [Tremblay:Master:(1) 4.647319] [lua/INFO] Creating task
-> [Tremblay:Master:(1) 4.647319] [lua/INFO] Master sending  'Task 18' To 'slave 2'
-> [Tremblay:Master:(1) 4.647319] [lua/INFO] send STACK(top=2): Table  `slave 2'  
-> [Fafard:Slave:(4) 4.865472] [lua/INFO] Slave 'slave 2' processing Task 18
-> [Tremblay:Master:(1) 4.865472] [lua/INFO] Master done sending 'Task 18' To 'slave 2'
-> [Tremblay:Master:(1) 4.865472] [lua/INFO] Creating task
-> [Tremblay:Master:(1) 4.865472] [lua/INFO] Master sending  'Task 19' To 'slave 3'
-> [Tremblay:Master:(1) 4.865472] [lua/INFO] send STACK(top=2): Table  `slave 3'  
-> [Ginette:Slave:(5) 5.070345] [lua/INFO] Slave 'slave 3': task Task 15 done
-> [Ginette:Slave:(5) 5.210805] [lua/INFO] Slave 'slave 3' processing Task 19
-> [Tremblay:Master:(1) 5.210805] [lua/INFO] Master done sending 'Task 19' To 'slave 3'
-> [Tremblay:Master:(1) 5.210805] [lua/INFO] Creating task
-> [Tremblay:Master:(1) 5.210805] [lua/INFO] Master sending  'Task 20' To 'slave 0'
-> [Tremblay:Master:(1) 5.210805] [lua/INFO] send STACK(top=2): Table  `slave 0'  
-> [Jupiter:Slave:(3) 5.302662] [lua/INFO] Slave 'slave 1': task Task 17 done
-> [Bourassa:Slave:(2) 5.512455] [lua/INFO] Slave 'slave 0': task Task 16 done
-> [Fafard:Slave:(4) 5.520815] [lua/INFO] Slave 'slave 2': task Task 18 done
-> [Bourassa:Slave:(2) 5.728328] [lua/INFO] Slave 'slave 0' processing Task 20
-> [Tremblay:Master:(1) 5.728328] [lua/INFO] Master done sending 'Task 20' To 'slave 0'
-> [Tremblay:Master:(1) 5.728328] [lua/INFO] Master: All tasks have been dispatched. Let's tell everybody the computation is over.
-> [Tremblay:Master:(1) 5.728328] [lua/INFO] Master: sending finalize to slave 0
-> [Tremblay:Master:(1) 5.728328] [lua/INFO] Creating task
-> [Tremblay:Master:(1) 5.728328] [lua/INFO] send STACK(top=2): Table  `slave 0'  
-> [Ginette:Slave:(5) 6.241903] [lua/INFO] Slave 'slave 3': task Task 19 done
-> [Bourassa:Slave:(2) 6.759426] [lua/INFO] Slave 'slave 0': task Task 20 done
-> [Bourassa:Slave:(2) 6.975298] [lua/INFO] Slave 'slave 0' got finalize msg
-> [Bourassa:Slave:(2) 6.975298] [lua/INFO] Slave 'slave 0': I'm Done . See You !!
-> [Tremblay:Master:(1) 6.975298] [lua/INFO] Master: sending finalize to slave 1
-> [Tremblay:Master:(1) 6.975298] [lua/INFO] Creating task
-> [Tremblay:Master:(1) 6.975298] [lua/INFO] send STACK(top=2): Table  `slave 1'  
-> [Jupiter:Slave:(3) 7.141260] [lua/INFO] Slave 'slave 1' got finalize msg
-> [Jupiter:Slave:(3) 7.141260] [lua/INFO] Slave 'slave 1': I'm Done . See You !!
-> [Tremblay:Master:(1) 7.141260] [lua/INFO] Master: sending finalize to slave 2
-> [Tremblay:Master:(1) 7.141260] [lua/INFO] Creating task
-> [Tremblay:Master:(1) 7.141260] [lua/INFO] send STACK(top=2): Table  `slave 2'  
-> [Fafard:Slave:(4) 7.359413] [lua/INFO] Slave 'slave 2' got finalize msg
-> [Fafard:Slave:(4) 7.359413] [lua/INFO] Slave 'slave 2': I'm Done . See You !!
-> [Tremblay:Master:(1) 7.359413] [lua/INFO] Master: sending finalize to slave 3
-> [Tremblay:Master:(1) 7.359413] [lua/INFO] Creating task
-> [Tremblay:Master:(1) 7.359413] [lua/INFO] send STACK(top=2): Table  `slave 3'  
-> [Ginette:Slave:(5) 7.499872] [lua/INFO] Slave 'slave 3' got finalize msg
-> [Ginette:Slave:(5) 7.499872] [lua/INFO] Slave 'slave 3': I'm Done . See You !!
-> [Tremblay:Master:(1) 7.499872] [lua/INFO] Master: Everything's done.
-> [7.499872] [lua/INFO] Simulation's over.See you.
-
+$ lua mult_matrix.lua
+> [Inmos:Sender:(1) 0.000000] [lua/INFO] Hello From Sender
+> [Inmos:Sender:(1) 0.000000] [lua/INFO] Argc=4 (should be 4)
+> [Inmos:Sender:(1) 0.000000] [lua/INFO] Creating task
+> [Inmos:Sender:(1) 0.000000] [lua/INFO] Sending matrix_task to Bellevue
+> [Bellevue:Receiver:(2) 0.000000] [lua/INFO] Hello From Receiver
+> [Bellevue:Receiver:(2) 0.000000] [lua/INFO] Receiving Task from Inmos
+> [Bellevue:Receiver:(2) 0.030276] [lua/INFO] Calcul is done ... Bye
+> [Inmos:Sender:(1) 0.030276] [lua/INFO] Got the Multiplication result ...Bye
+> [0.030276] [lua/INFO] Simulation's over.See you.

diff --git a/src/bindings/lua/simgrid_lua.c b/src/bindings/lua/simgrid_lua.c
index 07832fc..6468de3 100644 (file)
--- a/src/bindings/lua/simgrid_lua.c
+++ b/src/bindings/lua/simgrid_lua.c
@@ -26,12 +26,9 @@ static void stackDump (const char *msg, lua_State *L) {
   char *p=buff;
   int i;
   int top = lua_gettop(L);
-//  void *ptr;
+
   fflush(stdout);
   p+=sprintf(p,"STACK(top=%d): ",top);
-/*  lua_getglobal(L,"vardump");
-  xbt_assert0(lua_isfunction(L,-1), "Vardump not found");
-*/
 
   for (i = 1; i <= top; i++) {  /* repeat for each level */
 
@@ -85,17 +82,15 @@ static m_task_t checkTask (lua_State *L,int index) {
 }
 
 /** @brief leaves a new userdata on top of the stack, sets its metatable, and sets the Task pointer inside the userdata */
+// NOT USED
 /*static m_task_t *pushTask (lua_State *L,m_task_t tk) {
-
   m_task_t *pi = NULL;
   pi = (m_task_t*)lua_newuserdata(L,sizeof(m_task_t));
   *pi=tk;
-
   DEBUG1("push lua task with Name : %s \n",MSG_task_get_name(*pi));
   luaL_getmetatable(L,TASK_MODULE_NAME);
   lua_setmetatable(L,-2);
   return pi;
-
 }*/
 
 /* ********************************************************************************* */
@@ -151,7 +146,7 @@ static int Task_destroy(lua_State *L) {
   return 1;
 }
 static int Task_send(lua_State *L)  {
-  stackDump("send ",L);
+  //stackDump("send ",L);
   m_task_t tk = checkTask(L,-2);
   const char *mailbox = luaL_checkstring(L,-1);
   lua_pop(L,1); // remove the string so that the task is on top of it
@@ -176,6 +171,7 @@ static int Task_send(lua_State *L)  {
     }
   return 0;
 }
+
 static int Task_recv(lua_State *L)  {
   m_task_t tk = NULL;
   const char *mailbox = luaL_checkstring(L,-1);
@@ -255,9 +251,7 @@ static int Host_get_by_name(lua_State *L)
        m_host_t msg_host = MSG_get_host_by_name(name);
        if (!msg_host)
                {
-               //ERROR1("MSG_get_host_by_name(%s) failled",name);
                luaL_error(L,"null Host : MSG_get_host_by_name failled");
-               //return -1;
                }
     lua_newtable (L); /* create a table, put the userdata on top of it */
        m_host_t *lua_host = (m_host_t*)lua_newuserdata(L,sizeof(m_host_t));
@@ -316,7 +310,6 @@ extern lua_State *simgrid_lua_state;
 
 static int run_lua_code(int argc,char **argv) {
   DEBUG1("Run lua code %s",argv[0]);
-//  fprintf(stderr,"Run lua code %s\n", (argv ? argv[0] : "(null)"));
   lua_State *L = lua_newthread(simgrid_lua_state);
   int ref = luaL_ref(simgrid_lua_state, LUA_REGISTRYINDEX); // protect the thread from being garbage collected
   int res = 1;