X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0213e3927d6ac21f3089d8a2d60f3603c8cbac43..a09fdaced8717cdcb0aefb66564bd4825c14e4aa:/examples/lua/masterslave/slave.lua

diff --git a/examples/lua/masterslave/slave.lua b/examples/lua/masterslave/slave.lua
index 9ecddc6a3e..875698362a 100644
--- a/examples/lua/masterslave/slave.lua
+++ b/examples/lua/masterslave/slave.lua
@@ -1,26 +1,25 @@
-
-
--- Slave Function ---------------------------------------------------------
 function Slave(...)
 
-local my_mailbox="slave "..arg[1]
-simgrid.info("Hello from lua, I'm a poor slave with mbox: "..my_mailbox)
+  if #arg ~= 1 then
+    error("Wrong number of arguments (got " .. #arg .. ", expected 1: slave_id)")
+  end
 
+  local my_mailbox = "slave " .. arg[1]
+  simgrid.info("Hello from lua, I'm a poor slave with mailbox: " .. my_mailbox)
 
-while true do
+  while true do
 
-  local tk = simgrid.Task.recv(my_mailbox);
-  if (simgrid.Task.name(tk) == "finalize") then
-    simgrid.info("Slave '" ..my_mailbox.."' got finalize msg");
-    break
+    local task = simgrid.task.recv(my_mailbox)
+    local task_name = task:get_name()
+    if (task_name == "finalize") then
+      simgrid.info("Got finalize message")
+      break
+    end
+    simgrid.info("Received task '" .. task_name .. "' on mailbox '" .. my_mailbox .. "'")
+    task:execute()
+    simgrid.info("Task '" .. task_name .. "' is done")
   end
-  --local tk_name = simgrid.Task.name(tk) 
-  simgrid.info("Slave '" ..my_mailbox.."' processing "..simgrid.Task.name(tk))
-  simgrid.Task.execute(tk)
-  simgrid.info("Slave '" ..my_mailbox.."': task "..simgrid.Task.name(tk) .. " done")
-end -- while
 
-simgrid.info("Slave '" ..my_mailbox.."': I'm Done . See You !!");
+  simgrid.info("I'm done. See you!")
+end -- end_of_slave
 
-end 
--- end_of_slave