d6
/
uxn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

uxnemu: fix the stuck threads on quit, SOMEWHAT 

Create threads in detached mode and check if events failed to be
pushed. Stdin thread is still blocking on fread hence the "SOMEWHAT".
This commit is contained in:
Sigrid Solveig Haflínudóttir 2022-03-28 17:24:35 +02:00
parent a325798cb3
commit f06494477a
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/uxnemu.c
View File

@ -81,8 +81,8 @@ stdin_handler(void *p)
{ {
SDL_Event event; SDL_Event event;
event.type = stdin_event; event.type = stdin_event;
while(fread(&event.cbutton.button, 1, 1, stdin) > 0) while(fread(&event.cbutton.button, 1, 1, stdin) > 0 && SDL_PushEvent(&event) >= 0)
SDL_PushEvent(&event); ;
return 0; return 0;
(void)p; (void)p;
} }
@ -90,18 +90,17 @@ stdin_handler(void *p)
static int static int
redraw_handler(void *p) redraw_handler(void *p)
{ {
int dropped_frames = 0; int dropped_frames = 0, stop = 0;
SDL_Event event, interrupt; SDL_Event event, interrupt;
event.type = redraw_event; event.type = redraw_event;
interrupt.type = interrupt_event; interrupt.type = interrupt_event;
for(;;) { while(!stop) {
SDL_Delay(16); SDL_Delay(16);
if(SDL_HasEvent(redraw_event) == SDL_FALSE) { if(SDL_HasEvent(redraw_event) == SDL_FALSE) {
SDL_PushEvent(&event); stop = SDL_PushEvent(&event) < 0;
dropped_frames = 0; dropped_frames = 0;
} } else if(++dropped_frames == TIMEOUT_FRAMES) {
else if(++dropped_frames == TIMEOUT_FRAMES) { stop = SDL_PushEvent(&interrupt) < 0;
SDL_PushEvent(&interrupt);
} }
} }
return 0; return 0;
@ -178,8 +177,8 @@ init(void)
audio0_event = SDL_RegisterEvents(POLYPHONY); audio0_event = SDL_RegisterEvents(POLYPHONY);
redraw_event = SDL_RegisterEvents(1); redraw_event = SDL_RegisterEvents(1);
interrupt_event = SDL_RegisterEvents(1); interrupt_event = SDL_RegisterEvents(1);
SDL_CreateThread(stdin_handler, "stdin", NULL); SDL_DetachThread(SDL_CreateThread(stdin_handler, "stdin", NULL));
SDL_CreateThread(redraw_handler, "redraw", NULL); SDL_DetachThread(SDL_CreateThread(redraw_handler, "redraw", NULL));
SDL_StartTextInput(); SDL_StartTextInput();
SDL_ShowCursor(SDL_DISABLE); SDL_ShowCursor(SDL_DISABLE);
SDL_EventState(SDL_DROPFILE, SDL_ENABLE); SDL_EventState(SDL_DROPFILE, SDL_ENABLE);