Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-09 01:03:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Display Lua memory usage at the time of Out-of-Memory error

Browse Source 
Also misc. minor cleanups
This commit is contained in:
kwolekr 2015-08-10 01:38:09 -04:00
parent a953ff4dfc
commit 18cfd89a86
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/script/common/c_internal.cpp
View File

@ -113,6 +113,11 @@ void script_error(lua_State *L, int pcall_result, const char *fxn)
}
err_msg += err_descr;
if (pcall_result == LUA_ERRMEM) {
err_msg += "\nCurrent Lua memory usage: "
+ itos(lua_gc(L, LUA_GCCOUNT, 0) >> 10) + " MB";
}
throw LuaError(err_msg);
}
@ -145,7 +150,9 @@ void script_run_callbacks_f(lua_State *L, int nargs,
// Stack now looks like this:
// ... <error handler> <run_callbacks> <table> <mode> <arg#1> <arg#2> ... <arg#n>
script_error(L, lua_pcall(L, nargs + 2, 1, errorhandler), fxn);
int result = lua_pcall(L, nargs + 2, 1, errorhandler);
if (result != 0)
script_error(L, result, fxn);
lua_remove(L, -2); // Remove error handler
}
@ -161,8 +168,7 @@ void log_deprecated(lua_State *L, const std::string &message)
std::string value = g_settings->get("deprecated_lua_api_handling");
if (value == "log") {
dolog = true;
}
if (value == "error") {
} else if (value == "error") {
dolog = true;
doerror = true;
}

2
src/script/cpp_api/s_async.cpp
View File

@ -255,7 +255,7 @@ void* AsyncWorkerThread::Thread()
std::string script = getServer()->getBuiltinLuaPath() + DIR_DELIM + "init.lua";
if (!loadScript(script)) {
errorstream
<< "AsyncWorkderThread execution of async base environment failed!"
<< "AsyncWorkerThread execution of async base environment failed!"
<< std::endl;
abort();
}