Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid

[simgrid.git] / src / bindings / lua / simgrid_lua.h

diff --git a/src/bindings/lua/simgrid_lua.h b/src/bindings/lua/simgrid_lua.h
index 24af2b35b910d69e52830767d1a5da9e275fa5fd..9a56e3f88e4a9750799947885e3f510cf2484acc 100644 (file)
--- a/src/bindings/lua/simgrid_lua.h
+++ b/src/bindings/lua/simgrid_lua.h
@@ -53,6 +53,8 @@ typedef struct t_AS_attr {
   xbt_dynar_t host_list_d;
   xbt_dynar_t link_list_d;
   xbt_dynar_t route_list_d;
+  xbt_dynar_t router_list_d;
+  xbt_dynar_t sub_as_list_id;
 } AS_attr, *p_AS_attr;
 
 typedef struct t_host_attr {
@@ -69,6 +71,7 @@ typedef struct t_host_attr {
   //deployment attribute
   const char *function;
   xbt_dynar_t args_list;
+  xbt_dict_t properties;
 } host_attr, *p_host_attr;
 
 
@@ -93,6 +96,10 @@ typedef struct t_route_attr {
 
 } route_attr, *p_route_attr;
 
+typedef struct t_router_attr {
+       const char *id;
+} router_attr, *p_router_attr;
+
 // Public Functions
 
 int console_add_host(lua_State*);
@@ -100,6 +107,7 @@ int console_add_link(lua_State*);
 int console_add_route(lua_State*);
 int console_add_AS(lua_State*);
 int console_set_function(lua_State*);
+int console_host_set_property(lua_State*);
 
 int console_parse_platform(void);
 int console_parse_application(void);