test/lsp: disable tracking in LSP tests (here be dragons)

This commit is contained in:
Björn Linse
2021-04-03 10:04:14 +02:00
parent 7e799502e5
commit 2df527e1ff
2 changed files with 36 additions and 12 deletions

View File

@@ -34,9 +34,7 @@
#include "nvim/event/time.h"
#include "nvim/event/loop.h"
#ifdef WIN32
#include "nvim/os/os.h"
#endif
#include "nvim/lua/converter.h"
#include "nvim/lua/executor.h"
@@ -66,7 +64,7 @@ typedef struct {
}
#if __has_feature(address_sanitizer)
PMap(handle_T) *nlua_ref_markers;
PMap(handle_T) *nlua_ref_markers = NULL;
# define NLUA_TRACK_REFS
#endif
@@ -555,7 +553,10 @@ static lua_State *nlua_init(void)
FUNC_ATTR_NONNULL_RET FUNC_ATTR_WARN_UNUSED_RESULT
{
#ifdef NLUA_TRACK_REFS
nlua_ref_markers = pmap_new(handle_T)();
const char *env = os_getenv("NVIM_LUA_NOTRACK");
if (!env || !*env) {
nlua_ref_markers = pmap_new(handle_T)();
}
#endif
lua_State *lstate = luaL_newstate();
@@ -604,7 +605,11 @@ void nlua_free_all_mem(void)
fprintf(stderr, "%d lua references were leaked!", nlua_refcount);
}
pmap_free(handle_T)(nlua_ref_markers);
if (nlua_ref_markers) {
// in case there are leaked luarefs, leak the associated memory
// to get LeakSanitizer stacktraces on exit
pmap_free(handle_T)(nlua_ref_markers);
}
#endif
nlua_refcount = 0;
@@ -897,10 +902,12 @@ LuaRef nlua_ref(lua_State *lstate, int index)
lua_pushvalue(lstate, index);
LuaRef ref = luaL_ref(lstate, LUA_REGISTRYINDEX);
if (ref > 0) {
// TODO: store traceback when LeakSanitizer is enabled
nlua_refcount++;
#ifdef NLUA_TRACK_REFS
if (nlua_ref_markers) {
// dummy allocation to make LeakSanitizer track our luarefs
pmap_put(handle_T)(nlua_ref_markers, ref, xmalloc(3));
}
#endif
}
return ref;
@@ -912,8 +919,10 @@ void nlua_unref(lua_State *lstate, LuaRef ref)
if (ref > 0) {
nlua_refcount--;
#ifdef NLUA_TRACK_REFS
// NB: don't remove entry from map to track double-unreff
xfree(pmap_get(handle_T)(nlua_ref_markers, ref));
// NB: don't remove entry from map to track double-unref
if (nlua_ref_markers) {
xfree(pmap_get(handle_T)(nlua_ref_markers, ref));
}
#endif
luaL_unref(lstate, LUA_REGISTRYINDEX, ref);
}

View File

@@ -29,6 +29,16 @@ teardown(function()
os.remove(fake_lsp_logfile)
end)
local function clear_notrace()
-- problem: here be dragons
-- solution: don't look for dragons to closely
clear {env={
NVIM_LUA_NOTRACK="1";
VIMRUNTIME=os.getenv"VIMRUNTIME";
}}
end
local function fake_lsp_server_setup(test_name, timeout_ms, options)
exec_lua([=[
lsp = require('vim.lsp')
@@ -36,6 +46,7 @@ local function fake_lsp_server_setup(test_name, timeout_ms, options)
TEST_RPC_CLIENT_ID = lsp.start_client {
cmd_env = {
NVIM_LOG_FILE = logfile;
NVIM_LUA_NOTRACK = "1";
};
cmd = {
vim.v.progpath, '-Es', '-u', 'NONE', '--headless',
@@ -65,7 +76,7 @@ end
local function test_rpc_server(config)
if config.test_name then
clear()
clear_notrace()
fake_lsp_server_setup(config.test_name, config.timeout_ms or 1e3, config.options)
end
local client = setmetatable({}, {
@@ -120,7 +131,7 @@ end
describe('LSP', function()
describe('server_name specified', function()
before_each(function()
clear()
clear_notrace()
-- Run an instance of nvim on the file which contains our "scripts".
-- Pass TEST_NAME to pick the script.
local test_name = "basic_init"
@@ -250,6 +261,10 @@ describe('LSP', function()
end)
it('should succeed with manual shutdown', function()
if 'openbsd' == helpers.uname() then
pending('hangs the build on openbsd #14028, re-enable with freeze timeout #14204')
return
end
local expected_callbacks = {
{NIL, "shutdown", {}, 1, NIL};
{NIL, "test", {}, 1};
@@ -314,7 +329,7 @@ describe('LSP', function()
}
end)
it('workspace/configuration returns NIL per section if client was started without config.settings', function()
clear()
clear_notrace()
fake_lsp_server_setup('workspace/configuration no settings')
eq({ NIL, NIL, }, exec_lua [[
local params = {
@@ -941,7 +956,7 @@ end)
describe('LSP', function()
before_each(function()
clear()
clear_notrace()
end)
local function make_edit(y_0, x_0, y_1, x_1, text)