X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/767d7bdbc801f6ec69833f72c66ae1975dc8c754..7f3f8f529e768dc634482aa2fd40cad33ba8b496:/src/bindings/lua/lua_platf.c

diff --git a/src/bindings/lua/lua_platf.c b/src/bindings/lua/lua_platf.c
index 221e59708f..4f7507b33c 100644
--- a/src/bindings/lua/lua_platf.c
+++ b/src/bindings/lua/lua_platf.c
@@ -14,8 +14,7 @@
 #include <ctype.h>
 #include <lauxlib.h>
 
-#include "src/msg/msg_private.h"
-#include "src/simix/smx_host_private.h"
+#include <simgrid/host.h>
 #include "src/surf/surf_private.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(lua_platf, bindings, "Lua bindings (platform module)");
@@ -183,7 +182,7 @@ int console_add_host(lua_State *L) {
     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)));
+  xbt_dynar_push_as(host.speed_peak, double, parse_cpu_speed(lua_tostring(L, -1)));
   lua_pop(L, 1);
 
   // get core
@@ -528,47 +527,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 = "";
@@ -596,12 +554,12 @@ int console_host_set_property(lua_State *L) {
   prop_value = lua_tostring(L,-1);
   lua_pop(L, 1);
 
-  msg_host_t host = MSG_host_by_name(name);
+  sg_host_t host = sg_host_by_name(name);
   if (!host) {
     XBT_ERROR("no host '%s' found",name);
     return -1;
   }
-  xbt_dict_t props = MSG_host_get_properties(host);
+  xbt_dict_t props = sg_host_get_properties(host);
   xbt_dict_set(props,prop_id,xbt_strdup(prop_value),NULL);
 
   return 0;
@@ -620,3 +578,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);                   /* -- */
+//}