X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/aeec134fb5bb089e9df3b6b51fe5b84ea9dab198..9d55e5f6c6e23b9bed8e786e28e47addea1028aa:/src/bindings/lua/lua_platf.c

diff --git a/src/bindings/lua/lua_platf.c b/src/bindings/lua/lua_platf.c
index 9e71141239..088f9a9e86 100644
--- 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,60 +48,57 @@ 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;
 }
 
 int console_add_backbone(lua_State *L) {
   s_sg_platf_link_cbarg_t link;
   memset(&link,0,sizeof(link));
+  int type;
 
   link.properties = NULL;
 
+  if (!lua_istable(L, -1)) {
+    XBT_ERROR
+        ("Bad Arguments to create backbone in Lua. Should be a table with named arguments.");
+    return -1;
+  }
+
   lua_pushstring(L, "id");
-  lua_gettable(L, -2);
+  type = lua_gettable(L, -2);
+  if (type != LUA_TSTRING) {
+    XBT_ERROR("Attribute 'id' must be specified for backbone and must be a string.");
+  }
   link.id = lua_tostring(L, -1);
   lua_pop(L, 1);
 
   lua_pushstring(L, "bandwidth");
-  lua_gettable(L, -2);
+  type = lua_gettable(L, -2);
+  if (type != LUA_TSTRING && type != LUA_TNUMBER) {
+    XBT_ERROR("Attribute 'bandwidth' must be specified for backbone and must either be a string (in the right format; see docs) or a number.");
+  }
   link.bandwidth = surf_parse_get_bandwidth(lua_tostring(L, -1));
   lua_pop(L, 1);
 
   lua_pushstring(L, "lat");
-  lua_gettable(L, -2);
+  type = lua_gettable(L, -2);
+  if (type != LUA_TSTRING && type != LUA_TNUMBER) {
+    XBT_ERROR("Attribute 'lat' must be specified for backbone and must either be a string (in the right format; see docs) or a number.");
+  }
   link.latency = surf_parse_get_time(lua_tostring(L, -1));
   lua_pop(L, 1);
 
-  link.state = SURF_RESOURCE_ON;
+  link.initiallyOn = 1;
 
   lua_pushstring(L, "sharing_policy");
   type = lua_gettable(L, -2);
-  char* policy = lua_tostring(L, -1);
+  const char* policy = lua_tostring(L, -1);
   if (policy && !strcmp(policy,"FULLDUPLEX")) {
     link.policy = SURF_LINK_FULLDUPLEX;
   } else if (policy && !strcmp(policy,"FATPIPE")) {
@@ -111,39 +108,49 @@ int console_add_backbone(lua_State *L) {
   }
 
   sg_platf_new_link(&link);
-  routing_cluster_add_backbone(xbt_lib_get_or_null(link_lib, link.id, SURF_LINK_LEVEL));
+  routing_cluster_add_backbone(sg_link_by_name(link.id));
 
   return 0;
 }
 
 int console_add_host___link(lua_State *L) {
-  s_sg_platf_host_link_cbarg_t host_link;
-  memset(&host_link,0,sizeof(host_link));
+  s_sg_platf_host_link_cbarg_t netcard;
+  memset(&netcard,0,sizeof(netcard));
+  int type;
 
   // we get values from the table passed as argument
   if (!lua_istable(L, -1)) {
     XBT_ERROR
-        ("Bad Arguments to create host, Should be a table with named arguments");
+        ("Bad Arguments to create host_link in Lua. Should be a table with named arguments.");
     return -1;
   }
 
   lua_pushstring(L, "id");
-  lua_gettable(L, -2);
-  host_link.id = lua_tostring(L, -1);
+  type = lua_gettable(L, -2);
+  if (type != LUA_TSTRING) {
+    XBT_ERROR("Attribute 'id' must be specified for any host_link and must be a string.");
+  }
+  netcard.id = lua_tostring(L, -1);
   lua_pop(L, 1);
 
   lua_pushstring(L, "up");
-  lua_gettable(L, -2);
-  host_link.link_up = lua_tostring(L, -1);
+  type = lua_gettable(L, -2);
+  if (type != LUA_TSTRING && type != LUA_TNUMBER) {
+    XBT_ERROR("Attribute 'up' must be specified for host_link and must either be a string or a number.");
+  }
+  netcard.link_up = lua_tostring(L, -1);
   lua_pop(L, 1);
 
   lua_pushstring(L, "down");
-  lua_gettable(L, -2);
-  host_link.link_down = lua_tostring(L, -1);
+  type = lua_gettable(L, -2);
+  if (type != LUA_TSTRING && type != LUA_TNUMBER) {
+    XBT_ERROR("Attribute 'down' must be specified for host_link and must either be a string or a number.");
+  }
+  netcard.link_down = lua_tostring(L, -1);
   lua_pop(L, 1);
 
-  XBT_DEBUG("Create a host_link for host %s", host_link.id);
-  sg_platf_new_host_link(&host_link);
+  XBT_DEBUG("Create a host_link for host %s", netcard.id);
+  sg_platf_new_netcard(&netcard);
 
   return 0;
 }
@@ -151,32 +158,40 @@ int console_add_host___link(lua_State *L) {
 int console_add_host(lua_State *L) {
   s_sg_platf_host_cbarg_t host;
   memset(&host,0,sizeof(host));
-  int state;
+  int state, type;
 
   // we get values from the table passed as argument
   if (!lua_istable(L, -1)) {
     XBT_ERROR
-        ("Bad Arguments to create host, Should be a table with named arguments");
+        ("Bad Arguments to create host. Should be a table with named arguments");
     return -1;
   }
 
   // get Id Value
   lua_pushstring(L, "id");
-  lua_gettable(L, -2);
+  type = lua_gettable(L, -2);
+  if (type != LUA_TSTRING && type != LUA_TNUMBER) {
+    XBT_ERROR("Attribute 'id' must be specified for any host and must be a string.");
+  }
   host.id = lua_tostring(L, -1);
   lua_pop(L, 1);
 
   // get power value
-  lua_pushstring(L, "power");
-  lua_gettable(L, -2);
-  host.power_peak = xbt_dynar_new(sizeof(double), NULL);
-  xbt_dynar_push_as(host.power_peak, double, get_cpu_power(lua_tostring(L, -1)));
+  lua_pushstring(L, "speed");
+  type = lua_gettable(L, -2);
+  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);
+  xbt_dynar_push_as(host.speed_peak, double, get_cpu_speed(lua_tostring(L, -1)));
   lua_pop(L, 1);
 
   // get core
   lua_pushstring(L, "core");
   lua_gettable(L, -2);
-  if(!lua_isnumber(L,-1)) host.core_amount = 1;// Default value
+  if(!lua_isnumber(L,-1)) {
+      host.core_amount = 1;// Default value
+  }
   else host.core_amount = lua_tonumber(L, -1);
   if (host.core_amount == 0)
     host.core_amount = 1;
@@ -185,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
@@ -203,9 +218,9 @@ int console_add_host(lua_State *L) {
   lua_pop(L, 1);
 
   if (state)
-    host.initial_state = SURF_RESOURCE_ON;
+    host.initiallyOn = 1;
   else
-    host.initial_state = SURF_RESOURCE_OFF;
+    host.initiallyOn = 0;
 
   //get trace state
   lua_pushstring(L, "state_file");
@@ -214,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;
 }
@@ -222,6 +238,7 @@ int  console_add_link(lua_State *L) {
   s_sg_platf_link_cbarg_t link;
   memset(&link,0,sizeof(link));
 
+  int type;
   const char* policy;
 
   if (! lua_istable(L, -1)) {
@@ -231,19 +248,28 @@ int  console_add_link(lua_State *L) {
 
   // get Id Value
   lua_pushstring(L, "id");
-  lua_gettable(L, -2);
+  type = lua_gettable(L, -2);
+  if (type != LUA_TSTRING && type != LUA_TNUMBER) {
+    XBT_ERROR("Attribute 'id' must be specified for any link and must be a string.");
+  }
   link.id = lua_tostring(L, -1);
   lua_pop(L, 1);
 
   // get bandwidth value
   lua_pushstring(L, "bandwidth");
-  lua_gettable(L, -2);
+  type = lua_gettable(L, -2);
+  if (type != LUA_TSTRING && type != LUA_TNUMBER) {
+    XBT_ERROR("Attribute 'bandwidth' must be specified for any link and must either be either a string (in the right format; see docs) or a number.");
+  }
   link.bandwidth = surf_parse_get_bandwidth(lua_tostring(L, -1));
   lua_pop(L, 1);
 
   //get latency value
   lua_pushstring(L, "lat");
-  lua_gettable(L, -2);
+  type = lua_gettable(L, -2);
+  if (type != LUA_TSTRING && type != LUA_TNUMBER) {
+    XBT_ERROR("Attribute 'lat' must be specified for any link and must either be a string (in the right format; see docs) or a number.");
+  }
   link.latency = surf_parse_get_time(lua_tostring(L, -1));
   lua_pop(L, 1);
 
@@ -271,9 +297,9 @@ int  console_add_link(lua_State *L) {
   lua_pushstring(L, "state");
   lua_gettable(L, -2);
   if (!lua_isnumber(L,-1) || lua_tonumber(L, -1))
-    link.state = SURF_RESOURCE_ON;
+    link.initiallyOn = 1;
   else
-    link.state = SURF_RESOURCE_OFF;
+    link.initiallyOn = 0;
   lua_pop(L, 1);
 
   //get policy value
@@ -299,6 +325,7 @@ int  console_add_link(lua_State *L) {
 int console_add_router(lua_State* L) {
   s_sg_platf_router_cbarg_t router;
   memset(&router,0,sizeof(router));
+  int type;
 
   if (! lua_istable(L, -1)) {
     XBT_ERROR("Bad Arguments to create router, Should be a table with named arguments");
@@ -306,7 +333,10 @@ int console_add_router(lua_State* L) {
   }
 
   lua_pushstring(L, "id");
-  lua_gettable(L, -2);
+  type = lua_gettable(L, -2);
+  if (type != LUA_TSTRING) {
+    XBT_ERROR("Attribute 'id' must be specified for any link and must be a string.");
+  }
   router.id = lua_tostring(L, -1);
   lua_pop(L,1);
 
@@ -326,27 +356,37 @@ int console_add_route(lua_State *L) {
   XBT_DEBUG("Adding route");
   s_sg_platf_route_cbarg_t route;
   memset(&route,0,sizeof(route));
+  int type;
 
   /* allocating memory for the buffer, I think 2kB should be enough */
   surfxml_bufferstack = xbt_new0(char, surfxml_bufferstack_size);
 
   if (! lua_istable(L, -1)) {
-    XBT_ERROR("Bad Arguments to create a route, Should be a table with named arguments");
+    XBT_ERROR("Bad Arguments to create a route. Should be a table with named arguments");
     return -1;
   }
 
   lua_pushstring(L,"src");
-  lua_gettable(L,-2);
+  type = lua_gettable(L,-2);
+  if (type != LUA_TSTRING) {
+    XBT_ERROR("Attribute 'src' must be specified for any route and must be a string.");
+  }
   route.src = lua_tostring(L, -1);
   lua_pop(L,1);
 
   lua_pushstring(L,"dest");
-  lua_gettable(L,-2);
+  type = lua_gettable(L,-2);
+  if (type != LUA_TSTRING) {
+    XBT_ERROR("Attribute 'dest' must be specified for any route and must be a string.");
+  }
   route.dst = lua_tostring(L, -1);
   lua_pop(L,1);
 
   lua_pushstring(L,"links");
-  lua_gettable(L,-2);
+  type = lua_gettable(L,-2);
+  if (type != LUA_TSTRING) {
+    XBT_ERROR("Attribute 'links' must be specified for any route and must be a string (different links separated by commas or single spaces.");
+  }
   route.link_list = xbt_str_split(lua_tostring(L, -1), ", \t\r\n");
   if (xbt_dynar_is_empty(route.link_list))
     xbt_dynar_push_as(route.link_list,char*,xbt_strdup(lua_tostring(L, -1)));
@@ -397,12 +437,12 @@ int console_add_ASroute(lua_State *L) {
 
   lua_pushstring(L, "gw_src");
   lua_gettable(L, -2);
-  ASroute.gw_src = sg_routing_edge_by_name_or_null(lua_tostring(L, -1));
+  ASroute.gw_src = sg_netcard_by_name_or_null(lua_tostring(L, -1));
   lua_pop(L, 1);
 
   lua_pushstring(L, "gw_dst");
   lua_gettable(L, -2);
-  ASroute.gw_dst = sg_routing_edge_by_name_or_null(lua_tostring(L, -1));
+  ASroute.gw_dst = sg_netcard_by_name_or_null(lua_tostring(L, -1));
   lua_pop(L, 1);
 
   /*if (A_surfxml_ASroute_gw___src && !ASroute.gw_src)*/
@@ -442,6 +482,7 @@ int console_add_ASroute(lua_State *L) {
 int console_AS_open(lua_State *L) {
  const char *id;
  const char *mode;
+ int type;
 
  XBT_DEBUG("Opening AS");
 
@@ -451,7 +492,10 @@ int console_AS_open(lua_State *L) {
  }
 
  lua_pushstring(L, "id");
- lua_gettable(L, -2);
+ type = lua_gettable(L, -2);
+  if (type != LUA_TSTRING) {
+    XBT_ERROR("Attribute 'id' must be specified for any AS and must be a string.");
+  }
  id = lua_tostring(L, -1);
  lua_pop(L, 1);
 
@@ -484,47 +528,6 @@ int console_AS_close(lua_State *L) {
   return 0;
 }
 
-int console_set_function(lua_State *L) {
-
-  const char *host_id ;
-  const char *function_id;
-  xbt_dynar_t args;
-
-  if (! lua_istable(L, 1)) {
-    XBT_ERROR("Bad Arguments to AS.new, Should be a table with named arguments");
-    return -1;
-  }
-
-  // get Host id
-  lua_pushstring(L, "host");
-  lua_gettable(L, -2);
-  host_id = lua_tostring(L, -1);
-  lua_pop(L, 1);
-
-  // get Function Name
-  lua_pushstring(L, "fct");
-  lua_gettable(L, -2);
-  function_id = lua_tostring(L, -1);
-  lua_pop(L, 1);
-
-  //get args
-  lua_pushstring(L,"args");
-  lua_gettable(L, -2);
-  args = xbt_str_split_str( lua_tostring(L,-1) , ",");
-  lua_pop(L, 1);
-
-  msg_host_t host = MSG_host_by_name(host_id);
-  if (!host) {
-    XBT_ERROR("no host '%s' found",host_id);
-    return -1;
-  }
-
-  // FIXME: use sg_platf_new_process directly (warning: find a way to check hostname)
-  MSG_set_function(host_id, function_id, args);
-
-  return 0;
-}
-
 int console_host_set_property(lua_State *L) {
   const char* name ="";
   const char* prop_id = "";
@@ -576,3 +579,33 @@ void sglua_register_platf_functions(lua_State* L)
   lua_pop(L, 1);                   /* -- */
 }
 
+//void sglua_register_routing_constants(lua_State* L)
+//{
+//  lua_getglobal(L, "simgrid");     /* simgrid */
+//  lua_newtable(L);                 /* simgrid simgrid.routing */
+//
+//  lua_pushstring(L, "Cluster");    /* simgrid simgrid.routing Cluster */
+//  lua_setfield(L, -2, "CLUSTER");     /* simgrid simgrid.routing */
+//
+//  lua_pushstring(L, "Dijkstra");    /* simgrid simgrid.routing Dijkstra */
+//  lua_setfield(L, -2, "DIJKSTRA");     /* simgrid simgrid.routing */
+//
+//  lua_pushstring(L, "DijkstraCache");    /* simgrid simgrid.routing DijkstraCache */
+//  lua_setfield(L, -2, "DIJKSTRA_CACHE");     /* simgrid simgrid.routing */
+//
+//  lua_pushstring(L, "Floyd");    /* simgrid simgrid.routing Floyd */
+//  lua_setfield(L, -2, "FLOYD");     /* simgrid simgrid.routing */
+//
+//  lua_pushstring(L, "Full");       /* simgrid simgrid.routing Full */
+//  lua_setfield(L, -2, "FULL");     /* simgrid simgrid.routing */
+//
+//  lua_pushstring(L, "None");    /* simgrid simgrid.routing None */
+//  lua_setfield(L, -2, "NONE");     /* simgrid simgrid.routing */
+//
+//  lua_pushstring(L, "Vivaldi");    /* simgrid simgrid.routing Vivaldi */
+//  lua_setfield(L, -2, "FULL");     /* simgrid simgrid.routing */
+//
+//  lua_setfield(L, -2, "routing");  /* simgrid */
+//
+//  lua_pop(L, 1);                   /* -- */
+//}