kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-01-01 17:23:36 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(logging): make logmsg() thread-safe again

Browse Source 
problem: data race when `recursive` is read outside of mutex by thread A
while thread B has taken the mutex and modifies it.

solution: use a recursive lock.

ref #18764
This commit is contained in:
bfredl 2022-06-03 11:05:17 +02:00
parent 9745941ef6
commit 640c695a7b
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/nvim/log.c
View File

@ -105,7 +105,7 @@ static bool log_path_init(void)
void log_init(void) void log_init(void)
{ {
uv_mutex_init(&mutex); uv_mutex_init_recursive(&mutex);
// AFTER init_homedir ("~", XDG) and set_init_1 (env vars). 22b52dd462e5 #11501 // AFTER init_homedir ("~", XDG) and set_init_1 (env vars). 22b52dd462e5 #11501
log_path_init(); log_path_init();
did_log_init = true; did_log_init = true;
@ -150,15 +150,6 @@ bool logmsg(int log_level, const char *context, const char *func_name, int line_
// set_init_1 may try logging before we are ready. 6f27f5ef91b3 #10183 // set_init_1 may try logging before we are ready. 6f27f5ef91b3 #10183
return false; return false;
} }
if (recursive) {
if (!did_msg) {
did_msg = true;
char *arg1 = func_name ? xstrdup(func_name) : (context ? xstrdup(context) : NULL);
multiqueue_put(main_loop.events, on_log_recursive_event, 2, arg1, line_num);
}
g_stats.log_skip++;
return false;
}
if (log_level < MIN_LOG_LEVEL) { if (log_level < MIN_LOG_LEVEL) {
return false; return false;
@ -171,6 +162,16 @@ bool logmsg(int log_level, const char *context, const char *func_name, int line_
#endif #endif
log_lock(); log_lock();
if (recursive) {
if (!did_msg) {
did_msg = true;
char *arg1 = func_name ? xstrdup(func_name) : (context ? xstrdup(context) : NULL);
loop_schedule_deferred(&main_loop, event_create(on_log_recursive_event, 2, arg1, line_num));
}
g_stats.log_skip++;
return false;
}
recursive = true; recursive = true;
bool ret = false; bool ret = false;
FILE *log_file = open_log_file(); FILE *log_file = open_log_file();