summaryrefslogtreecommitdiff
path: root/indra/llcommon/lua_function.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2024-08-21 09:29:26 -0400
committerNat Goodspeed <nat@lindenlab.com>2024-08-21 09:29:26 -0400
commitf2abd050bce3c4132f12d962fc6436d1f06666bd (patch)
tree371a14729aa2d2ffa2c62fc55fd5d203752eb0d9 /indra/llcommon/lua_function.cpp
parentf4b650b100c120ed99208545864b0a7f36ce058d (diff)
Improve diagnostic output for Lua atexit() functions.
Diffstat (limited to 'indra/llcommon/lua_function.cpp')
-rw-r--r--indra/llcommon/lua_function.cpp19
1 files changed, 12 insertions, 7 deletions
diff --git a/indra/llcommon/lua_function.cpp b/indra/llcommon/lua_function.cpp
index 1e9bbdd651..452bc24b16 100644
--- a/indra/llcommon/lua_function.cpp
+++ b/indra/llcommon/lua_function.cpp
@@ -496,6 +496,14 @@ LuaState::~LuaState()
// stack contains Registry.atexit
if (lua_istable(mState, -1))
{
+ // We happen to know that Registry.atexit is built by appending array
+ // entries using table.insert(). That's important because it means
+ // there are no holes, and therefore lua_objlen() should be correct.
+ // That's important because we walk the atexit table backwards, to
+ // destroy last the things we created (passed to LL.atexit()) first.
+ int len(lua_objlen(mState, -1));
+ LL_DEBUGS("Lua") << "Registry.atexit is a table with " << len << " entries" << LL_ENDL;
+
// Push debug.traceback() onto the stack as lua_pcall()'s error
// handler function. On error, lua_pcall() calls the specified error
// handler function with the original error message; the message
@@ -509,12 +517,7 @@ LuaState::~LuaState()
lua_remove(mState, -2);
// stack now contains atexit, debug.traceback()
- // We happen to know that Registry.atexit is built by appending array
- // entries using table.insert(). That's important because it means
- // there are no holes, and therefore lua_objlen() should be correct.
- // That's important because we walk the atexit table backwards, to
- // destroy last the things we created (passed to LL.atexit()) first.
- for (int i(lua_objlen(mState, -2)); i >= 1; --i)
+ for (int i(len); i >= 1; --i)
{
lua_pushinteger(mState, i);
// stack contains Registry.atexit, debug.traceback(), i
@@ -524,13 +527,15 @@ LuaState::~LuaState()
// Use lua_pcall() because errors in any one atexit() function
// shouldn't cancel the rest of them. Pass debug.traceback() as
// the error handler function.
+ LL_DEBUGS("Lua") << "Calling atexit(" << i << ")" << LL_ENDL;
if (lua_pcall(mState, 0, 0, -2) != LUA_OK)
{
auto error{ lua_tostdstring(mState, -1) };
- LL_WARNS("Lua") << "atexit() function error: " << error << LL_ENDL;
+ LL_WARNS("Lua") << "atexit(" << i << ") error: " << error << LL_ENDL;
// pop error message
lua_pop(mState, 1);
}
+ LL_DEBUGS("Lua") << "atexit(" << i << ") done" << LL_ENDL;
// lua_pcall() has already popped atexit[i]:
// stack contains atexit, debug.traceback()
}