procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix deadlocks with invisible frames and threads in Haiku

Browse source 
* src/haiku_support.cc (class EmacsWindow): New field
`was_shown_p'.
(EmacsShow): Lock looper if the window wasn't ever visible.
(BWindow_new): Unlock window looper after creating it.
This commit is contained in:
Po Lu 2022-01-01 09:33:15 +00:00
parent a27511ff2f
commit c6d83707d6
1 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/haiku_support.cc
View file

@ -245,6 +245,7 @@ class EmacsWindow : public BWindow
int fullscreen_p = 0;
int zoomed_p = 0;
int shown_flag = 0;
volatile int was_shown_p = 0;
EmacsWindow () : BWindow (BRect (0, 0, 0, 0), "", B_TITLED_WINDOW_LOOK,
B_NORMAL_WINDOW_FEEL, B_NO_SERVER_SIDE_WINDOW_MODIFIERS)
@ -726,6 +727,18 @@ class EmacsWindow : public BWindow
if (!child_frame_lock.Lock ())
gui_abort ("Failed to lock child frame state lock");
if (!was_shown_p)
{
/* This window is being shown for the first time, which means
Show will unlock the looper. In this case, it should be
locked again, since the looper is unlocked when the window
is first created. */
if (!LockLooper ())
gui_abort ("Failed to lock looper during first window show");
was_shown_p = true;
}
if (this->parent)
shown_flag = 1;
Show ();
@ -1560,6 +1573,14 @@ BWindow_new (void *_view)
window->Quit ();
return NULL;
}
/* Windows are created locked by the current thread, but calling
Show for the first time causes them to be unlocked. To avoid a
deadlock when a frame is created invisible in one thread, and
another thread later tries to lock it, the window is unlocked
here, and EmacsShow will lock it manually if it's being shown for
the first time. */
window->UnlockLooper ();
window->AddChild (vw);
*v = vw;
return window;