let's seal() the AS in lua too

[simgrid.git] / src / bindings / lua / lua_platf.cpp

diff --git a/src/bindings/lua/lua_platf.cpp b/src/bindings/lua/lua_platf.cpp
index ec52f01..e913618 100644 (file)
--- a/src/bindings/lua/lua_platf.cpp
+++ b/src/bindings/lua/lua_platf.cpp
@@ -20,7 +20,7 @@ extern "C" {
 #include <simgrid/host.h>
 #include "src/surf/surf_private.h"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(lua_platf, bindings, "Lua bindings (platform module)");
+XBT_LOG_NEW_DEFAULT_CATEGORY(lua_platf, "Lua bindings (platform module)");
 
 #define PLATF_MODULE_NAME "simgrid.platf"
 
@@ -32,7 +32,7 @@ static const luaL_Reg platf_functions[] = {
     {"open", console_open},
     {"close", console_close},
     {"AS_open", console_AS_open},
-    {"AS_close", console_AS_close},
+    {"AS_seal", console_AS_seal},
     {"backbone_new", console_add_backbone},
     {"host_link_new", console_add_host___link},
     {"host_new", console_add_host},
@@ -181,11 +181,11 @@ int console_add_host(lua_State *L) {
   if (type != LUA_TSTRING && type != LUA_TNUMBER) {
     XBT_ERROR("Attribute 'speed' must be specified for host and must either be a string (in the correct format; check documentation) or a number.");
   }
-  host.speed_peak = xbt_dynar_new(sizeof(double), NULL);
+  host.speed_per_pstate = xbt_dynar_new(sizeof(double), NULL);
   if (type == LUA_TNUMBER)
-    xbt_dynar_push_as(host.speed_peak, double, lua_tointeger(L, -1));
+    xbt_dynar_push_as(host.speed_per_pstate, double, lua_tointeger(L, -1));
   else // LUA_TSTRING
-    xbt_dynar_push_as(host.speed_peak, double, surf_parse_get_speed(lua_tostring(L, -1), "speed of host", host.id));
+    xbt_dynar_push_as(host.speed_per_pstate, double, surf_parse_get_speed(lua_tostring(L, -1), "speed of host", host.id));
   lua_pop(L, 1);
 
   // get core
@@ -202,17 +202,21 @@ int console_add_host(lua_State *L) {
   //get power_trace
   lua_pushstring(L, "availability_file");
   lua_gettable(L, -2);
-  host.speed_trace = tmgr_trace_new_from_file(lua_tostring(L, -1));
+  const char *filename = lua_tostring(L, -1);
+  if (filename)
+    host.speed_trace = tmgr_trace_new_from_file(filename);
   lua_pop(L, 1);
 
   //get trace state
   lua_pushstring(L, "state_file");
   lua_gettable(L, -2);
-  host.state_trace = tmgr_trace_new_from_file(lua_tostring(L, -1));
+  filename = lua_tostring(L, -1);
+    if (filename)
+      host.state_trace = tmgr_trace_new_from_file(filename);
   lua_pop(L, 1);
 
   sg_platf_new_host(&host);
-  xbt_dynar_free(&host.speed_peak);
+  xbt_dynar_free(&host.speed_per_pstate);
 
   return 0;
 }
@@ -267,19 +271,25 @@ int  console_add_link(lua_State *L) {
   //get bandwidth_trace value
   lua_pushstring(L, "bandwidth_file");
   lua_gettable(L, -2);
-  link.bandwidth_trace = tmgr_trace_new_from_file(lua_tostring(L, -1));
+  const char *filename = lua_tostring(L, -1);
+  if (filename)
+    link.bandwidth_trace = tmgr_trace_new_from_file(filename);
   lua_pop(L, 1);
 
   //get latency_trace value
   lua_pushstring(L, "latency_file");
   lua_gettable(L, -2);
-  link.latency_trace = tmgr_trace_new_from_file(lua_tostring(L, -1));
+  filename = lua_tostring(L, -1);
+  if (filename)
+    link.latency_trace = tmgr_trace_new_from_file(filename);
   lua_pop(L, 1);
 
   //get state_trace value
   lua_pushstring(L, "state_file");
   lua_gettable(L, -2);
-  link.state_trace = tmgr_trace_new_from_file(lua_tostring(L, -1));
+  filename = lua_tostring(L, -1);
+  if (filename)
+    link.state_trace = tmgr_trace_new_from_file(filename);
   lua_pop(L, 1);
 
   //get policy value
@@ -394,13 +404,13 @@ int console_add_route(lua_State *L) {
   if (lua_isstring(L, -1)) {
     const char* value = lua_tostring(L, -1);
     if (strcmp("YES", value) == 0) {
-      route.symmetrical = TRUE;
+      route.symmetrical = true;
     }
     else
-      route.symmetrical = FALSE;
+      route.symmetrical = false;
   }
   else {
-    route.symmetrical = TRUE;
+    route.symmetrical = true;
   }
   lua_pop(L,1);
 
@@ -471,12 +481,12 @@ int console_add_ASroute(lua_State *L) {
   if (lua_isstring(L, -1)) {
     const char* value = lua_tostring(L, -1);
     if (strcmp("YES", value) == 0)
-      ASroute.symmetrical = TRUE;
+      ASroute.symmetrical = true;
     else
-      ASroute.symmetrical = FALSE;
+      ASroute.symmetrical = false;
   }
   else {
-    ASroute.symmetrical = TRUE;
+    ASroute.symmetrical = true;
   }
   lua_pop(L,1);
 
@@ -520,17 +530,16 @@ int console_AS_open(lua_State *L) {
  else if(!strcmp(mode,"none")) mode_int = A_surfxml_AS_routing_None;
  else xbt_die("Don't have the model name '%s'",mode);
 
- s_sg_platf_AS_cbarg_t AS = SG_PLATF_AS_INITIALIZER;
+ s_sg_platf_AS_cbarg_t AS;
  AS.id = id;
  AS.routing = mode_int;
-
  sg_platf_new_AS_begin(&AS);
 
  return 0;
 }
-int console_AS_close(lua_State *L) {
-  XBT_DEBUG("Closing AS");
-  sg_platf_new_AS_end();
+int console_AS_seal(lua_State *L) {
+  XBT_DEBUG("Sealing AS");
+  sg_platf_new_AS_seal();
   return 0;
 }