fix lua console application for SimDag module

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8357 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/examples/simdag/platform_script.lua b/examples/simdag/platform_script.lua
index 1d46d71..38e9fc7 100644 (file)
--- a/examples/simdag/platform_script.lua
+++ b/examples/simdag/platform_script.lua
@@ -1,5 +1,7 @@
 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};

diff --git a/src/bindings/lua/simgrid_lua.c b/src/bindings/lua/simgrid_lua.c
index d15e48d..de08abc 100644 (file)
--- a/src/bindings/lua/simgrid_lua.c
+++ b/src/bindings/lua/simgrid_lua.c
@@ -807,7 +807,6 @@ static int surf_parse_bypass_platform()
 
        // add traces
        surf_add_host_traces();
-       //surf_set_routes();
        surf_add_link_traces();
 
        return 0; // must return 0 ?!!
@@ -828,6 +827,9 @@ static int surf_wsL07_parse_bypass_platform()
        p_link_attr p_link;
        p_route_attr p_route;
 
+       // Init routing mode
+       create_AS(AS->id,AS->mode);
+
        // Add Hosts
        xbt_dynar_foreach(host_list_d,i,p_host)
        {
@@ -846,16 +848,18 @@ static int surf_wsL07_parse_bypass_platform()
        // add route
        xbt_dynar_foreach(route_list_d,i,p_route)
        {
-               //surf_routing_add_route((char*)p_route->src_id,(char*)p_route->dest_id,p_route->links_id);
+               surf_routing_add_route((char*)p_route->src_id,(char*)p_route->dest_id,p_route->links_id);
        }
        /* </platform> */
 
+       // Finalize AS
+       surf_AS_finalize(AS->id);
+       // add traces
        surf_wsL07_add_traces();
-       //surf_set_routes();
 
        return 0;
-
 }
+
 /*
  * surf parse bypass application for MSG Module
  */