Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2025-02-17 06:31:14 +00:00
Code Issues Projects Releases Wiki Activity

Fix VideoExit() on OSX, there was no cancellation point in redraw_thread.

Browse Source
This commit is contained in:
gbeauche 2004-06-22 19:32:00 +00:00
parent e0a76f9e38
commit 5357aac108
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
SheepShaver/src/Unix/video_x.cpp
View File

@ -65,6 +65,7 @@ static int16 mouse_wheel_mode;
static int16 mouse_wheel_lines; static int16 mouse_wheel_lines;
static bool redraw_thread_active = false; // Flag: Redraw thread installed static bool redraw_thread_active = false; // Flag: Redraw thread installed
static pthread_attr_t redraw_thread_attr; // Redraw thread attributes static pthread_attr_t redraw_thread_attr; // Redraw thread attributes
static volatile bool redraw_thread_cancel; // Flag: Cancel Redraw thread
static pthread_t redraw_thread; // Redraw thread static pthread_t redraw_thread; // Redraw thread
static bool local_X11; // Flag: X server running on local machine? static bool local_X11; // Flag: X server running on local machine?
@ -1193,6 +1194,7 @@ bool VideoInit(void)
// Start periodic thread // Start periodic thread
XSync(x_display, false); XSync(x_display, false);
Set_pthread_attr(&redraw_thread_attr, 0); Set_pthread_attr(&redraw_thread_attr, 0);
redraw_thread_cancel = false;
redraw_thread_active = (pthread_create(&redraw_thread, &redraw_thread_attr, redraw_func, NULL) == 0); redraw_thread_active = (pthread_create(&redraw_thread, &redraw_thread_attr, redraw_func, NULL) == 0);
D(bug("Redraw thread installed (%ld)\n", redraw_thread)); D(bug("Redraw thread installed (%ld)\n", redraw_thread));
return true; return true;
@ -1207,6 +1209,7 @@ void VideoExit(void)
{ {
// Stop redraw thread // Stop redraw thread
if (redraw_thread_active) { if (redraw_thread_active) {
redraw_thread_cancel = true;
pthread_cancel(redraw_thread); pthread_cancel(redraw_thread);
pthread_join(redraw_thread, NULL); pthread_join(redraw_thread, NULL);
redraw_thread_active = false; redraw_thread_active = false;
@ -2295,7 +2298,7 @@ static void *redraw_func(void *arg)
int64 ticks = 0; int64 ticks = 0;
uint64 next = GetTicks_usec() + VIDEO_REFRESH_DELAY; uint64 next = GetTicks_usec() + VIDEO_REFRESH_DELAY;
for (;;) { while (!redraw_thread_cancel) {
// Pause if requested (during video mode switches) // Pause if requested (during video mode switches)
while (thread_stop_req) while (thread_stop_req)