merge conflicts

[simgrid.git] / src / bindings / lua / lua_console.c

diff --git a/src/bindings/lua/lua_console.c b/src/bindings/lua/lua_console.c
index c6f01ae..82b7f6b 100644 (file)
--- a/src/bindings/lua/lua_console.c
+++ b/src/bindings/lua/lua_console.c
@@ -15,13 +15,13 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(lua_console, bindings, "Lua Bindings");
 
 int console_open(lua_State *L) {
   sg_platf_init();
-  sg_platf_open();
+  sg_platf_begin();
   surf_parse_init_callbacks();
   return 0;
 }
 
 int console_close(lua_State *L) {
-  sg_platf_close();
+  sg_platf_end();
   sg_platf_exit();
   return 0;
 }
@@ -226,7 +226,7 @@ int console_add_route(lua_State *L) {
   lua_pushstring(L,"links");
   lua_gettable(L,-2);
   links = xbt_str_split(lua_tostring(L, -1), ", \t\r\n");
-  if (xbt_dynar_length(links)==0)
+  if (xbt_dynar_is_empty(links))
     xbt_dynar_push_as(links,char*,xbt_strdup(lua_tostring(L, -1)));
   lua_pop(L,1);
 
@@ -279,12 +279,12 @@ int console_AS_open(lua_State *L) {
  mode = lua_tostring(L, -1);
  lua_pop(L, 1);
 
- sg_platf_new_AS_open(id,mode);
+ sg_platf_new_AS_begin(id,mode);
 
  return 0;
 }
 int console_AS_close(lua_State *L) {
-  sg_platf_new_AS_close();
+  sg_platf_new_AS_end();
   return 0;
 }