From 80c84ddd8a87e9f6740c8b18e18570745c356686 Mon Sep 17 00:00:00 2001 From: coldpeace Date: Fri, 12 Nov 2010 10:12:21 +0000 Subject: [PATCH] update lua(bypass) examples git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8526 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- .../gras/console/gras_platform_script.lua | 4 +- examples/lua/master_slave_bypass.lua | 63 ++++++++++--------- examples/msg/masterslave/platform_script.lua | 10 +-- 3 files changed, 39 insertions(+), 38 deletions(-) diff --git a/examples/gras/console/gras_platform_script.lua b/examples/gras/console/gras_platform_script.lua index e7a0493f7e..2b965e15f8 100644 --- a/examples/gras/console/gras_platform_script.lua +++ b/examples/gras/console/gras_platform_script.lua @@ -42,8 +42,8 @@ require "simgrid" simgrid.gras_register_platform(); --Set Application - simgrid.Host.setFunction("Tremblay","server",{"4000"}); - simgrid.Host.setFunction("Fafard","client",{"Tremblay","4000"}); + simgrid.Host.setFunction{host="Tremblay",fct="server",args="4000"}; + simgrid.Host.setFunction{host="Fafard",fct="client",args="Tremblay,4000"}; --Save Application simgrid.gras_register_application(); diff --git a/examples/lua/master_slave_bypass.lua b/examples/lua/master_slave_bypass.lua index 15cfe979b3..33a328dcd1 100644 --- a/examples/lua/master_slave_bypass.lua +++ b/examples/lua/master_slave_bypass.lua @@ -80,46 +80,47 @@ require "simgrid" 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}; + 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="Tremblay",dest="Jupiter",links="1"}; + simgrid.Route.new{src="Tremblay",dest="Fafard",links="0,1,2,3,4,8"}; + simgrid.Route.new{src="Tremblay",dest="Ginette",links="3,4,5"}; + simgrid.Route.new{src="Tremblay",dest="Bourassa",links="0,1,3,2,4,6,7"}; + + simgrid.Route.new{src="Jupiter",dest="Tremblay",links="1"}; + simgrid.Route.new{src="Jupiter",dest="Fafard",links="0,1,2,3,4,8,9"}; + simgrid.Route.new{src="Jupiter",dest="Ginette",links="3,4,5,9"}; + simgrid.Route.new{src="Jupiter",dest="Bourassa",links="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{src="Fafard",dest="Tremblay",links="0,1,2,3,4,8"}; + simgrid.Route.new{src="Fafard",dest="Jupiter",links="0,1,2,3,4,8,9"}; + simgrid.Route.new{src="Fafard",dest="Ginette",links="0,1,2,5,8"}; + simgrid.Route.new{src="Fafard",dest="Bourassa",links="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{src="Ginette",dest="Tremblay",links="3,4,5"}; + simgrid.Route.new{src="Ginette",dest="Jupiter",links="3,4,5,9"}; + simgrid.Route.new{src="Ginette",dest="Fafard",links="0,1,2,5,8"}; + simgrid.Route.new{src="Ginette",dest="Bourassa",links="0,1,2,5,6,7"}; + + simgrid.Route.new{src="Bourassa",dest="Tremblay",links="0,1,3,2,4,6,7"}; + simgrid.Route.new{src="Bourassa",dest="Jupiter",links="0,1,2,3,4,6,7,9"}; + simgrid.Route.new{src="Bourassa",dest="Fafard",links="6,7,8"}; + simgrid.Route.new{src="Bourassa",dest="Ginette",links="0,1,2,5,6,7"}; --Save Platform - simgrid.info("start registering platform"); + --simgrid.info("start registering platform"); simgrid.msg_register_platform(); - simgrid.info("platform registered"); + --simgrid.info("platform registered"); --Set Application - simgrid.Host.setFunction("Tremblay","Master",{"20","550000000","1000000","4"}); - simgrid.Host.setFunction("Bourassa","Slave",{"0"}); - simgrid.Host.setFunction("Jupiter","Slave",{"1"}); - simgrid.Host.setFunction("Fafard","Slave",{"2"}); - simgrid.Host.setFunction("Ginette","Slave",{"3"}); + 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"}; --Save Application simgrid.msg_register_application(); diff --git a/examples/msg/masterslave/platform_script.lua b/examples/msg/masterslave/platform_script.lua index 502c77e8d4..208ab8592e 100644 --- a/examples/msg/masterslave/platform_script.lua +++ b/examples/msg/masterslave/platform_script.lua @@ -42,11 +42,11 @@ require "simgrid" simgrid.msg_register_platform(); --Set Application - simgrid.Host.setFunction("Tremblay","master",{"20","550000000","1000000","4"}); - simgrid.Host.setFunction("Bourassa","slave",{"0"}); - simgrid.Host.setFunction("Jupiter","slave",{"1"}); - simgrid.Host.setFunction("Fafard","slave",{"2"}); - simgrid.Host.setFunction("Ginette","slave",{"3"}); + 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"}; --Save Application simgrid.msg_register_application(); -- 2.20.1