thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 12:31:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add evil mutex bypass hack in console

Browse source 
Fixes KartKrew/Kart#795
This commit is contained in:
Eidolon 2024-01-02 13:18:31 -06:00
parent 4a761c2e27
commit e71f6fcc85
3 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/console.c
View file

@ -44,8 +44,12 @@
#ifdef HAVE_THREADS #ifdef HAVE_THREADS
I_mutex con_mutex; I_mutex con_mutex;
# define Lock_state() I_lock_mutex(&con_mutex) // g_in_exiting_signal_handler is an evil hack
# define Unlock_state() I_unlock_mutex(con_mutex) // to avoid infinite SIGABRT recursion in the signal handler
// due to poisoned locks or mach-o kernel not supporting locks in signals
// or something like that. idk
# define Lock_state() if (!g_in_exiting_signal_handler) { I_lock_mutex(&con_mutex); }
# define Unlock_state() if (!g_in_exiting_signal_handler) { I_unlock_mutex(con_mutex); }
#else/*HAVE_THREADS*/ #else/*HAVE_THREADS*/
# define Lock_state() # define Lock_state()
# define Unlock_state() # define Unlock_state()

3
src/i_system.h
View file

@ -38,6 +38,9 @@ extern UINT8 graphics_started;
*/ */
extern UINT8 keyboard_started; extern UINT8 keyboard_started;
/** \brief Set to true when inside a signal handler that will exit the program. */
extern boolean g_in_exiting_signal_handler;
/** \brief The I_GetFreeMem function /** \brief The I_GetFreeMem function
\param total total memory in the system \param total total memory in the system

3
src/sdl/i_system.cpp
View file

@ -208,6 +208,7 @@ SDL_bool consolevent = SDL_FALSE;
SDL_bool framebuffer = SDL_FALSE; SDL_bool framebuffer = SDL_FALSE;
UINT8 keyboard_started = false; UINT8 keyboard_started = false;
boolean g_in_exiting_signal_handler = false;
#ifdef UNIXBACKTRACE #ifdef UNIXBACKTRACE
#define STDERR_WRITE(string) if (fd != -1) I_OutputMsg("%s", string) #define STDERR_WRITE(string) if (fd != -1) I_OutputMsg("%s", string)
@ -428,6 +429,8 @@ static void I_ReportSignal(int num, int coredumped)
#ifndef NEWSIGNALHANDLER #ifndef NEWSIGNALHANDLER
FUNCNORETURN static ATTRNORETURN void signal_handler(INT32 num) FUNCNORETURN static ATTRNORETURN void signal_handler(INT32 num)
{ {
g_in_exiting_signal_handler = true;
if (g_main_thread_id != std::this_thread::get_id()) if (g_main_thread_id != std::this_thread::get_id())
{ {
// Do not attempt any sort of recovery if this signal triggers off the main thread // Do not attempt any sort of recovery if this signal triggers off the main thread