From 9a17ee50f5ac1e197040595cbf31dedb6dda5ab6 Mon Sep 17 00:00:00 2001 From: navarrop Date: Thu, 8 Apr 2010 17:26:42 +0000 Subject: [PATCH] Modified tesh files. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7486 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- examples/lua/master_slave.tesh | 25 +++++++++++++++++++++++++ examples/lua/mult_matrix.tesh | 25 +++++++++++++++++++++++++ examples/ruby/MasterSlave.tesh | 2 +- src/bindings/ruby/simgrid.rb | 4 ++-- 4 files changed, 53 insertions(+), 3 deletions(-) diff --git a/examples/lua/master_slave.tesh b/examples/lua/master_slave.tesh index b739b40ff4..9db772f35a 100644 --- a/examples/lua/master_slave.tesh +++ b/examples/lua/master_slave.tesh @@ -11,6 +11,7 @@ $ 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 @@ -19,73 +20,88 @@ $ 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 @@ -93,19 +109,23 @@ $ 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 @@ -114,21 +134,26 @@ $ 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 b739b40ff4..9db772f35a 100644 --- a/examples/lua/mult_matrix.tesh +++ b/examples/lua/mult_matrix.tesh @@ -11,6 +11,7 @@ $ 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 @@ -19,73 +20,88 @@ $ 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 @@ -93,19 +109,23 @@ $ 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 @@ -114,21 +134,26 @@ $ 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/ruby/MasterSlave.tesh b/examples/ruby/MasterSlave.tesh index 8eaf9d4d32..9458562d53 100644 --- a/examples/ruby/MasterSlave.tesh +++ b/examples/ruby/MasterSlave.tesh @@ -1,5 +1,5 @@ # MasterSlave Ruby Example -$ ruby -I ../../src/bindings/ruby MasterSlave.rb +$ ruby -I../../src/bindings/ruby MasterSlave.rb > [Tremblay:Master:(1) 0.000000] [ruby/INFO] args[0]=20 > [Tremblay:Master:(1) 0.000000] [ruby/INFO] args[1]=50000000 > [Tremblay:Master:(1) 0.000000] [ruby/INFO] args[2]=1000000 diff --git a/src/bindings/ruby/simgrid.rb b/src/bindings/ruby/simgrid.rb index a140f82fc9..f22a3fbc51 100644 --- a/src/bindings/ruby/simgrid.rb +++ b/src/bindings/ruby/simgrid.rb @@ -5,7 +5,7 @@ # This program is free software; you can redistribute it and/or modify it # under the terms of the license (GNU LGPL) which comes with this package. */ # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # -require 'simgrid_ruby' +require 'simgrid' require 'thread' ####################################### @@ -241,4 +241,4 @@ end ######################### # Main chunck ######################### -MSG.init(ARGV) \ No newline at end of file +MSG.init(ARGV) -- 2.20.1