Lua: merge simgrid.task.recv and simgrid.task.recv_with_timeout

[simgrid.git] / src / bindings / lua / simgrid_lua.h

diff --git a/src/bindings/lua/simgrid_lua.h b/src/bindings/lua/simgrid_lua.h
index 527e4b8..06a9aef 100644 (file)
--- a/src/bindings/lua/simgrid_lua.h
+++ b/src/bindings/lua/simgrid_lua.h
@@ -17,9 +17,7 @@
 #include "xbt/function_types.h"
 #include "xbt/log.h"
 #include "surf/surfxml_parse.h"
-#include "surf/surf_private.h"
 #include "surf/surf.h"
-#include "portable.h"           /* Needed for the time of the SIMIX convertion */
 #include <stdarg.h>
 
 extern xbt_dict_t process_function_set;
@@ -43,71 +41,17 @@ void generate_makefile_local(const char *project);
 /* ********************************************************************************* */
 /*                           Console functions                                       */
 /* ********************************************************************************* */
-
-typedef struct t_AS_attr {
-  const char *id;
-  const char *mode;
-  xbt_dynar_t host_list_d;
-  xbt_dynar_t link_list_d;
-  xbt_dynar_t route_list_d;
-  xbt_dynar_t router_list_d;
-  xbt_dynar_t sub_as_list_id;
-} AS_attr, *p_AS_attr;
-
-typedef struct t_host_attr {
-  //platform attribute
-  // Mandatory attributes
-  const char *id;
-  double power_peak;
-  // Optional attributes
-  double power_scale;
-  const char *power_trace;
-  int state_initial;
-  const char *state_trace;
-  int core;
-  //deployment attribute
-  const char *function;
-  xbt_dynar_t args_list;
-  xbt_dict_t properties;
-} host_attr, *p_host_attr;
-
-
-typedef struct t_link_attr {
-  //mandatory attributes
-  const char *id;
-  double bandwidth;
-  double latency;
-  // Optional attributes
-  const char *bandwidth_trace;
-  const char *latency_trace;
-  const char *state_trace;
-  int state_initial;
-  int policy;
-} link_attr, *p_link_attr;
-
-
-typedef struct t_route_attr {
-  const char *src_id;
-  const char *dest_id;
-  xbt_dynar_t links_id;
-
-} route_attr, *p_route_attr;
-
-typedef struct t_router_attr {
-       const char *id;
-} router_attr, *p_router_attr;
-
 // Public Functions
+int console_open(lua_State *L);
+int console_close(lua_State *L);
 
 int console_add_host(lua_State*);
 int console_add_link(lua_State*);
+int console_add_router(lua_State* L);
 int console_add_route(lua_State*);
-int console_add_AS(lua_State*);
+int console_AS_open(lua_State*);
+int console_AS_close(lua_State *L);
 int console_set_function(lua_State*);
 int console_host_set_property(lua_State*);
 
-int console_parse_platform(void);
-int console_parse_application(void);
-int console_parse_platform_wsL07(void);
-
 #endif  /* SIMGRID_LUA_H */