A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid
[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
24af2b3
..
9177495
100644
(file)
--- a/
src/bindings/lua/simgrid_lua.h
+++ b/
src/bindings/lua/simgrid_lua.h
@@
-23,9
+23,9
@@
#include <stdarg.h>
#include <stdarg.h>
-xbt_dict_t process_function_set;
-xbt_dynar_t process_list;
-xbt_dict_t machine_set;
+
extern
xbt_dict_t process_function_set;
+
extern
xbt_dynar_t process_list;
+
extern
xbt_dict_t machine_set;
typedef struct s_process_t {
int argc;
typedef struct s_process_t {
int argc;
@@
-33,8
+33,6
@@
typedef struct s_process_t {
char *host;
} s_process_t;
char *host;
} s_process_t;
-char *warning;
-
void s_process_free(void *process);
/* UNIX files */
void s_process_free(void *process);
/* UNIX files */
@@
-53,6
+51,8
@@
typedef struct t_AS_attr {
xbt_dynar_t host_list_d;
xbt_dynar_t link_list_d;
xbt_dynar_t route_list_d;
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 {
} AS_attr, *p_AS_attr;
typedef struct t_host_attr {
@@
-69,6
+69,7
@@
typedef struct t_host_attr {
//deployment attribute
const char *function;
xbt_dynar_t args_list;
//deployment attribute
const char *function;
xbt_dynar_t args_list;
+ xbt_dict_t properties;
} host_attr, *p_host_attr;
} host_attr, *p_host_attr;
@@
-93,6
+94,10
@@
typedef struct t_route_attr {
} route_attr, *p_route_attr;
} route_attr, *p_route_attr;
+typedef struct t_router_attr {
+ const char *id;
+} router_attr, *p_router_attr;
+
// Public Functions
int console_add_host(lua_State*);
// Public Functions
int console_add_host(lua_State*);
@@
-100,6
+105,7
@@
int console_add_link(lua_State*);
int console_add_route(lua_State*);
int console_add_AS(lua_State*);
int console_set_function(lua_State*);
int console_add_route(lua_State*);
int console_add_AS(lua_State*);
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(void);
int console_parse_application(void);