*/
#include "common/c_internal.h"
+#include "util/numeric.h"
#include "debug.h"
#include "log.h"
#include "porting.h"
#include "settings.h"
+#include <algorithm> // std::find
std::string script_get_backtrace(lua_State *L)
{
lua_rawgeti(L, LUA_REGISTRYINDEX, CUSTOM_RIDX_BACKTRACE);
lua_call(L, 0, 1);
- return luaL_checkstring(L, -1);
+ std::string result = luaL_checkstring(L, -1);
+ lua_pop(L, 1);
+ return result;
}
int script_exception_wrapper(lua_State *L, lua_CFunction f)
/*
* Note that we can't get tracebacks for LUA_ERRMEM or LUA_ERRERR (without
* hacking Lua internals). For LUA_ERRMEM, this is because memory errors will
- * not execute the the error handler, and by the time lua_pcall returns the
+ * not execute the error handler, and by the time lua_pcall returns the
* execution stack will have already been unwound. For LUA_ERRERR, there was
* another error while trying to generate a backtrace from a LUA_ERRRUN. It is
* presumed there is an error with the internal Lua state and thus not possible
throw LuaError(err_msg);
}
-// Push the list of callbacks (a lua table).
-// Then push nargs arguments.
-// Then call this function, which
-// - runs the callbacks
-// - replaces the table and arguments with the return value,
-// computed depending on mode
-void script_run_callbacks_f(lua_State *L, int nargs,
- RunCallbacksMode mode, const char *fxn)
+static void script_log_add_source(lua_State *L, std::string &message, int stack_depth)
{
- FATAL_ERROR_IF(lua_gettop(L) < nargs + 1, "Not enough arguments");
-
- // Insert error handler
- PUSH_ERROR_HANDLER(L);
- int error_handler = lua_gettop(L) - nargs - 1;
- lua_insert(L, error_handler);
-
- // Insert run_callbacks between error handler and table
- lua_getglobal(L, "core");
- lua_getfield(L, -1, "run_callbacks");
- lua_remove(L, -2);
- lua_insert(L, error_handler + 1);
+ lua_Debug ar;
+
+ if (lua_getstack(L, stack_depth, &ar)) {
+ FATAL_ERROR_IF(!lua_getinfo(L, "Sl", &ar), "lua_getinfo() failed");
+ message.append(" (at " + std::string(ar.short_src) + ":"
+ + std::to_string(ar.currentline) + ")");
+ } else {
+ message.append(" (at ?:?)");
+ }
+}
- // Insert mode after table
- lua_pushnumber(L, (int) mode);
- lua_insert(L, error_handler + 3);
+bool script_log_unique(lua_State *L, std::string message, std::ostream &log_to,
+ int stack_depth)
+{
+ thread_local std::vector<u64> logged_messages;
- // Stack now looks like this:
- // ... <error handler> <run_callbacks> <table> <mode> <arg#1> <arg#2> ... <arg#n>
+ script_log_add_source(L, message, stack_depth);
+ u64 hash = murmur_hash_64_ua(message.data(), message.length(), 0xBADBABE);
- int result = lua_pcall(L, nargs + 2, 1, error_handler);
- if (result != 0)
- script_error(L, result, NULL, fxn);
+ if (std::find(logged_messages.begin(), logged_messages.end(), hash)
+ == logged_messages.end()) {
- lua_remove(L, error_handler);
+ logged_messages.emplace_back(hash);
+ log_to << message << std::endl;
+ return true;
+ }
+ return false;
}
-void log_deprecated(lua_State *L, const std::string &message)
+DeprecatedHandlingMode get_deprecated_handling_mode()
{
- static bool configured = false;
- static bool do_log = false;
- static bool do_error = false;
+ static thread_local bool configured = false;
+ static thread_local DeprecatedHandlingMode ret = DeprecatedHandlingMode::Ignore;
// Only read settings on first call
if (!configured) {
std::string value = g_settings->get("deprecated_lua_api_handling");
if (value == "log") {
- do_log = true;
+ ret = DeprecatedHandlingMode::Log;
} else if (value == "error") {
- do_log = true;
- do_error = true;
+ ret = DeprecatedHandlingMode::Error;
}
+ configured = true;
}
- if (do_log) {
- warningstream << message;
- if (L) { // L can be NULL if we get called from scripting_game.cpp
- lua_Debug ar;
+ return ret;
+}
- if (!lua_getstack(L, 2, &ar))
- FATAL_ERROR_IF(!lua_getstack(L, 1, &ar), "lua_getstack() failed");
- FATAL_ERROR_IF(!lua_getinfo(L, "Sl", &ar), "lua_getinfo() failed");
- warningstream << " (at " << ar.short_src << ":" << ar.currentline << ")";
- }
- warningstream << std::endl;
+void log_deprecated(lua_State *L, std::string message, int stack_depth)
+{
+ DeprecatedHandlingMode mode = get_deprecated_handling_mode();
+ if (mode == DeprecatedHandlingMode::Ignore)
+ return;
- if (L) {
- if (do_error)
- script_error(L, LUA_ERRRUN, NULL, NULL);
- else
- infostream << script_get_backtrace(L) << std::endl;
- }
- }
+ script_log_add_source(L, message, stack_depth);
+ warningstream << message << std::endl;
+
+ if (mode == DeprecatedHandlingMode::Error)
+ script_error(L, LUA_ERRRUN, NULL, NULL);
+ else
+ infostream << script_get_backtrace(L) << std::endl;
}
projects / dragonfireclient.git / blobdiff