Lua: rename simgrid.task.name() to simgrid.task.get_name()

diff --git a/examples/lua/console/master.lua b/examples/lua/console/master.lua
index 72d60e7..849b18b 100644 (file)
--- a/examples/lua/console/master.lua
+++ b/examples/lua/console/master.lua
@@ -20,7 +20,7 @@ simgrid.info("Argc="..(#arg).." (should be 4)")
 
 for i=1,nb_task do
   tk = simgrid.task.new("Task "..i,comp_size,comm_size);
 
 for i=1,nb_task do
   tk = simgrid.task.new("Task "..i,comp_size,comm_size);

-  local task_name = simgrid.task.name(tk)
+  local task_name = simgrid.task.get_name(tk)

   alias = "slave "..(i%slave_count);
   simgrid.info("Master sending  '" .. task_name .."' To '" .. alias .."'");
   simgrid.task.send(tk,alias); -- C user data set to NULL
   alias = "slave "..(i%slave_count);
   simgrid.info("Master sending  '" .. task_name .."' To '" .. alias .."'");
   simgrid.task.send(tk,alias); -- C user data set to NULL

diff --git a/examples/lua/console/slave.lua b/examples/lua/console/slave.lua
index 4b0b64c..1c77467 100644 (file)
--- a/examples/lua/console/slave.lua
+++ b/examples/lua/console/slave.lua
@@ -9,14 +9,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);
 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
     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.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 !!");
 end -- while
 
 simgrid.info("Slave '" ..my_mailbox.."': I'm Done . See You !!");

diff --git a/examples/lua/masterslave/master.lua b/examples/lua/masterslave/master.lua
index 84dd241..f4094d0 100644 (file)
--- a/examples/lua/masterslave/master.lua
+++ b/examples/lua/masterslave/master.lua
@@ -13,7 +13,7 @@ function Master(...)
 
   for i = 1, nb_task do
     local task = simgrid.task.new("Task " .. i, comp_size, comm_size)
 
   for i = 1, nb_task do
     local task = simgrid.task.new("Task " .. i, comp_size, comm_size)

-    local task_name = task:name()
+    local task_name = task:get_name()

     local alias = "slave " .. (i % slave_count)
     simgrid.info("Sending  '" .. task_name .. "' to '" .. alias .."'")
     task:send(alias) -- C user data set to NULL
     local alias = "slave " .. (i % slave_count)
     simgrid.info("Sending  '" .. task_name .. "' to '" .. alias .."'")
     task:send(alias) -- C user data set to NULL

diff --git a/examples/lua/masterslave/slave.lua b/examples/lua/masterslave/slave.lua
index bf463ae..a2b5439 100644 (file)
--- a/examples/lua/masterslave/slave.lua
+++ b/examples/lua/masterslave/slave.lua
@@ -10,7 +10,7 @@ function Slave(...)
   while true do
 
     local task = simgrid.task.recv(my_mailbox)
   while true do
 
     local task = simgrid.task.recv(my_mailbox)

-    local task_name = task:name()
+    local task_name = task:get_name()

     if (task_name == "finalize") then
       simgrid.info("Got finalize message")
       break
     if (task_name == "finalize") then
       simgrid.info("Got finalize message")
       break

diff --git a/examples/lua/multi_matrix/sender.lua b/examples/lua/multi_matrix/sender.lua
index bdf535f..dfd1ae8 100644 (file)
--- a/examples/lua/multi_matrix/sender.lua
+++ b/examples/lua/multi_matrix/sender.lua
@@ -20,7 +20,7 @@ function Sender(...)
   task['matrix_1'] = m1
   task['matrix_2'] = m2
   task['size'] = size
   task['matrix_1'] = m1
   task['matrix_2'] = m2
   task['size'] = size

-  simgrid.info("Sending " .. simgrid.task.name(task) .. " to " .. simgrid.host.name(receiver))
+  simgrid.info("Sending " .. simgrid.task.get_name(task) .. " to " .. simgrid.host.name(receiver))

   simgrid.task.send(task, rec_alias)
   simgrid.info("Got the Multiplication result ...Bye")
 end
   simgrid.task.send(task, rec_alias)
   simgrid.info("Got the Multiplication result ...Bye")
 end

diff --git a/examples/lua/splaySim/master.lua b/examples/lua/splaySim/master.lua
index afd2bf6..04951c3 100644 (file)
--- a/examples/lua/splaySim/master.lua
+++ b/examples/lua/splaySim/master.lua
@@ -21,9 +21,9 @@ simgrid.info("Argc="..(#arg).." (should be 4)")
 for i=1,nb_task do
   tk = simgrid.task.new("Task "..i,comp_size,comm_size);
   alias = "slave "..(i%slave_count);
 for i=1,nb_task do
   tk = simgrid.task.new("Task "..i,comp_size,comm_size);
   alias = "slave "..(i%slave_count);

-  simgrid.info("Master sending  '" .. simgrid.task.name(tk) .."' To '" .. alias .."'");
+  simgrid.info("Master sending  '" .. simgrid.task.get_name(tk) .."' To '" .. alias .."'");

   simgrid.task.send(tk,alias); -- C user data set to NULL
   simgrid.task.send(tk,alias); -- C user data set to NULL

-  simgrid.info("Master done sending '".. simgrid.task.name(tk) .."' To '" .. alias .."'");
+  simgrid.info("Master done sending '".. simgrid.task.get_name(tk) .."' To '" .. alias .."'");

 end
 
 -- Sending Finalize Message To Others
 end
 
 -- Sending Finalize Message To Others

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);
 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
     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.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 !!");
 end -- while
 
 simgrid.info("Slave '" ..my_mailbox.."': I'm Done . See You !!");

diff --git a/examples/lua/tracing/master.lua b/examples/lua/tracing/master.lua
index 3049107..e189c05 100644 (file)
--- a/examples/lua/tracing/master.lua
+++ b/examples/lua/tracing/master.lua
@@ -26,9 +26,9 @@ for i=1,nb_task do
   alias = "slave "..(i%slave_count);
   -- Set Trace Category
   simgrid.Trace.setTaskCategory(tk,"compute");
   alias = "slave "..(i%slave_count);
   -- Set Trace Category
   simgrid.Trace.setTaskCategory(tk,"compute");

-  simgrid.info("Master sending  '" .. simgrid.task.name(tk) .."' To '" .. alias .."'");
+  simgrid.info("Master sending  '" .. simgrid.task.get_name(tk) .."' To '" .. alias .."'");

   simgrid.task.send(tk,alias); -- C user data set to NULL
   simgrid.task.send(tk,alias); -- C user data set to NULL

-  simgrid.info("Master done sending '".. simgrid.task.name(tk) .."' To '" .. alias .."'");
+  simgrid.info("Master done sending '".. simgrid.task.get_name(tk) .."' To '" .. alias .."'");

 end
 
 -- Sending Finalize Message To Others
 end
 
 -- Sending Finalize Message To Others

diff --git a/examples/lua/tracing/slave.lua b/examples/lua/tracing/slave.lua
index d4d85f2..cdbe5f3 100644 (file)
--- a/examples/lua/tracing/slave.lua
+++ b/examples/lua/tracing/slave.lua
@@ -8,14 +8,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);
 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
     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.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 !!");
 end -- while
 
 simgrid.info("Slave '" ..my_mailbox.."': I'm Done . See You !!");

diff --git a/src/bindings/lua/simgrid_lua.c b/src/bindings/lua/simgrid_lua.c
index 205bfd4..6c6faf1 100644 (file)
--- a/src/bindings/lua/simgrid_lua.c
+++ b/src/bindings/lua/simgrid_lua.c
@@ -120,7 +120,7 @@ static int l_task_get_name(lua_State* L)
  * - Argument 1 (task): a task
  * - Return value (number): computation duration of this task
  */
  * - Argument 1 (task): a task
  * - Return value (number): computation duration of this task
  */

-static int l_task_computation_duration(lua_State* L)
+static int l_task_get_computation_duration(lua_State* L)

 {
   m_task_t task = sglua_checktask(L, 1);
   lua_pushnumber(L, MSG_task_get_compute_duration(task));
 {
   m_task_t task = sglua_checktask(L, 1);
   lua_pushnumber(L, MSG_task_get_compute_duration(task));


@@ -255,8 +255,8 @@ static int l_task_recv(lua_State *L)
 
 static const luaL_reg task_functions[] = {
   {"new", l_task_new},
 
 static const luaL_reg task_functions[] = {
   {"new", l_task_new},

-  {"name", l_task_get_name},
-  {"computation_duration", l_task_computation_duration},
+  {"get_name", l_task_get_name},
+  {"get_computation_duration", l_task_get_computation_duration},

   {"execute", l_task_execute},
   {"send", l_task_send},
   {"recv", l_task_recv},
   {"execute", l_task_execute},
   {"send", l_task_send},
   {"recv", l_task_recv},