mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-28 22:18:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15534 from bfredl/monomap

Browse Source 
refactor(map): avoid duplicated khash_t implementations for values and support sets
This commit is contained in:
bfredl
2023-05-17 13:00:32 +02:00
committed by GitHub
parent 189fb62032 e2fdd53d8c
commit 67176c3f20
32 changed files with 408 additions and 462 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/lua/executor.c
View File

@@ -910,7 +910,7 @@ static void nlua_common_free_all_mem(lua_State *lstate)
if (nlua_track_refs) {
// in case there are leaked luarefs, leak the associated memory
// to get LeakSanitizer stacktraces on exit
pmap_destroy(handle_T)(&ref_state->ref_markers);
map_destroy(int, &ref_state->ref_markers);
}
#endif
@@ -1285,7 +1285,7 @@ LuaRef nlua_ref(lua_State *lstate, nlua_ref_state_t *ref_state, int index)
#ifdef NLUA_TRACK_REFS
if (nlua_track_refs) {
// dummy allocation to make LeakSanitizer track our luarefs
pmap_put(handle_T)(&ref_state->ref_markers, ref, xmalloc(3));
pmap_put(int)(&ref_state->ref_markers, ref, xmalloc(3));
}
#endif
}
@@ -1305,7 +1305,7 @@ void nlua_unref(lua_State *lstate, nlua_ref_state_t *ref_state, LuaRef ref)
#ifdef NLUA_TRACK_REFS
// NB: don't remove entry from map to track double-unref
if (nlua_track_refs) {
xfree(pmap_get(handle_T)(&ref_state->ref_markers, ref));
xfree(pmap_get(int)(&ref_state->ref_markers, ref));
}
#endif
luaL_unref(lstate, LUA_REGISTRYINDEX, ref);

2
src/nvim/lua/executor.h
View File

@@ -24,7 +24,7 @@ typedef struct {
LuaRef empty_dict_ref;
int ref_count;
#if __has_feature(address_sanitizer)
PMap(handle_T) ref_markers;
PMap(int) ref_markers;
#endif
} nlua_ref_state_t;

6
src/nvim/lua/treesitter.c
View File

@@ -241,9 +241,9 @@ int tslua_remove_lang(lua_State *L)
const char *lang_name = luaL_checkstring(L, 1);
bool present = pmap_has(cstr_t)(&langs, lang_name);
if (present) {
char *key = (char *)pmap_key(cstr_t)(&langs, lang_name);
pmap_del(cstr_t)(&langs, lang_name);
xfree(key);
cstr_t key;
pmap_del(cstr_t)(&langs, lang_name, &key);
xfree((void *)key);
}
lua_pushboolean(L, present);
return 1;