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
Actually, upvalues were implemented a while ago.
[simgrid.git]
/
src
/
bindings
/
lua
/
simgrid_lua.c
diff --git
a/src/bindings/lua/simgrid_lua.c
b/src/bindings/lua/simgrid_lua.c
index
b4b3763
..
11e4bad
100644
(file)
--- a/
src/bindings/lua/simgrid_lua.c
+++ b/
src/bindings/lua/simgrid_lua.c
@@
-185,7
+185,9
@@
static int get_clock(lua_State* L) {
*/
static int simgrid_gc(lua_State * L)
{
*/
static int simgrid_gc(lua_State * L)
{
- MSG_clean();
+ if (sglua_is_maestro(L)) {
+ MSG_clean();
+ }
return 0;
}
return 0;
}
@@
-194,7
+196,7
@@
static int simgrid_gc(lua_State * L)
*/
static int msg_register_platform(lua_State * L)
{
*/
static int msg_register_platform(lua_State * L)
{
- /* Tell Simgrid we dont wanna use its parser */
+ /* Tell Simgrid we don
'
t wanna use its parser */
//surf_parse = console_parse_platform;
surf_parse_reset_callbacks();
MSG_create_environment(NULL);
//surf_parse = console_parse_platform;
surf_parse_reset_callbacks();
MSG_create_environment(NULL);
@@
-204,7
+206,6
@@
static int msg_register_platform(lua_State * L)
/*
* Register platform for Simdag
*/
/*
* Register platform for Simdag
*/
-
static int sd_register_platform(lua_State * L)
{
//surf_parse = console_parse_platform_wsL07;
static int sd_register_platform(lua_State * L)
{
//surf_parse = console_parse_platform_wsL07;
@@
-318,6
+319,7
@@
int luaopen_simgrid(lua_State *L)
/* Initialize the MSG core */
MSG_global_init(&argc, argv);
/* Initialize the MSG core */
MSG_global_init(&argc, argv);
+ MSG_process_set_data_cleanup((void_f_pvoid_t) lua_close);
XBT_DEBUG("Still %d arguments on command line", argc); // FIXME: update the lua's arg table to reflect the changes from SimGrid
}
XBT_DEBUG("Still %d arguments on command line", argc); // FIXME: update the lua's arg table to reflect the changes from SimGrid
}