Dirty hacks again: shot more bullets, it may be a zombie

[simgrid.git] / examples / msg / masterslave / platform_script.lua

diff --git a/examples/msg/masterslave/platform_script.lua b/examples/msg/masterslave/platform_script.lua
index 870a959..fc973a8 100644 (file)
--- a/examples/msg/masterslave/platform_script.lua
+++ b/examples/msg/masterslave/platform_script.lua
@@ -1,52 +1,54 @@
 require "simgrid"
 
-  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.AS.new{id="AS0",mode="Full"}; 
+
+  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};
+  simgrid.AS.addHost{AS="AS0",id="Ginette",power=48492000};
+  simgrid.AS.addHost{AS="AS0",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.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("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.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"});
+   simgrid.AS.addRoute("AS0","Tremblay","Bourassa",{"0","1","3","2","4","6","7"});
+
+   simgrid.AS.addRoute("AS0","Jupiter","Tremblay",{"1"});
+   simgrid.AS.addRoute("AS0","Jupiter","Fafard",{"0","1","2","3","4","8","9"});
+   simgrid.AS.addRoute("AS0","Jupiter","Ginette",{"3","4","5","9"});
+   simgrid.AS.addRoute("AS0","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.AS.addRoute("AS0","Fafard","Tremblay",{"0","1","2","3","4","8"});
+   simgrid.AS.addRoute("AS0","Fafard","Jupiter",{"0","1","2","3","4","8","9"});
+   simgrid.AS.addRoute("AS0","Fafard","Ginette",{"0","1","2","5","8"});
+   simgrid.AS.addRoute("AS0","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.AS.addRoute("AS0","Ginette","Tremblay",{"3","4","5"});
+   simgrid.AS.addRoute("AS0","Ginette","Jupiter",{"3","4","5","9"});
+   simgrid.AS.addRoute("AS0","Ginette","Fafard",{"0","1","2","5","8"});
+   simgrid.AS.addRoute("AS0","Ginette","Bourassa",{"0","1","2","5","6","7"});
+
+   simgrid.AS.addRoute("AS0","Bourassa","Tremblay",{"0","1","3","2","4","6","7"});
+   simgrid.AS.addRoute("AS0","Bourassa","Jupiter",{"0","1","2","3","4","6","7","9"});
+   simgrid.AS.addRoute("AS0","Bourassa","Fafard",{"6","7","8"});
+   simgrid.AS.addRoute("AS0","Bourassa","Ginette",{"0","1","2","5","6","7"});
   
    --Save Platform
-   simgrid.register_platform();
+   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.register_application(); 
+   simgrid.msg_register_application();