X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/80c84ddd8a87e9f6740c8b18e18570745c356686..09223540bbe121f48b2be7a2e940b70c3e651d90:/examples/msg/masterslave/platform_script.lua

diff --git a/examples/msg/masterslave/platform_script.lua b/examples/msg/masterslave/platform_script.lua
index 208ab8592e..32215a9ef7 100644
--- a/examples/msg/masterslave/platform_script.lua
+++ b/examples/msg/masterslave/platform_script.lua
@@ -1,52 +1,64 @@
+-- Copyright (c) 2010-2012. The SimGrid Team. All rights reserved.
+
+-- This program is free software; you can redistribute it and/or modify it
+--under the terms of the license (GNU LGPL) which comes with this package.
+
+
+-- This file describes a platform very similar to the small_platform.xml, but in lua
+-- It is naturally to be used with the MSG_load_platform_script function
+
+-- Of course, such a flat file is maybe not very interesting wrt xml.
+-- The full power of lua reveals when you describe your platform programatically. 
+
 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.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=10,0,-1 do
-    simgrid.Link.new{id=i,bandwidth=252750+ i*768,latency=0.000270544+i*0.087};   
+    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.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"});
+   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.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();