merge conflicts

[simgrid.git] / examples / lua / splaySim / slave.lua

diff --git a/examples/lua/splaySim/slave.lua b/examples/lua/splaySim/slave.lua
index 2a9530a..e188572 100644 (file)
--- a/examples/lua/splaySim/slave.lua
+++ b/examples/lua/splaySim/slave.lua
@@ -7,14 +7,14 @@ simgrid.info("Hello from lua, I'm a poor slave with mbox: "..my_mailbox)
 while true do
 
   local tk = simgrid.task.recv(my_mailbox);
-  if (simgrid.task.name(tk) == "finalize") then
+  if (simgrid.task.get_name(tk) == "finalize") then
     simgrid.info("Slave '" ..my_mailbox.."' got finalize msg");
     break
   end
-  --local tk_name = simgrid.task.name(tk) 
-  simgrid.info("Slave '" ..my_mailbox.."' processing "..simgrid.task.name(tk))
+  --local tk_name = simgrid.task.get_name(tk) 
+  simgrid.info("Slave '" ..my_mailbox.."' processing "..simgrid.task.get_name(tk))
   simgrid.task.execute(tk)
-  simgrid.info("Slave '" ..my_mailbox.."': task "..simgrid.task.name(tk) .. " done")
+  simgrid.info("Slave '" ..my_mailbox.."': task "..simgrid.task.get_name(tk) .. " done")
 end -- while
 
 simgrid.info("Slave '" ..my_mailbox.."': I'm Done . See You !!");