IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

refactor(lua): use references directly on main thread

Browse Source
This commit is contained in:
Björn Linse 2021-12-25 14:38:26 +01:00 committed by bfredl
parent b87867e69e
commit acf38245d8
3 changed files with 53 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/nvim/lua/converter.c
View File

@ -156,7 +156,7 @@ static LuaTableProps nlua_traverse_table(lua_State *const lstate)
&& ret.string_keys_num == 0)) { && ret.string_keys_num == 0)) {
ret.type = kObjectTypeArray; ret.type = kObjectTypeArray;
if (tsize == 0 && lua_getmetatable(lstate, -1)) { if (tsize == 0 && lua_getmetatable(lstate, -1)) {
nlua_pushref(lstate, nlua_get_empty_dict_ref(lstate)); nlua_pushref(lstate, nlua_global_refs->empty_dict_ref);
if (lua_rawequal(lstate, -2, -1)) { if (lua_rawequal(lstate, -2, -1)) {
ret.type = kObjectTypeDictionary; ret.type = kObjectTypeDictionary;
} }
@ -316,7 +316,7 @@ bool nlua_pop_typval(lua_State *lstate, typval_T *ret_tv)
LuaRef table_ref = LUA_NOREF; LuaRef table_ref = LUA_NOREF;
if (lua_getmetatable(lstate, -1)) { if (lua_getmetatable(lstate, -1)) {
lua_pop(lstate, 1); lua_pop(lstate, 1);
table_ref = nlua_ref(lstate, -1); table_ref = nlua_ref_global(lstate, -1);
} }
const LuaTableProps table_props = nlua_traverse_table(lstate); const LuaTableProps table_props = nlua_traverse_table(lstate);
@ -389,7 +389,7 @@ nlua_pop_typval_table_processing_end:
} }
case LUA_TFUNCTION: { case LUA_TFUNCTION: {
LuaCFunctionState *state = xmalloc(sizeof(LuaCFunctionState)); LuaCFunctionState *state = xmalloc(sizeof(LuaCFunctionState));
state->lua_callable.func_ref = nlua_ref(lstate, -1); state->lua_callable.func_ref = nlua_ref_global(lstate, -1);
char_u *name = register_cfunc(&nlua_CFunction_func_call, char_u *name = register_cfunc(&nlua_CFunction_func_call,
&nlua_CFunction_func_free, &nlua_CFunction_func_free,
@ -401,7 +401,7 @@ nlua_pop_typval_table_processing_end:
} }
case LUA_TUSERDATA: { case LUA_TUSERDATA: {
// TODO(bfredl): check mt.__call and convert to function? // TODO(bfredl): check mt.__call and convert to function?
nlua_pushref(lstate, nlua_get_nil_ref(lstate)); nlua_pushref(lstate, nlua_global_refs->nil_ref);
bool is_nil = lua_rawequal(lstate, -2, -1); bool is_nil = lua_rawequal(lstate, -2, -1);
lua_pop(lstate, 1); lua_pop(lstate, 1);
if (is_nil) { if (is_nil) {
@ -445,7 +445,7 @@ static bool typval_conv_special = false;
if (typval_conv_special) { \ if (typval_conv_special) { \
lua_pushnil(lstate); \ lua_pushnil(lstate); \
} else { \ } else { \
nlua_pushref(lstate, nlua_get_nil_ref(lstate)); \ nlua_pushref(lstate, nlua_global_refs->nil_ref); \
} \ } \
} while (0) } while (0)
@ -495,7 +495,7 @@ static bool typval_conv_special = false;
nlua_create_typed_table(lstate, 0, 0, kObjectTypeDictionary); \ nlua_create_typed_table(lstate, 0, 0, kObjectTypeDictionary); \
} else { \ } else { \
lua_createtable(lstate, 0, 0); \ lua_createtable(lstate, 0, 0); \
nlua_pushref(lstate, nlua_get_empty_dict_ref(lstate)); \ nlua_pushref(lstate, nlua_global_refs->empty_dict_ref); \
lua_setmetatable(lstate, -2); \ lua_setmetatable(lstate, -2); \
} \ } \
} while (0) } while (0)
@ -734,7 +734,7 @@ void nlua_push_Dictionary(lua_State *lstate, const Dictionary dict, bool special
} else { } else {
lua_createtable(lstate, 0, (int)dict.size); lua_createtable(lstate, 0, (int)dict.size);
if (dict.size == 0 && !special) { if (dict.size == 0 && !special) {
nlua_pushref(lstate, nlua_get_empty_dict_ref(lstate)); nlua_pushref(lstate, nlua_global_refs->empty_dict_ref);
lua_setmetatable(lstate, -2); lua_setmetatable(lstate, -2);
} }
} }
@ -782,7 +782,7 @@ void nlua_push_Object(lua_State *lstate, const Object obj, bool special)
if (special) { if (special) {
lua_pushnil(lstate); lua_pushnil(lstate);
} else { } else {
nlua_pushref(lstate, nlua_get_nil_ref(lstate)); nlua_pushref(lstate, nlua_global_refs->nil_ref);
} }
break; break;
case kObjectTypeLuaRef: { case kObjectTypeLuaRef: {
@ -1199,14 +1199,14 @@ Object nlua_pop_Object(lua_State *const lstate, bool ref, Error *const err)
case LUA_TFUNCTION: case LUA_TFUNCTION:
if (ref) { if (ref) {
*cur.obj = LUAREF_OBJ(nlua_ref(lstate, -1)); *cur.obj = LUAREF_OBJ(nlua_ref_global(lstate, -1));
} else { } else {
goto type_error; goto type_error;
} }
break; break;
case LUA_TUSERDATA: { case LUA_TUSERDATA: {
nlua_pushref(lstate, nlua_get_nil_ref(lstate)); nlua_pushref(lstate, nlua_global_refs->nil_ref);
bool is_nil = lua_rawequal(lstate, -2, -1); bool is_nil = lua_rawequal(lstate, -2, -1);
lua_pop(lstate, 1); lua_pop(lstate, 1);
if (is_nil) { if (is_nil) {
@ -1240,7 +1240,7 @@ type_error:
LuaRef nlua_pop_LuaRef(lua_State *const lstate, Error *err) LuaRef nlua_pop_LuaRef(lua_State *const lstate, Error *err)
{ {
LuaRef rv = nlua_ref(lstate, -1); LuaRef rv = nlua_ref_global(lstate, -1);
lua_pop(lstate, 1); lua_pop(lstate, 1);
return rv; return rv;
} }

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

@ -52,15 +52,6 @@ typedef struct {
String lua_err_str; String lua_err_str;
} LuaError; } LuaError;
typedef struct {
LuaRef nil_ref;
LuaRef empty_dict_ref;
int ref_count;
#if __has_feature(address_sanitizer)
PMap(handle_T) ref_markers;
#endif
} nlua_ref_state_t;
#ifdef INCLUDE_GENERATED_DECLARATIONS #ifdef INCLUDE_GENERATED_DECLARATIONS
# include "lua/executor.c.generated.h" # include "lua/executor.c.generated.h"
# include "lua/vim_module.generated.h" # include "lua/vim_module.generated.h"
@ -296,7 +287,7 @@ static void nlua_schedule_event(void **argv)
LuaRef cb = (LuaRef)(ptrdiff_t)argv[0]; LuaRef cb = (LuaRef)(ptrdiff_t)argv[0];
lua_State *const lstate = global_lstate; lua_State *const lstate = global_lstate;
nlua_pushref(lstate, cb); nlua_pushref(lstate, cb);
nlua_unref(lstate, cb); nlua_unref_global(lstate, cb);
if (nlua_pcall(lstate, 0, 0)) { if (nlua_pcall(lstate, 0, 0)) {
nlua_error(lstate, _("Error executing vim.schedule lua callback: %.*s")); nlua_error(lstate, _("Error executing vim.schedule lua callback: %.*s"));
} }
@ -313,7 +304,7 @@ static int nlua_schedule(lua_State *const lstate)
return lua_error(lstate); return lua_error(lstate);
} }
LuaRef cb = nlua_ref(lstate, 1); LuaRef cb = nlua_ref_global(lstate, 1);
multiqueue_put(main_loop.events, nlua_schedule_event, multiqueue_put(main_loop.events, nlua_schedule_event,
1, (void *)(ptrdiff_t)cb); 1, (void *)(ptrdiff_t)cb);
@ -438,6 +429,9 @@ static nlua_ref_state_t *nlua_new_ref_state(lua_State *lstate, bool is_thread)
memset(ref_state, 0, sizeof(*ref_state)); memset(ref_state, 0, sizeof(*ref_state));
ref_state->nil_ref = LUA_NOREF; ref_state->nil_ref = LUA_NOREF;
ref_state->empty_dict_ref = LUA_NOREF; ref_state->empty_dict_ref = LUA_NOREF;
if (!is_thread) {
nlua_global_refs = ref_state;
}
return ref_state; return ref_state;
} }
@ -465,17 +459,9 @@ LuaRef nlua_get_empty_dict_ref(lua_State *lstate)
return ref_state->empty_dict_ref; return ref_state->empty_dict_ref;
} }
static int nlua_get_ref_count(lua_State *lstate)
FUNC_ATTR_NONNULL_ALL
{
nlua_ref_state_t *ref_state = nlua_get_ref_state(lstate);
return ref_state->ref_count;
}
int nlua_get_global_ref_count(void) int nlua_get_global_ref_count(void)
{ {
lua_State *const lstate = global_lstate; return nlua_global_refs->ref_count;
return nlua_get_ref_count(lstate);
} }
static void nlua_common_vim_init(lua_State *lstate, bool is_thread) static void nlua_common_vim_init(lua_State *lstate, bool is_thread)
@ -496,7 +482,7 @@ static void nlua_common_vim_init(lua_State *lstate, bool is_thread)
lua_pushcfunction(lstate, &nlua_nil_tostring); lua_pushcfunction(lstate, &nlua_nil_tostring);
lua_setfield(lstate, -2, "__tostring"); lua_setfield(lstate, -2, "__tostring");
lua_setmetatable(lstate, -2); lua_setmetatable(lstate, -2);
ref_state->nil_ref = nlua_ref(lstate, -1); ref_state->nil_ref = nlua_ref(lstate, ref_state, -1);
lua_pushvalue(lstate, -1); lua_pushvalue(lstate, -1);
lua_setfield(lstate, LUA_REGISTRYINDEX, "mpack.NIL"); lua_setfield(lstate, LUA_REGISTRYINDEX, "mpack.NIL");
lua_setfield(lstate, -2, "NIL"); lua_setfield(lstate, -2, "NIL");
@ -505,7 +491,7 @@ static void nlua_common_vim_init(lua_State *lstate, bool is_thread)
lua_createtable(lstate, 0, 0); lua_createtable(lstate, 0, 0);
lua_pushcfunction(lstate, &nlua_empty_dict_tostring); lua_pushcfunction(lstate, &nlua_empty_dict_tostring);
lua_setfield(lstate, -2, "__tostring"); lua_setfield(lstate, -2, "__tostring");
ref_state->empty_dict_ref = nlua_ref(lstate, -1); ref_state->empty_dict_ref = nlua_ref(lstate, ref_state, -1);
lua_pushvalue(lstate, -1); lua_pushvalue(lstate, -1);
lua_setfield(lstate, LUA_REGISTRYINDEX, "mpack.empty_dict"); lua_setfield(lstate, LUA_REGISTRYINDEX, "mpack.empty_dict");
lua_setfield(lstate, -2, "_empty_dict_mt"); lua_setfield(lstate, -2, "_empty_dict_mt");
@ -784,11 +770,11 @@ void nlua_free_all_mem(void)
static void nlua_common_free_all_mem(lua_State *lstate) static void nlua_common_free_all_mem(lua_State *lstate)
FUNC_ATTR_NONNULL_ALL FUNC_ATTR_NONNULL_ALL
{ {
nlua_unref(lstate, nlua_get_nil_ref(lstate)); nlua_ref_state_t *ref_state = nlua_get_ref_state(lstate);
nlua_unref(lstate, nlua_get_empty_dict_ref(lstate)); nlua_unref(lstate, ref_state, ref_state->nil_ref);
nlua_unref(lstate, ref_state, ref_state->empty_dict_ref);
#ifdef NLUA_TRACK_REFS #ifdef NLUA_TRACK_REFS
nlua_ref_state_t *ref_state = nlua_get_ref_state(lstate);
if (ref_state->ref_count) { if (ref_state->ref_count) {
fprintf(stderr, "%d lua references were leaked!", ref_state->ref_count); fprintf(stderr, "%d lua references were leaked!", ref_state->ref_count);
} }
@ -1095,10 +1081,8 @@ static int nlua_getenv(lua_State *lstate)
/// add the value to the registry /// add the value to the registry
/// The current implementation does not support calls from threads. /// The current implementation does not support calls from threads.
LuaRef nlua_ref(lua_State *lstate, int index) LuaRef nlua_ref(lua_State *lstate, nlua_ref_state_t *ref_state, int index)
{ {
nlua_ref_state_t *ref_state = nlua_get_ref_state(lstate);
lua_pushvalue(lstate, index); lua_pushvalue(lstate, index);
LuaRef ref = luaL_ref(lstate, LUA_REGISTRYINDEX); LuaRef ref = luaL_ref(lstate, LUA_REGISTRYINDEX);
if (ref > 0) { if (ref > 0) {
@ -1113,11 +1097,15 @@ LuaRef nlua_ref(lua_State *lstate, int index)
return ref; return ref;
} }
/// remove the value from the registry
void nlua_unref(lua_State *lstate, LuaRef ref)
{
nlua_ref_state_t *ref_state = nlua_get_ref_state(lstate);
LuaRef nlua_ref_global(lua_State *lstate, int index)
{
return nlua_ref(lstate, nlua_global_refs, index);
}
/// remove the value from the registry
void nlua_unref(lua_State *lstate, nlua_ref_state_t *ref_state, LuaRef ref)
{
if (ref > 0) { if (ref > 0) {
ref_state->ref_count--; ref_state->ref_count--;
#ifdef NLUA_TRACK_REFS #ifdef NLUA_TRACK_REFS
@ -1130,9 +1118,15 @@ void nlua_unref(lua_State *lstate, LuaRef ref)
} }
} }
void nlua_unref_global(lua_State *lstate, LuaRef ref)
{
nlua_unref(lstate, nlua_global_refs, ref);
}
void api_free_luaref(LuaRef ref) void api_free_luaref(LuaRef ref)
{ {
nlua_unref(global_lstate, ref); nlua_unref_global(global_lstate, ref);
} }
/// push a value referenced in the registry /// push a value referenced in the registry
@ -1154,7 +1148,7 @@ LuaRef api_new_luaref(LuaRef original_ref)
lua_State *const lstate = global_lstate; lua_State *const lstate = global_lstate;
nlua_pushref(lstate, original_ref); nlua_pushref(lstate, original_ref);
LuaRef new_ref = nlua_ref(lstate, -1); LuaRef new_ref = nlua_ref_global(lstate, -1);
lua_pop(lstate, 1); lua_pop(lstate, 1);
return new_ref; return new_ref;
} }
@ -1707,7 +1701,7 @@ void nlua_CFunction_func_free(void *state)
lua_State *const lstate = global_lstate; lua_State *const lstate = global_lstate;
LuaCFunctionState *funcstate = (LuaCFunctionState *)state; LuaCFunctionState *funcstate = (LuaCFunctionState *)state;
nlua_unref(lstate, funcstate->lua_callable.func_ref); nlua_unref_global(lstate, funcstate->lua_callable.func_ref);
xfree(funcstate); xfree(funcstate);
} }
@ -1757,7 +1751,7 @@ char_u *nlua_register_table_as_callable(typval_T *const arg)
lua_pop(lstate, 2); // [table] lua_pop(lstate, 2); // [table]
LuaCFunctionState *state = xmalloc(sizeof(LuaCFunctionState)); LuaCFunctionState *state = xmalloc(sizeof(LuaCFunctionState));
state->lua_callable.func_ref = nlua_ref(lstate, -1); state->lua_callable.func_ref = nlua_ref_global(lstate, -1);
char_u *name = register_cfunc(&nlua_CFunction_func_call, char_u *name = register_cfunc(&nlua_CFunction_func_call,
&nlua_CFunction_func_free, state); &nlua_CFunction_func_free, state);

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

@ -15,6 +15,15 @@
// Generated by msgpack-gen.lua // Generated by msgpack-gen.lua
void nlua_add_api_functions(lua_State *lstate) REAL_FATTR_NONNULL_ALL; void nlua_add_api_functions(lua_State *lstate) REAL_FATTR_NONNULL_ALL;
typedef struct {
LuaRef nil_ref;
LuaRef empty_dict_ref;
int ref_count;
#if __has_feature(address_sanitizer)
PMap(handle_T) ref_markers;
#endif
} nlua_ref_state_t;
#define set_api_error(s, err) \ #define set_api_error(s, err) \
do { \ do { \
Error *err_ = (err); \ Error *err_ = (err); \
@ -35,4 +44,7 @@ void nlua_add_api_functions(lua_State *lstate) REAL_FATTR_NONNULL_ALL;
#ifdef INCLUDE_GENERATED_DECLARATIONS #ifdef INCLUDE_GENERATED_DECLARATIONS
# include "lua/executor.h.generated.h" # include "lua/executor.h.generated.h"
#endif #endif
EXTERN nlua_ref_state_t *nlua_global_refs INIT(= NULL);
#endif // NVIM_LUA_EXECUTOR_H #endif // NVIM_LUA_EXECUTOR_H