From a82dc808b0cbd982bdc787a7b0a6721b01f3c116 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Christophe=20Thi=C3=A9ry?= Date: Wed, 9 Nov 2011 18:53:45 +0100 Subject: [PATCH] Make the Lua API respect coherent naming conventions --- .../gras/console/gras_platform_script.lua | 62 +++++++++---------- examples/lua/SimSplay/platform_script.lua | 20 +++--- examples/lua/SimSplay/sim_splay.lua | 20 +++--- examples/lua/console/deploy.lua | 10 +-- examples/lua/console/master.lua | 10 +-- examples/lua/console/slave.lua | 12 ++-- examples/lua/masterslave/master.lua | 10 +-- examples/lua/masterslave/platform.lua | 4 +- examples/lua/masterslave/slave.lua | 8 +-- examples/lua/mult_matrix.lua | 14 ++--- examples/lua/multi_matrix/receiver.lua | 6 +- examples/lua/multi_matrix/sender.lua | 8 +-- examples/lua/splaySim/master.lua | 12 ++-- examples/lua/splaySim/slave.lua | 12 ++-- .../lua/splaySim/splay_deploy_masterslave.lua | 10 +-- examples/lua/splaySim/splay_platform.lua | 2 +- examples/lua/tracing/master.lua | 14 ++--- examples/lua/tracing/slave.lua | 12 ++-- examples/msg/masterslave/platform_script.lua | 12 ++-- examples/simdag/platform_script.lua | 54 ++++++++-------- src/bindings/lua/simgrid_lua.c | 20 +++--- 21 files changed, 166 insertions(+), 166 deletions(-) diff --git a/examples/gras/console/gras_platform_script.lua b/examples/gras/console/gras_platform_script.lua index 2b965e15f8..1884b05f52 100644 --- a/examples/gras/console/gras_platform_script.lua +++ b/examples/gras/console/gras_platform_script.lua @@ -2,48 +2,48 @@ require "simgrid" simgrid.AS.new{id="AS0",mode="Full"}; - simgrid.Host.new{id="Tremblay",power=98095000}; - simgrid.Host.new{id="Jupiter",power=76296000}; - simgrid.Host.new{id="Fafard",power=76296000}; - simgrid.Host.new{id="Ginette",power=48492000}; - simgrid.Host.new{id="Bourassa",power=48492000}; + simgrid.host.new{id="Tremblay",power=98095000}; + simgrid.host.new{id="Jupiter",power=76296000}; + simgrid.host.new{id="Fafard",power=76296000}; + simgrid.host.new{id="Ginette",power=48492000}; + simgrid.host.new{id="Bourassa",power=48492000}; -- create Links for i=10,0,-1 do - simgrid.Link.new{id=i,bandwidth=252750+ i*768,latency=0.000270544+i*0.087}; + simgrid.link.new{id=i,bandwidth=252750+ i*768,latency=0.000270544+i*0.087}; end - -- simgrid.Route.new(src_id,des_id,links_nb,links_list) - simgrid.Route.new("Tremblay","Jupiter",{"1"}); - simgrid.Route.new("Tremblay","Fafard",{"0","1","2","3","4","8"}); - simgrid.Route.new("Tremblay","Ginette",{"3","4","5"}); - simgrid.Route.new("Tremblay","Bourassa",{"0","1","3","2","4","6","7"}); - - simgrid.Route.new("Jupiter","Tremblay",{"1"}); - simgrid.Route.new("Jupiter","Fafard",{"0","1","2","3","4","8","9"}); - simgrid.Route.new("Jupiter","Ginette",{"3","4","5","9"}); - simgrid.Route.new("Jupiter","Bourassa",{"0","1","2","3","4","6","7","9"}); + -- simgrid.route.new(src_id,des_id,links_nb,links_list) + simgrid.route.new("Tremblay","Jupiter",{"1"}); + simgrid.route.new("Tremblay","Fafard",{"0","1","2","3","4","8"}); + simgrid.route.new("Tremblay","Ginette",{"3","4","5"}); + simgrid.route.new("Tremblay","Bourassa",{"0","1","3","2","4","6","7"}); + + simgrid.route.new("Jupiter","Tremblay",{"1"}); + simgrid.route.new("Jupiter","Fafard",{"0","1","2","3","4","8","9"}); + simgrid.route.new("Jupiter","Ginette",{"3","4","5","9"}); + simgrid.route.new("Jupiter","Bourassa",{"0","1","2","3","4","6","7","9"}); - simgrid.Route.new("Fafard","Tremblay",{"0","1","2","3","4","8"}); - simgrid.Route.new("Fafard","Jupiter",{"0","1","2","3","4","8","9"}); - simgrid.Route.new("Fafard","Ginette",{"0","1","2","5","8"}); - simgrid.Route.new("Fafard","Bourassa",{"6","7","8"}); + simgrid.route.new("Fafard","Tremblay",{"0","1","2","3","4","8"}); + simgrid.route.new("Fafard","Jupiter",{"0","1","2","3","4","8","9"}); + simgrid.route.new("Fafard","Ginette",{"0","1","2","5","8"}); + simgrid.route.new("Fafard","Bourassa",{"6","7","8"}); - simgrid.Route.new("Ginette","Tremblay",{"3","4","5"}); - simgrid.Route.new("Ginette","Jupiter",{"3","4","5","9"}); - simgrid.Route.new("Ginette","Fafard",{"0","1","2","5","8"}); - simgrid.Route.new("Ginette","Bourassa",{"0","1","2","5","6","7"}); - - simgrid.Route.new("Bourassa","Tremblay",{"0","1","3","2","4","6","7"}); - simgrid.Route.new("Bourassa","Jupiter",{"0","1","2","3","4","6","7","9"}); - simgrid.Route.new("Bourassa","Fafard",{"6","7","8"}); - simgrid.Route.new("Bourassa","Ginette",{"0","1","2","5","6","7"}); + simgrid.route.new("Ginette","Tremblay",{"3","4","5"}); + simgrid.route.new("Ginette","Jupiter",{"3","4","5","9"}); + simgrid.route.new("Ginette","Fafard",{"0","1","2","5","8"}); + simgrid.route.new("Ginette","Bourassa",{"0","1","2","5","6","7"}); + + simgrid.route.new("Bourassa","Tremblay",{"0","1","3","2","4","6","7"}); + simgrid.route.new("Bourassa","Jupiter",{"0","1","2","3","4","6","7","9"}); + simgrid.route.new("Bourassa","Fafard",{"6","7","8"}); + simgrid.route.new("Bourassa","Ginette",{"0","1","2","5","6","7"}); --Save Platform simgrid.gras_register_platform(); --Set Application - simgrid.Host.setFunction{host="Tremblay",fct="server",args="4000"}; - simgrid.Host.setFunction{host="Fafard",fct="client",args="Tremblay,4000"}; + simgrid.host.set_function{host="Tremblay",fct="server",args="4000"}; + simgrid.host.set_function{host="Fafard",fct="client",args="Tremblay,4000"}; --Save Application simgrid.gras_register_application(); diff --git a/examples/lua/SimSplay/platform_script.lua b/examples/lua/SimSplay/platform_script.lua index 59e37aac25..c0f5589afc 100644 --- a/examples/lua/SimSplay/platform_script.lua +++ b/examples/lua/SimSplay/platform_script.lua @@ -6,17 +6,17 @@ require "simgrid" simgrid.AS.addHost{AS="AS0",id="Jupiter",power=76296000}; simgrid.AS.addHost{AS="AS0",id="Fafard",power=76296000}; - simgrid.Host.setProperty{host="Tremblay",prop_id="ip",prop_value="199.23.98.3"}; - simgrid.Host.setProperty{host="Tremblay",prop_id="port",prop_value="65"}; - simgrid.Host.setProperty{host="Jupiter",prop_id="ip",prop_value="199.23.98.4"}; - simgrid.Host.setProperty{host="Jupiter",prop_id="port",prop_value="83"}; - simgrid.Host.setProperty{host="Fafard",prop_id="ip",prop_value="199.23.98.5"}; - simgrid.Host.setProperty{host="Fafard",prop_id="port",prop_value="76"}; + simgrid.host.setProperty{host="Tremblay",prop_id="ip",prop_value="199.23.98.3"}; + simgrid.host.setProperty{host="Tremblay",prop_id="port",prop_value="65"}; + simgrid.host.setProperty{host="Jupiter",prop_id="ip",prop_value="199.23.98.4"}; + simgrid.host.setProperty{host="Jupiter",prop_id="port",prop_value="83"}; + simgrid.host.setProperty{host="Fafard",prop_id="ip",prop_value="199.23.98.5"}; + simgrid.host.setProperty{host="Fafard",prop_id="port",prop_value="76"}; -- create Links for i=10,0,-1 do simgrid.AS.addLink{AS="AS0",id=i,bandwidth=252750+ i*768,latency=0.000270544+i*0.087}; end - -- simgrid.Route.new(src_id,des_id,links_nb,links_list) + -- simgrid.route.new(src_id,des_id,links_nb,links_list) simgrid.AS.addRoute("AS0","Tremblay","Jupiter",{"1"}); simgrid.AS.addRoute("AS0","Tremblay","Fafard",{"0","1","2","3","4","8"}); @@ -31,9 +31,9 @@ require "simgrid" simgrid.msg_register_platform(); --Set Application - simgrid.Host.setFunction{host="Tremblay",fct="SPLAYschool",args=""}; - simgrid.Host.setFunction{host="Fafard",fct="SPLAYschool",args=""}; - simgrid.Host.setFunction{host="Jupiter",fct="SPLAYschool",args=""}; + simgrid.host.set_function{host="Tremblay",fct="SPLAYschool",args=""}; + simgrid.host.set_function{host="Fafard",fct="SPLAYschool",args=""}; + simgrid.host.set_function{host="Jupiter",fct="SPLAYschool",args=""}; --Save Application simgrid.msg_register_application(); diff --git a/examples/lua/SimSplay/sim_splay.lua b/examples/lua/SimSplay/sim_splay.lua index 0f59caaced..41e42a8eb7 100644 --- a/examples/lua/SimSplay/sim_splay.lua +++ b/examples/lua/SimSplay/sim_splay.lua @@ -16,9 +16,9 @@ job.list_type = "random" -- Init nodes tables function init_nodes() - for i = 1, simgrid.Host.number() do - job.nodes[i] = { ip = simgrid.Host.getPropValue(simgrid.Host.at(i), "ip"), - port = simgrid.Host.getPropValue(simgrid.Host.at(i), "port") } + for i = 1, simgrid.host.number() do + job.nodes[i] = { ip = simgrid.host.get_prop_value(simgrid.host.at(i), "ip"), + port = simgrid.host.get_prop_value(simgrid.host.at(i), "port") } end end @@ -28,16 +28,16 @@ end -- Job methods function job.me.ip() - return simgrid.Host.getPropValue(simgrid.Host.self(), "ip") + return simgrid.host.get_prop_value(simgrid.host.self(), "ip") end function job.me.port() - return simgrid.Host.getPropValue(simgrid.Host.self(), "port") + return simgrid.host.get_prop_value(simgrid.host.self(), "port") end function job.position() - return simgrid.Host.getPropValue(simgrid.Host.self(), "position") + return simgrid.host.get_prop_value(simgrid.host.self(), "position") end -- log Methods @@ -60,11 +60,11 @@ function rpc.call(node, call) func = call[1] arg = call[2] end - task_call = simgrid.Task.new("splay_task", 10000, 10000) + task_call = simgrid.task.new("splay_task", 10000, 10000) task_call['func_call_name'] = func task_call['func_call_arg'] = arg log:print("Sending Task to mailbox "..mailbox.." to call '"..func.."' with arg '"..arg.."'") - simgrid.Task.send(task_call, mailbox) + simgrid.task.send(task_call, mailbox) end @@ -75,7 +75,7 @@ end -- event Methods function events.sleep(time) my_mailbox = job.me.ip()..":"..job.me.port() - task = simgrid.Task.recv_timeout(my_mailbox, time) + task = simgrid.task.recv_timeout(my_mailbox, time) if task ~= nil then -- an RPC call just woke me up @@ -91,7 +91,7 @@ end -- OS methods function os.exit() - simgrid.Host.destroy(simgrid.Host.self()) + simgrid.host.destroy(simgrid.host.self()) end -- Start Methods diff --git a/examples/lua/console/deploy.lua b/examples/lua/console/deploy.lua index 2b734bb180..26e34fc533 100644 --- a/examples/lua/console/deploy.lua +++ b/examples/lua/console/deploy.lua @@ -1,11 +1,11 @@ dofile 'master.lua' dofile 'slave.lua' --Set Application - simgrid.Host.setFunction{host="Tremblay",fct="Master",args="20,550000000,1000000,4"}; - simgrid.Host.setFunction{host="Bourassa",fct="Slave",args="0"}; - simgrid.Host.setFunction{host="Jupiter",fct="Slave",args="1"}; - simgrid.Host.setFunction{host="Fafard",fct="Slave",args="2"}; - simgrid.Host.setFunction{host="Ginette",fct="Slave",args="3"}; + simgrid.host.set_function{host="Tremblay",fct="Master",args="20,550000000,1000000,4"}; + simgrid.host.set_function{host="Bourassa",fct="Slave",args="0"}; + simgrid.host.set_function{host="Jupiter",fct="Slave",args="1"}; + simgrid.host.set_function{host="Fafard",fct="Slave",args="2"}; + simgrid.host.set_function{host="Ginette",fct="Slave",args="3"}; --Save Application simgrid.msg_register_application(); diff --git a/examples/lua/console/master.lua b/examples/lua/console/master.lua index 52c5d65f79..72d60e7230 100644 --- a/examples/lua/console/master.lua +++ b/examples/lua/console/master.lua @@ -19,11 +19,11 @@ simgrid.info("Argc="..(#arg).." (should be 4)") -- Dispatch the tasks for i=1,nb_task do - tk = simgrid.Task.new("Task "..i,comp_size,comm_size); - local task_name = simgrid.Task.name(tk) + tk = simgrid.task.new("Task "..i,comp_size,comm_size); + local task_name = simgrid.task.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 + simgrid.task.send(tk,alias); -- C user data set to NULL simgrid.info("Master done sending '".. task_name .."' To '" .. alias .."'"); end @@ -33,8 +33,8 @@ simgrid.info("Master: All tasks have been dispatched. Let's tell everybody the c for i=0,slave_count-1 do alias = "slave "..i; simgrid.info("Master: sending finalize to "..alias); - finalize = simgrid.Task.new("finalize",comp_size,comm_size); - simgrid.Task.send(finalize,alias) + finalize = simgrid.task.new("finalize",comp_size,comm_size); + simgrid.task.send(finalize,alias) end simgrid.info("Master: Everything's done."); end diff --git a/examples/lua/console/slave.lua b/examples/lua/console/slave.lua index 9c257c479b..4b0b64c175 100644 --- a/examples/lua/console/slave.lua +++ b/examples/lua/console/slave.lua @@ -8,15 +8,15 @@ 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 + local tk = simgrid.task.recv(my_mailbox); + if (simgrid.task.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)) - simgrid.Task.execute(tk) - simgrid.info("Slave '" ..my_mailbox.."': task "..simgrid.Task.name(tk) .. " done") + --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 !!"); diff --git a/examples/lua/masterslave/master.lua b/examples/lua/masterslave/master.lua index 8a081c1cfe..c5c21eb600 100644 --- a/examples/lua/masterslave/master.lua +++ b/examples/lua/masterslave/master.lua @@ -18,11 +18,11 @@ function Master(...) -- Dispatch the tasks for i = 1, nb_task do - local tk = simgrid.Task.new("Task "..i, comp_size, comm_size) - local task_name = simgrid.Task.name(tk) + local tk = simgrid.task.new("Task "..i, comp_size, comm_size) + local task_name = simgrid.task.name(tk) local alias = "slave " .. (i % slave_count) simgrid.info("Master sending '" .. task_name .. "' 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 '".. task_name .. "' To '" .. alias .."'") end @@ -32,8 +32,8 @@ function Master(...) for i = 0, slave_count - 1 do local alias = "slave " .. i simgrid.info("Master: sending finalize to " .. alias) - local finalize = simgrid.Task.new("finalize", comp_size, comm_size) - simgrid.Task.send(finalize, alias) + local finalize = simgrid.task.new("finalize", comp_size, comm_size) + simgrid.task.send(finalize, alias) end simgrid.info("Master: Everything's done.") end -- Master diff --git a/examples/lua/masterslave/platform.lua b/examples/lua/masterslave/platform.lua index 19ebf50e6c..8ef9d4bf82 100644 --- a/examples/lua/masterslave/platform.lua +++ b/examples/lua/masterslave/platform.lua @@ -2,7 +2,7 @@ --create new routing model --simgrid.AS.new(AS_id,AS_mode) simgrid.AS.new{id="AS0",mode="Full"}; - --simgrid.Host.new(host_id,power) + --simgrid.host.new(host_id,power) simgrid.AS.addHost{AS="AS0",id="Tremblay",power=98095000}; simgrid.AS.addHost{AS="AS0",id="Jupiter",power=76296000}; simgrid.AS.addHost{AS="AS0",id="Fafard",power=76296000}; @@ -13,7 +13,7 @@ for i=10,0,-1 do simgrid.AS.addLink{AS="AS0",id=i,bandwidth=252750+ i*768,latency=0.000270544+i*0.087}; end - -- simgrid.Route.new(src_id,des_id,links_nb,links_list) + -- simgrid.route.new(src_id,des_id,links_nb,links_list) simgrid.AS.addRoute{AS="AS0",src="Tremblay",dest="Jupiter",links="1"}; simgrid.AS.addRoute{AS="AS0",src="Tremblay",dest="Fafard",links="0,1,2,3,4,8"}; simgrid.AS.addRoute{AS="AS0",src="Tremblay",dest="Ginette",links="3,4,5"}; diff --git a/examples/lua/masterslave/slave.lua b/examples/lua/masterslave/slave.lua index 567db55037..54e51becbe 100644 --- a/examples/lua/masterslave/slave.lua +++ b/examples/lua/masterslave/slave.lua @@ -5,14 +5,14 @@ function Slave(...) while true do - local tk = simgrid.Task.recv(my_mailbox) - if (simgrid.Task.name(tk) == "finalize") then + local tk = simgrid.task.recv(my_mailbox) + if (simgrid.task.name(tk) == "finalize") then simgrid.info("Slave '" .. my_mailbox .. "' got finalize msg") break end - local task_name = simgrid.Task.name(tk) + local task_name = simgrid.task.name(tk) simgrid.info("Slave '" .. my_mailbox.. "' processing " .. task_name) - simgrid.Task.execute(tk) + simgrid.task.execute(tk) simgrid.info("Slave '" .. my_mailbox .. "': task " .. task_name .. " done") end diff --git a/examples/lua/mult_matrix.lua b/examples/lua/mult_matrix.lua index afe53bf36d..45506c63d0 100644 --- a/examples/lua/mult_matrix.lua +++ b/examples/lua/mult_matrix.lua @@ -1,7 +1,7 @@ function Sender(...) simgrid.info("Hello From Sender") - receiver = simgrid.Host.getByName(arg[1]) + receiver = simgrid.host.get_by_name(arg[1]) task_comp = arg[2] task_comm = arg[3] rec_alias = arg[4] @@ -16,12 +16,12 @@ function Sender(...) simgrid.info("Argc="..(#arg).." (should be 4)") -- Sending Task - task = simgrid.Task.new("matrix_task",task_comp,task_comm); + task = simgrid.task.new("matrix_task",task_comp,task_comm); task['matrix_1'] = m1; task['matrix_2'] = m2; task['size'] = size; - simgrid.info("Sending "..simgrid.Task.name(task).." to "..simgrid.Host.name(receiver)); - simgrid.Task.send(task,rec_alias); + simgrid.info("Sending "..simgrid.task.name(task).." to "..simgrid.host.name(receiver)); + simgrid.task.send(task,rec_alias); -- Read The Result mm = task['matrix_res'] simgrid.info("Got the Multiplication result ...Bye"); @@ -32,11 +32,11 @@ end function Receiver(...) simgrid.info("Hello From Receiver") - sender = simgrid.Host.getByName(arg[1]) + sender = simgrid.host.get_by_name(arg[1]) send_alias = arg[2] recv_alias = "Receiver"; - simgrid.info("Receiving Task from "..simgrid.Host.name(sender)); - task = simgrid.Task.recv(recv_alias); + simgrid.info("Receiving Task from "..simgrid.host.name(sender)); + task = simgrid.task.recv(recv_alias); mm = mmult(task['size'],task['size'],task['matrix_1'],task['matrix_2']); --mprint(task['size'],task['size'],mm) task['matrix_res'] = mm; diff --git a/examples/lua/multi_matrix/receiver.lua b/examples/lua/multi_matrix/receiver.lua index 64837b3f8f..e771b7a593 100644 --- a/examples/lua/multi_matrix/receiver.lua +++ b/examples/lua/multi_matrix/receiver.lua @@ -1,11 +1,11 @@ function Receiver(...) simgrid.info("Hello From Receiver") - local sender = simgrid.Host.getByName(arg[1]) + local sender = simgrid.host.get_by_name(arg[1]) local send_alias = arg[2] local recv_alias = "Receiver" - simgrid.info("Receiving Task from " .. simgrid.Host.name(sender)) - local task = simgrid.Task.recv(recv_alias) + simgrid.info("Receiving Task from " .. simgrid.host.name(sender)) + local task = simgrid.task.recv(recv_alias) local mm = mmult(task['size'], task['size'], task['matrix_1'], task['matrix_2']) --mprint(task['size'], task['size'], mm) task['matrix_res'] = mm diff --git a/examples/lua/multi_matrix/sender.lua b/examples/lua/multi_matrix/sender.lua index fa89c9d66a..bdf535f70e 100644 --- a/examples/lua/multi_matrix/sender.lua +++ b/examples/lua/multi_matrix/sender.lua @@ -1,7 +1,7 @@ function Sender(...) simgrid.info("Hello From Sender") - local receiver = simgrid.Host.getByName(arg[1]) + local receiver = simgrid.host.get_by_name(arg[1]) local task_comp = arg[2] local task_comm = arg[3] local rec_alias = arg[4] @@ -16,12 +16,12 @@ function Sender(...) simgrid.info("Argc=" .. (#arg) .. " (should be 4)") -- Sending Task - local task = simgrid.Task.new("matrix_task", task_comp, task_comm) + local task = simgrid.task.new("matrix_task", task_comp, task_comm) task['matrix_1'] = m1 task['matrix_2'] = m2 task['size'] = size - simgrid.info("Sending " .. simgrid.Task.name(task) .. " to " .. simgrid.Host.name(receiver)) - simgrid.Task.send(task, rec_alias) + simgrid.info("Sending " .. simgrid.task.name(task) .. " to " .. simgrid.host.name(receiver)) + 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 38765cacb3..afd2bf6399 100644 --- a/examples/lua/splaySim/master.lua +++ b/examples/lua/splaySim/master.lua @@ -19,11 +19,11 @@ simgrid.info("Argc="..(#arg).." (should be 4)") -- Dispatch the tasks for i=1,nb_task do - tk = simgrid.Task.new("Task "..i,comp_size,comm_size); + 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.Task.send(tk,alias); -- C user data set to NULL - simgrid.info("Master done sending '".. simgrid.Task.name(tk) .."' To '" .. alias .."'"); + simgrid.info("Master sending '" .. simgrid.task.name(tk) .."' To '" .. alias .."'"); + simgrid.task.send(tk,alias); -- C user data set to NULL + simgrid.info("Master done sending '".. simgrid.task.name(tk) .."' To '" .. alias .."'"); end -- Sending Finalize Message To Others @@ -32,8 +32,8 @@ simgrid.info("Master: All tasks have been dispatched. Let's tell everybody the c for i=0,slave_count-1 do alias = "slave "..i; simgrid.info("Master: sending finalize to "..alias); - finalize = simgrid.Task.new("finalize",comp_size,comm_size); - simgrid.Task.send(finalize,alias) + finalize = simgrid.task.new("finalize",comp_size,comm_size); + simgrid.task.send(finalize,alias) end simgrid.info("Master: Everything's done."); end diff --git a/examples/lua/splaySim/slave.lua b/examples/lua/splaySim/slave.lua index 555d940c40..2a9530a99a 100644 --- a/examples/lua/splaySim/slave.lua +++ b/examples/lua/splaySim/slave.lua @@ -6,15 +6,15 @@ 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 + local tk = simgrid.task.recv(my_mailbox); + if (simgrid.task.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)) - simgrid.Task.execute(tk) - simgrid.info("Slave '" ..my_mailbox.."': task "..simgrid.Task.name(tk) .. " done") + --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 !!"); diff --git a/examples/lua/splaySim/splay_deploy_masterslave.lua b/examples/lua/splaySim/splay_deploy_masterslave.lua index 932109c253..a40ef42249 100644 --- a/examples/lua/splaySim/splay_deploy_masterslave.lua +++ b/examples/lua/splaySim/splay_deploy_masterslave.lua @@ -2,11 +2,11 @@ dofile "master.lua" dofile "slave.lua" --Set Application - simgrid.Host.setFunction{host="Splayd_1",fct="Master",args="20,550000000,1000000,4"}; - simgrid.Host.setFunction{host="Splayd_5",fct="Slave",args="0"}; - simgrid.Host.setFunction{host="Splayd_2",fct="Slave",args="1"}; - simgrid.Host.setFunction{host="Splayd_3",fct="Slave",args="2"}; - simgrid.Host.setFunction{host="Splayd_4",fct="Slave",args="3"}; + simgrid.host.set_function{host="Splayd_1",fct="Master",args="20,550000000,1000000,4"}; + simgrid.host.set_function{host="Splayd_5",fct="Slave",args="0"}; + simgrid.host.set_function{host="Splayd_2",fct="Slave",args="1"}; + simgrid.host.set_function{host="Splayd_3",fct="Slave",args="2"}; + simgrid.host.set_function{host="Splayd_4",fct="Slave",args="3"}; --Save Application simgrid.msg_register_application(); diff --git a/examples/lua/splaySim/splay_platform.lua b/examples/lua/splaySim/splay_platform.lua index ad86aa4f4d..1181a1bef3 100644 --- a/examples/lua/splaySim/splay_platform.lua +++ b/examples/lua/splaySim/splay_platform.lua @@ -11,7 +11,7 @@ require "simgrid" for i=10,0,-1 do simgrid.AS.addLink{AS="AS0",id=i,bandwidth=252750+ i*768,latency=0.000270544+i*0.087}; end - -- simgrid.Route.new(src_id,des_id,links_nb,links_list) + -- simgrid.route.new(src_id,des_id,links_nb,links_list) simgrid.AS.addRoute("AS0","Splayd_1","Splayd_2",{"1"}); simgrid.AS.addRoute("AS0","Splayd_1","Splayd_3",{"0","1","2","3","4","8"}); simgrid.AS.addRoute("AS0","Splayd_1","Splayd_4",{"3","4","5"}); diff --git a/examples/lua/tracing/master.lua b/examples/lua/tracing/master.lua index 98f6de7bb7..3049107e67 100644 --- a/examples/lua/tracing/master.lua +++ b/examples/lua/tracing/master.lua @@ -6,7 +6,7 @@ for i,v in ipairs(arg) do simgrid.info("Got "..v) end -prop_value = simgrid.Host.getPropValue(simgrid.Host.self(),"peace"); +prop_value = simgrid.host.get_prop_value(simgrid.host.self(),"peace"); simgrid.info("Prop Value >>> ".. prop_value); nb_task = arg[1]; @@ -22,13 +22,13 @@ simgrid.info("Argc="..(#arg).." (should be 4)") -- Dispatch the tasks for i=1,nb_task do - tk = simgrid.Task.new("Task "..i,comp_size,comm_size); + tk = simgrid.task.new("Task "..i,comp_size,comm_size); alias = "slave "..(i%slave_count); -- Set Trace Category simgrid.Trace.setTaskCategory(tk,"compute"); - simgrid.info("Master sending '" .. simgrid.Task.name(tk) .."' To '" .. alias .."'"); - 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 sending '" .. simgrid.task.name(tk) .."' To '" .. alias .."'"); + simgrid.task.send(tk,alias); -- C user data set to NULL + simgrid.info("Master done sending '".. simgrid.task.name(tk) .."' To '" .. alias .."'"); end -- Sending Finalize Message To Others @@ -37,10 +37,10 @@ simgrid.info("Master: All tasks have been dispatched. Let's tell everybody the c for i=0,slave_count-1 do alias = "slave "..i; simgrid.info("Master: sending finalize to "..alias); - finalize = simgrid.Task.new("finalize",comp_size,comm_size); + finalize = simgrid.task.new("finalize",comp_size,comm_size); --set Trace Category simgrid.Trace.setTaskCategory(finalize,"finalize"); - simgrid.Task.send(finalize,alias); + simgrid.task.send(finalize,alias); end simgrid.info("Master: Everything's done."); end diff --git a/examples/lua/tracing/slave.lua b/examples/lua/tracing/slave.lua index 0b6541d55c..d4d85f2454 100644 --- a/examples/lua/tracing/slave.lua +++ b/examples/lua/tracing/slave.lua @@ -7,15 +7,15 @@ 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 + local tk = simgrid.task.recv(my_mailbox); + if (simgrid.task.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)) - simgrid.Task.execute(tk) - simgrid.info("Slave '" ..my_mailbox.."': task "..simgrid.Task.name(tk) .. " done") + --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 !!"); diff --git a/examples/msg/masterslave/platform_script.lua b/examples/msg/masterslave/platform_script.lua index fc973a85eb..bb1853f3d6 100644 --- a/examples/msg/masterslave/platform_script.lua +++ b/examples/msg/masterslave/platform_script.lua @@ -12,7 +12,7 @@ require "simgrid" for i=10,0,-1 do simgrid.AS.addLink{AS="AS0",id=i,bandwidth=252750+ i*768,latency=0.000270544+i*0.087}; end - -- simgrid.Route.new(src_id,des_id,links_nb,links_list) + -- simgrid.route.new(src_id,des_id,links_nb,links_list) simgrid.AS.addRoute("AS0","Tremblay","Jupiter",{"1"}); simgrid.AS.addRoute("AS0","Tremblay","Fafard",{"0","1","2","3","4","8"}); simgrid.AS.addRoute("AS0","Tremblay","Ginette",{"3","4","5"}); @@ -42,11 +42,11 @@ require "simgrid" simgrid.msg_register_platform(); --Set Application - simgrid.Host.setFunction{host="Tremblay",fct="master",args="20,550000000,1000000,4"}; - simgrid.Host.setFunction{host="Bourassa",fct="slave",args="0"}; - simgrid.Host.setFunction{host="Jupiter",fct="slave",args="1"}; - simgrid.Host.setFunction{host="Fafard",fct="slave",args="2"}; - simgrid.Host.setFunction{host="Ginette",fct="slave",args="3"}; + simgrid.host.set_function{host="Tremblay",fct="master",args="20,550000000,1000000,4"}; + simgrid.host.set_function{host="Bourassa",fct="slave",args="0"}; + simgrid.host.set_function{host="Jupiter",fct="slave",args="1"}; + simgrid.host.set_function{host="Fafard",fct="slave",args="2"}; + simgrid.host.set_function{host="Ginette",fct="slave",args="3"}; --Save Application simgrid.msg_register_application(); diff --git a/examples/simdag/platform_script.lua b/examples/simdag/platform_script.lua index 38e9fc7d39..b60cfbacf0 100644 --- a/examples/simdag/platform_script.lua +++ b/examples/simdag/platform_script.lua @@ -2,41 +2,41 @@ require "simgrid" simgrid.AS.new{id="AS0",mode="Full"}; - simgrid.Host.new{id="Tremblay",power=98095000}; - simgrid.Host.new{id="Jupiter",power=76296000}; - simgrid.Host.new{id="Fafard",power=76296000}; - simgrid.Host.new{id="Ginette",power=48492000}; - simgrid.Host.new{id="Bourassa",power=48492000}; + simgrid.host.new{id="Tremblay",power=98095000}; + simgrid.host.new{id="Jupiter",power=76296000}; + simgrid.host.new{id="Fafard",power=76296000}; + simgrid.host.new{id="Ginette",power=48492000}; + simgrid.host.new{id="Bourassa",power=48492000}; -- create Links for i=0,11 do - simgrid.Link.new{id=i,bandwidth=252750+ i*768,latency=0.000270544+i*0.087}; + simgrid.link.new{id=i,bandwidth=252750+ i*768,latency=0.000270544+i*0.087}; end - -- simgrid.Route.new(src_id,des_id,links_nb,links_list) - simgrid.Route.new("Tremblay","Jupiter",{"1"}); - simgrid.Route.new("Tremblay","Fafard",{"0","1","2","3","4","8"}); - simgrid.Route.new("Tremblay","Ginette",{"3","4","5"}); - simgrid.Route.new("Tremblay","Bourassa",{"0","1","3","2","4","6","7"}); + -- simgrid.route.new(src_id,des_id,links_nb,links_list) + simgrid.route.new("Tremblay","Jupiter",{"1"}); + simgrid.route.new("Tremblay","Fafard",{"0","1","2","3","4","8"}); + simgrid.route.new("Tremblay","Ginette",{"3","4","5"}); + simgrid.route.new("Tremblay","Bourassa",{"0","1","3","2","4","6","7"}); - simgrid.Route.new("Jupiter","Tremblay",{"1"}); - simgrid.Route.new("Jupiter","Fafard",{"0","1","2","3","4","8","9"}); - simgrid.Route.new("Jupiter","Ginette",{"3","4","5","9"}); - simgrid.Route.new("Jupiter","Bourassa",{"0","1","2","3","4","6","7","9"}); + simgrid.route.new("Jupiter","Tremblay",{"1"}); + simgrid.route.new("Jupiter","Fafard",{"0","1","2","3","4","8","9"}); + simgrid.route.new("Jupiter","Ginette",{"3","4","5","9"}); + simgrid.route.new("Jupiter","Bourassa",{"0","1","2","3","4","6","7","9"}); - simgrid.Route.new("Fafard","Tremblay",{"0","1","2","3","4","8"}); - simgrid.Route.new("Fafard","Jupiter",{"0","1","2","3","4","8","9"}); - simgrid.Route.new("Fafard","Ginette",{"0","1","2","5","8"}); - simgrid.Route.new("Fafard","Bourassa",{"6","7","8"}); + simgrid.route.new("Fafard","Tremblay",{"0","1","2","3","4","8"}); + simgrid.route.new("Fafard","Jupiter",{"0","1","2","3","4","8","9"}); + simgrid.route.new("Fafard","Ginette",{"0","1","2","5","8"}); + simgrid.route.new("Fafard","Bourassa",{"6","7","8"}); - simgrid.Route.new("Ginette","Tremblay",{"3","4","5"}); - simgrid.Route.new("Ginette","Jupiter",{"3","4","5","9"}); - simgrid.Route.new("Ginette","Fafard",{"0","1","2","5","8"}); - simgrid.Route.new("Ginette","Bourassa",{"0","1","2","5","6","7"}); + simgrid.route.new("Ginette","Tremblay",{"3","4","5"}); + simgrid.route.new("Ginette","Jupiter",{"3","4","5","9"}); + simgrid.route.new("Ginette","Fafard",{"0","1","2","5","8"}); + simgrid.route.new("Ginette","Bourassa",{"0","1","2","5","6","7"}); - simgrid.Route.new("Bourassa","Tremblay",{"0","1","3","2","4","6","7"}); - simgrid.Route.new("Bourassa","Jupiter",{"0","1","2","3","4","6","7","9"}); - simgrid.Route.new("Bourassa","Fafard",{"6","7","8"}); - simgrid.Route.new("Bourassa","Ginette",{"0","1","2","5","6","7"}); + simgrid.route.new("Bourassa","Tremblay",{"0","1","3","2","4","6","7"}); + simgrid.route.new("Bourassa","Jupiter",{"0","1","2","3","4","6","7","9"}); + simgrid.route.new("Bourassa","Fafard",{"6","7","8"}); + simgrid.route.new("Bourassa","Ginette",{"0","1","2","5","6","7"}); --Save Platform simgrid.sd_register_platform(); diff --git a/src/bindings/lua/simgrid_lua.c b/src/bindings/lua/simgrid_lua.c index dccdf8aa8c..268323225f 100644 --- a/src/bindings/lua/simgrid_lua.c +++ b/src/bindings/lua/simgrid_lua.c @@ -12,11 +12,11 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(lua, bindings, "Lua Bindings"); -#define TASK_MODULE_NAME "simgrid.Task" -#define HOST_MODULE_NAME "simgrid.Host" +#define TASK_MODULE_NAME "simgrid.task" +#define HOST_MODULE_NAME "simgrid.host" // Surf (bypass XML) -#define LINK_MODULE_NAME "simgrid.Link" -#define ROUTE_MODULE_NAME "simgrid.Route" +#define LINK_MODULE_NAME "simgrid.link" +#define ROUTE_MODULE_NAME "simgrid.route" #define PLATF_MODULE_NAME "simgrid.platf" static lua_State* sglua_maestro_state; @@ -255,7 +255,7 @@ static int l_task_tostring(lua_State* L) return 1; } -static const luaL_reg Task_meta[] = { +static const luaL_reg task_meta[] = { {"__gc", l_task_gc}, {"__tostring", l_task_tostring}, {NULL, NULL} @@ -441,17 +441,17 @@ static int gras_generate(lua_State * L) * Host Methods */ static const luaL_reg host_functions[] = { - {"getByName", l_host_get_by_name}, + {"get_by_name", l_host_get_by_name}, {"name", l_host_get_name}, {"number", l_host_number}, {"at", l_host_at}, {"self", l_host_self}, - {"getPropValue", l_host_get_property_value}, + {"get_prop_value", l_host_get_property_value}, {"sleep", l_host_sleep}, {"destroy", l_host_destroy}, // Bypass XML Methods - {"setFunction", console_set_function}, - {"setProperty", console_host_set_property}, + {"set_function", console_set_function}, + {"set_property", console_host_set_property}, {NULL, NULL} }; @@ -752,7 +752,7 @@ void register_c_functions(lua_State *L) { /* register the task methods to lua */ luaL_openlib(L, TASK_MODULE_NAME, task_functions, 0); // create methods table, add it to the globals luaL_newmetatable(L, TASK_MODULE_NAME); // create metatable for Task, add it to the Lua registry - luaL_openlib(L, 0, Task_meta, 0); // fill metatable + luaL_openlib(L, 0, task_meta, 0); // fill metatable lua_pushliteral(L, "__index"); lua_pushvalue(L, -3); // dup methods table lua_rawset(L, -3); // metatable.__index = methods -- 2.20.1