Rename power->speed in the inner layer of the parsing

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

diff --git a/src/bindings/lua/lua_platf.c b/src/bindings/lua/lua_platf.c
index ef416f9..d939468 100644 (file)
--- a/src/bindings/lua/lua_platf.c
+++ b/src/bindings/lua/lua_platf.c
@@ -14,9 +14,9 @@
 #include <ctype.h>
 #include <lauxlib.h>
 
-#include <msg/msg_private.h>
-#include <simix/smx_host_private.h>
-#include <surf/surf_private.h>
+#include "src/msg/msg_private.h"
+#include "src/simix/smx_host_private.h"
+#include "src/surf/surf_private.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(lua_platf, bindings, "Lua bindings (platform module)");
 
@@ -48,31 +48,12 @@ int console_open(lua_State *L) {
   storage_register_callbacks();
   routing_register_callbacks();
 
-  gpu_register_callbacks();
-
   return 0;
 }
 
 int console_close(lua_State *L) {
   sg_platf_end();
   sg_platf_exit();
-
-  xbt_lib_cursor_t cursor;
-  void **data;
-  char *name;
-
-  /* Initialize MSG and WKS hosts */
-  XBT_DEBUG("Initialize MSG and WKS hosts");
-  xbt_lib_foreach(host_lib, cursor, name, data) {
-    if(data[SURF_HOST_LEVEL]){
-      XBT_DEBUG("\tSee surf host %s",name);
-      SIMIX_host_create(name);
-      // THIS IS BRAINDEAD. There is no sg_host_t in that level, but a smx_host_priv. So commenting out for now.
-      // Lua is broken anyway. Christian will fix it
-      // __MSG_host_create((sg_host_t)data[SIMIX_HOST_LEVEL]);
-    }
-  }
-
   return 0;
 }
 
@@ -201,8 +182,8 @@ int console_add_host(lua_State *L) {
   if (type != LUA_TSTRING && type != LUA_TNUMBER) {
     XBT_ERROR("Attribute 'power' must be specified for host and must either be a string (in the correct format; check documentation) or a number.");
   }
-  host.power_peak = xbt_dynar_new(sizeof(double), NULL);
-  xbt_dynar_push_as(host.power_peak, double, get_cpu_power(lua_tostring(L, -1)));
+  host.speed_peak = xbt_dynar_new(sizeof(double), NULL);
+  xbt_dynar_push_as(host.speed_peak, double, get_cpu_speed(lua_tostring(L, -1)));
   lua_pop(L, 1);
 
   // get core
@@ -219,14 +200,14 @@ int console_add_host(lua_State *L) {
   //get power_scale
   lua_pushstring(L, "availability");
   lua_gettable(L, -2);
-  if(!lua_isnumber(L,-1)) host.power_scale = 1;// Default value
-  else host.power_scale = lua_tonumber(L, -1);
+  if(!lua_isnumber(L,-1)) host.speed_scale = 1;// Default value
+  else host.speed_scale = lua_tonumber(L, -1);
   lua_pop(L, 1);
 
   //get power_trace
   lua_pushstring(L, "availability_file");
   lua_gettable(L, -2);
-  host.power_trace = tmgr_trace_new_from_file(lua_tostring(L, -1));
+  host.speed_trace = tmgr_trace_new_from_file(lua_tostring(L, -1));
   lua_pop(L, 1);
 
   //get state initial
@@ -248,6 +229,7 @@ int console_add_host(lua_State *L) {
   lua_pop(L, 1);
 
   sg_platf_new_host(&host);
+  xbt_dynar_free(&host.speed_peak);
 
   return 0;
 }