Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2025-05-04 05:31:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client] fix rare race condition when renderer is not ready

Browse Source
This commit is contained in:
Geoffrey McRae 2019-12-10 03:30:04 +11:00
parent 4843a278ff
commit dce6aaefea
2 changed files with 45 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
B1-16-g7d6e061ade+1 B1-19-g4843a278ff+1

51
client/src/main.c
View File

@ -48,8 +48,13 @@ static int cursorThread(void * unused);
static int renderThread(void * unused); static int renderThread(void * unused);
static int frameThread (void * unused); static int frameThread (void * unused);
static bool b_startup = false;
static SDL_mutex *m_startup;
static SDL_cond *c_startup;
static SDL_Thread *t_spice = NULL; static SDL_Thread *t_spice = NULL;
static SDL_Thread *t_render = NULL; static SDL_Thread *t_render = NULL;
static SDL_Thread *t_cursor = NULL;
static SDL_Cursor *cursor = NULL; static SDL_Cursor *cursor = NULL;
struct AppState state; struct AppState state;
@ -101,16 +106,21 @@ static int renderThread(void * unused)
if (!state.lgr->render_startup(state.lgrData, state.window)) if (!state.lgr->render_startup(state.lgrData, state.window))
{ {
state.running = false; state.running = false;
/* unblock threads waiting on the condition */
SDL_LockMutex(m_startup);
b_startup = true;
SDL_CondSignal(c_startup);
SDL_UnlockMutex(m_startup);
return 1; return 1;
} }
// start the cursor thread after render startup to prevent a race condition /* signal to other threads that the renderer is ready */
SDL_Thread *t_cursor = NULL; SDL_LockMutex(m_startup);
if (!(t_cursor = SDL_CreateThread(cursorThread, "cursorThread", NULL))) b_startup = true;
{ SDL_CondSignal(c_startup);
DEBUG_ERROR("cursor create thread failed"); SDL_UnlockMutex(m_startup);
return 1;
}
struct timespec time; struct timespec time;
clock_gettime(CLOCK_MONOTONIC, &time); clock_gettime(CLOCK_MONOTONIC, &time);
@ -179,6 +189,11 @@ static int cursorThread(void * unused)
memset(&header, 0, sizeof(KVMFRCursor)); memset(&header, 0, sizeof(KVMFRCursor));
SDL_LockMutex(m_startup);
while(!b_startup)
SDL_CondWait(c_startup, m_startup);
SDL_UnlockMutex(m_startup);
while(state.running) while(state.running)
{ {
// poll until we have cursor data // poll until we have cursor data
@ -292,6 +307,11 @@ static int frameThread(void * unused)
memset(&header, 0, sizeof(struct KVMFRFrame)); memset(&header, 0, sizeof(struct KVMFRFrame));
SDL_SetThreadPriority(SDL_THREAD_PRIORITY_HIGH); SDL_SetThreadPriority(SDL_THREAD_PRIORITY_HIGH);
SDL_LockMutex(m_startup);
while(!b_startup)
SDL_CondWait(c_startup, m_startup);
SDL_UnlockMutex(m_startup);
while(state.running) while(state.running)
{ {
// poll until we have a new frame // poll until we have a new frame
@ -1244,6 +1264,11 @@ static int lg_run()
SDL_ShowCursor(SDL_DISABLE); SDL_ShowCursor(SDL_DISABLE);
} }
// setup the startup condition
b_startup = false;
m_startup = SDL_CreateMutex();
c_startup = SDL_CreateCond();
// start the renderThread so we don't just display junk // start the renderThread so we don't just display junk
if (!(t_render = SDL_CreateThread(renderThread, "renderThread", NULL))) if (!(t_render = SDL_CreateThread(renderThread, "renderThread", NULL)))
{ {
@ -1283,6 +1308,12 @@ static int lg_run()
return -1; return -1;
} }
if (!(t_cursor = SDL_CreateThread(cursorThread, "cursorThread", NULL)))
{
DEBUG_ERROR("cursor create thread failed");
return 1;
}
if (!(state.t_frame = SDL_CreateThread(frameThread, "frameThread", NULL))) if (!(state.t_frame = SDL_CreateThread(frameThread, "frameThread", NULL)))
{ {
DEBUG_ERROR("frame create thread failed"); DEBUG_ERROR("frame create thread failed");
@ -1327,6 +1358,12 @@ static void lg_shutdown()
if (t_render) if (t_render)
SDL_WaitThread(t_render, NULL); SDL_WaitThread(t_render, NULL);
if (m_startup)
{
SDL_DestroyCond (c_startup);
SDL_DestroyMutex(m_startup);
}
// if spice is still connected send key up events for any pressed keys // if spice is still connected send key up events for any pressed keys
if (params.useSpiceInput && spice_ready()) if (params.useSpiceInput && spice_ready())
{ {