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
[DOC] Fixed even more errors.
[simgrid.git]
/
src
/
surf
/
surfxml_parseplatf.c
diff --git
a/src/surf/surfxml_parseplatf.c
b/src/surf/surfxml_parseplatf.c
index
3a0f327
..
9d5964e
100644
(file)
--- a/
src/surf/surfxml_parseplatf.c
+++ b/
src/surf/surfxml_parseplatf.c
@@
-14,7
+14,6
@@
#ifdef HAVE_LUA
#include "src/bindings/lua/simgrid_lua.h"
#ifdef HAVE_LUA
#include "src/bindings/lua/simgrid_lua.h"
-#include "src/bindings/lua/lua_state_cloner.h"
#include <lua.h> /* Always include this when calling Lua */
#include <lauxlib.h> /* Always include this when calling Lua */
#include <lua.h> /* Always include this when calling Lua */
#include <lauxlib.h> /* Always include this when calling Lua */
@@
-68,13
+67,6
@@
xbt_dict_t trace_connect_list_link_avail = NULL;
xbt_dict_t trace_connect_list_bandwidth = NULL;
xbt_dict_t trace_connect_list_latency = NULL;
xbt_dict_t trace_connect_list_bandwidth = NULL;
xbt_dict_t trace_connect_list_latency = NULL;
-/* ********************************************* */
-/* TUTORIAL: New TAG */
-/* This function should be in gpu.c */
-/* because sg_platf_gpu_add_cb take a staic fct */
-XBT_PUBLIC(void) gpu_register_callbacks(void){
- sg_platf_gpu_add_cb(NULL);
-}
/* ***************************************** */
static int after_config_done;
/* ***************************************** */
static int after_config_done;
@@
-85,11
+77,7
@@
void parse_after_config() {
/* Register classical callbacks */
storage_register_callbacks();
routing_register_callbacks();
/* Register classical callbacks */
storage_register_callbacks();
routing_register_callbacks();
- gpu_register_callbacks();
- /* ***************************************** */
- /* TUTORIAL: New TAG */
- /* ***************************************** */
after_config_done = 1;
}
}
after_config_done = 1;
}
}
@@
-110,22
+98,16
@@
void parse_platform_file(const char *file)
* written in lua). If not, we will use the (old?) XML parser
*/
if (is_lua) {
* written in lua). If not, we will use the (old?) XML parser
*/
if (is_lua) {
- // Get maestro state. In case we're calling Lua from
- // C only, this will be NULL -- no Lua code has been
- // executed yet and hence, the SimGrid module has not
- // yet been loaded.
// NOTE: After executing the lua_pcall() below,
// sglua_get_maestro() will not be NULL, since the
// SimGrid module was loaded!
// NOTE: After executing the lua_pcall() below,
// sglua_get_maestro() will not be NULL, since the
// SimGrid module was loaded!
- lua_State* L = sglua_get_maestro();
+ // C. Heinrich 01/2016: Not sure if this is still required after I
+ // ripped out most of that bloody Lua simulation stuff. We may
+ // want to check and maybe we can clean that up.
+ lua_State* L;
- // We may want to remove the task_copy_callback from
- // the SimGrid module if we're using C code only (this
- // callback is used for Lua-only code).
- int remove_callback = FALSE;
if (L == NULL) {
L = luaL_newstate();
if (L == NULL) {
L = luaL_newstate();
- remove_callback = TRUE;
}
luaL_openlibs(L);
}
luaL_openlibs(L);
@@
-136,14
+118,6
@@
void parse_platform_file(const char *file)
XBT_ERROR("FATAL ERROR:\n %s: %s\n\n", "Lua call failed. Errormessage:", lua_tostring(L, -1));
xbt_die("Lua call failed. See Log");
}
XBT_ERROR("FATAL ERROR:\n %s: %s\n\n", "Lua call failed. Errormessage:", lua_tostring(L, -1));
xbt_die("Lua call failed. See Log");
}
- // Without this, task_copy_callback() will try to copy
- // some tasks -- but these don't exist in case we're using
- // C. Hence, we need to remove the callback -- we don't
- // want to segfault.
- if (remove_callback) {
- MSG_task_set_copy_callback(NULL);
- }
-
}
else
#endif
}
else
#endif