X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c85e43e7cc3034aefc758257a387d32026c05ef4..badae5b067e0b341051aa2eae2bf3afbc4311193:/src/bindings/lua/lua_host.c

diff --git a/src/bindings/lua/lua_host.c b/src/bindings/lua/lua_host.c
index 4d65ac6f16..804b672a7e 100644
--- a/src/bindings/lua/lua_host.c
+++ b/src/bindings/lua/lua_host.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2012-2014. The SimGrid Team.
+/* Copyright (c) 2010, 2012-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -8,29 +8,34 @@
 
 #include "lua_private.h"
 #include <lauxlib.h>
+#include <simgrid/host.h>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(lua_host, bindings, "Lua bindings (host module)");
 
 #define HOST_MODULE_NAME "simgrid.host"
-
+#define HOST_FIELDNAME   "__simgrid_host"
 /* ********************************************************************************* */
 /*                                simgrid.host API                                   */
 /* ********************************************************************************* */
 
 /**
  * \brief Ensures that a value in the stack is a host and returns it.
+ *
+ * This function is called from C and helps to verify that a specific
+ * userdatum on the stack is in fact a sg_host_t.
+ *
  * \param L a Lua state
  * \param index an index in the Lua stack
  * \return the C host corresponding to this Lua host
  */
-msg_host_t sglua_check_host(lua_State * L, int index)
+sg_host_t sglua_check_host(lua_State * L, int index)
 {
-  msg_host_t *pi, ht;
+  sg_host_t *pi, ht;
   luaL_checktype(L, index, LUA_TTABLE);
-  lua_getfield(L, index, "__simgrid_host");
-  pi = (msg_host_t *) luaL_checkudata(L, lua_gettop(L), HOST_MODULE_NAME);
+  lua_getfield(L, index, HOST_FIELDNAME);
+  pi = (sg_host_t *) luaL_checkudata(L, lua_gettop(L), HOST_MODULE_NAME);
   if (pi == NULL)
-    luaL_typerror(L, index, HOST_MODULE_NAME);
+    XBT_ERROR("luaL_checkudata() returned NULL");
   ht = *pi;
   if (!ht)
     luaL_error(L, "null Host");
@@ -39,27 +44,30 @@ msg_host_t sglua_check_host(lua_State * L, int index)
 }
 
 /**
- * \brief Returns a host given its name.
+ * \brief Returns a host given its name. This is a lua function.
+ *
  * \param L a Lua state
  * \return number of values returned to Lua
  *
  * - Argument 1 (string): name of a host
- * - Return value (host): the corresponding host
+ * - Return value (host): the corresponding host will be pushed onto the stack
  */
 static int l_host_get_by_name(lua_State * L)
 {
   const char *name = luaL_checkstring(L, 1);
-  XBT_DEBUG("Getting Host from name...");
-  msg_host_t msg_host = MSG_host_by_name(name);
-  if (!msg_host) {
-    luaL_error(L, "null Host : MSG_get_host_by_name failed");
+  XBT_DEBUG("Getting host by name...");
+  sg_host_t host = sg_host_by_name(name);
+  if (!host) {
+    XBT_ERROR("sg_get_host_by_name failed, requested hostname: %s", name);
   }
-  lua_newtable(L);              /* create a table, put the userdata on top of it */
-  msg_host_t *lua_host = (msg_host_t *) lua_newuserdata(L, sizeof(msg_host_t));
-  *lua_host = msg_host;
-  luaL_getmetatable(L, HOST_MODULE_NAME);
-  lua_setmetatable(L, -2);
-  lua_setfield(L, -2, "__simgrid_host");        /* put the userdata as field of the table */
+  lua_newtable(L);                        /* table */
+  sg_host_t *lua_host = (sg_host_t *) lua_newuserdata(L, sizeof(sg_host_t));
+                                          /* table userdatum */
+  *lua_host = host;
+  luaL_getmetatable(L, HOST_MODULE_NAME); /* table userdatum metatable */
+  lua_setmetatable(L, -2);                /* table userdatum */
+  lua_setfield(L, -2, HOST_FIELDNAME);  /* table -- put the userdata as field of the table */
+
   /* remove the args from the stack */
   lua_remove(L, 1);
   return 1;
@@ -75,8 +83,8 @@ static int l_host_get_by_name(lua_State * L)
  */
 static int l_host_get_name(lua_State * L)
 {
-  msg_host_t ht = sglua_check_host(L, 1);
-  lua_pushstring(L, MSG_host_get_name(ht));
+  sg_host_t ht = sglua_check_host(L, 1);
+  lua_pushstring(L, sg_host_get_name(ht));
   return 1;
 }
 
@@ -89,8 +97,8 @@ static int l_host_get_name(lua_State * L)
  */
 static int l_host_number(lua_State * L)
 {
-  xbt_dynar_t hosts = MSG_hosts_as_dynar();
-  lua_pushnumber(L, xbt_dynar_length(hosts));
+  xbt_dynar_t hosts = sg_hosts_as_dynar();
+  lua_pushinteger(L, xbt_dynar_length(hosts));
   xbt_dynar_free(&hosts);
   return 1;
 }
@@ -106,43 +114,18 @@ static int l_host_number(lua_State * L)
 static int l_host_at(lua_State * L)
 {
   int index = luaL_checkinteger(L, 1);
-  xbt_dynar_t hosts = MSG_hosts_as_dynar();
-  msg_host_t host = xbt_dynar_get_as(hosts,index - 1,msg_host_t);// lua indexing start by 1 (lua[1] <=> C[0])
+  xbt_dynar_t hosts = sg_hosts_as_dynar();
+  sg_host_t host = xbt_dynar_get_as(hosts,index - 1,sg_host_t);// lua indexing start by 1 (lua[1] <=> C[0])
   lua_newtable(L);              /* create a table, put the userdata on top of it */
-  msg_host_t *lua_host = (msg_host_t *) lua_newuserdata(L, sizeof(msg_host_t));
+  sg_host_t *lua_host = (sg_host_t *) lua_newuserdata(L, sizeof(sg_host_t));
   *lua_host = host;
   luaL_getmetatable(L, HOST_MODULE_NAME);
   lua_setmetatable(L, -2);
-  lua_setfield(L, -2, "__simgrid_host");        /* put the userdata as field of the table */
+  lua_setfield(L, -2, HOST_FIELDNAME);        /* put the userdata as field of the table */
   xbt_dynar_free(&hosts);
   return 1;
 }
 
-/**
- * \brief Returns the host where the current process is located.
- * \param L a Lua state
- * \return number of values returned to Lua
- *
- * - Return value (host): the current host
- */
-static int l_host_self(lua_State * L)
-{
-                                  /* -- */
-  msg_host_t host = MSG_host_self();
-  lua_newtable(L);
-                                  /* table */
-  msg_host_t* lua_host = (msg_host_t*) lua_newuserdata(L, sizeof(msg_host_t));
-                                  /* table ud */
-  *lua_host = host;
-  luaL_getmetatable(L, HOST_MODULE_NAME);
-                                  /* table ud mt */
-  lua_setmetatable(L, -2);
-                                  /* table ud */
-  lua_setfield(L, -2, "__simgrid_host");
-                                  /* table */
-  return 1;
-}
-
 /**
  * \brief Returns the value of a host property.
  * \param L a Lua state
@@ -154,26 +137,12 @@ static int l_host_self(lua_State * L)
  */
 static int l_host_get_property_value(lua_State * L)
 {
-  msg_host_t ht = sglua_check_host(L, 1);
+  sg_host_t ht = sglua_check_host(L, 1);
   const char *prop = luaL_checkstring(L, 2);
-  lua_pushstring(L,MSG_host_get_property_value(ht,prop));
+  lua_pushstring(L, sg_host_get_property_value(ht,prop));
   return 1;
 }
 
-/**
- * \brief Makes the current process sleep for a while.
- * \param L a Lua state
- * \return number of values returned to Lua
- *
- * - Argument 1 (number): duration of the sleep
- */
-static int l_host_sleep(lua_State *L)
-{
-  int time = luaL_checknumber(L, 1);
-  MSG_process_sleep(time);
-  return 0;
-}
-
 /**
  * \brief Destroys a host.
  * \param L a Lua state
@@ -183,22 +152,19 @@ static int l_host_sleep(lua_State *L)
  */
 static int l_host_destroy(lua_State *L)
 {
-  //msg_host_t ht = sglua_check_host(L, 1);
+  //sg_host_t ht = sglua_check_host(L, 1);
   //FIXME: not working..__MSG_host_priv_free(MSG_host_priv(ht));
   return 0;
 }
 
-static const luaL_reg host_functions[] = {
+static const luaL_Reg host_functions[] = {
   {"get_by_name", l_host_get_by_name},
   {"name", l_host_get_name},
   {"number", l_host_number},
   {"at", l_host_at},
-  {"self", l_host_self},
   {"get_prop_value", l_host_get_property_value},
-  {"sleep", l_host_sleep},
   {"destroy", l_host_destroy},
   // Bypass XML Methods
-  {"set_function", console_set_function},
   {"set_property", console_host_set_property},
   {NULL, NULL}
 };
@@ -217,7 +183,7 @@ static int l_host_tostring(lua_State * L)
   return 1;
 }
 
-static const luaL_reg host_meta[] = {
+static const luaL_Reg host_meta[] = {
   {"__tostring", l_host_tostring},
   {0, 0}
 };
@@ -232,24 +198,30 @@ static const luaL_reg host_meta[] = {
 void sglua_register_host_functions(lua_State* L)
 {
   /* create a table simgrid.host and fill it with host functions */
-  luaL_openlib(L, HOST_MODULE_NAME, host_functions, 0);
-                                  /* simgrid.host */
+  lua_getglobal(L, "simgrid"); /* simgrid */
+  luaL_newlib(L, host_functions); /* simgrid simgrid.host */
+  lua_setfield(L, -2, "host"); /* simgrid */
+  lua_getfield(L, -1, "host");    /* simgrid simgrid.host */
 
   /* create the metatable for host, add it to the Lua registry */
-  luaL_newmetatable(L, HOST_MODULE_NAME);
-                                  /* simgrid.host mt */
+  luaL_newmetatable(L, HOST_MODULE_NAME); /* simgrid simgrid.host mt */
+
   /* fill the metatable */
-  luaL_openlib(L, NULL, host_meta, 0);
-                                  /* simgrid.host mt */
-  lua_pushvalue(L, -2);
-                                  /* simgrid.host mt simgrid.host */
+  luaL_setfuncs(L, host_meta, 0);         /* simgrid simgrid.host mt */
+
+  /**
+   * Copy the table and push it onto the stack.
+   * Required for the lua_setfield call below.
+   */
+  lua_getfield(L, -3, "host");                   /* simgrid simgrid.host mt simgrid.host */
+
   /* metatable.__index = simgrid.host
    * we put the host functions inside the host userdata itself:
    * this allows to write my_host:method(args) for
    * simgrid.host.method(my_host, args) */
-  lua_setfield(L, -2, "__index");
-                                  /* simgrid.host mt */
-  lua_pop(L, 2);
-                                  /* -- */
+  lua_setfield(L, -2, "__index");         /* simgrid simgrid.host mt */
+
+  lua_setmetatable(L, -2);                /* simgrid simgrid.host */
+  lua_pop(L, 2);                          /* -- */
 }