RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-24 22:47:44 +00:00
Code Issues Activity Actions

WindowServer: Sever the WSWindow/Process link when the process dies.

Browse source 
This fixes a deadlock where the WindowServer would get stuck trying to
acquire a dead process's event stream lock.
This commit is contained in:
Andreas Kling 2019-02-05 08:32:32 +01:00
parent ca16d9d98e
commit 0c38a4c30f
4 changed files with 25 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
WindowServer/WSWindow.cpp
View file

@ -5,7 +5,7 @@
#include "Process.h"
WSWindow::WSWindow(Process& process, int window_id)
: m_process(process)
: m_process(&process)
, m_window_id(window_id)
, m_pid(process.pid())
{
@ -34,11 +34,13 @@ void WSWindow::set_rect(const Rect& rect)
Rect old_rect;
{
WSWindowLocker locker(*this);
if (!m_process)
return;
if (m_rect == rect)
return;
old_rect = m_rect;
m_rect = rect;
m_backing = GraphicsBitmap::create(m_process, m_rect.size());
m_backing = GraphicsBitmap::create(*m_process, m_rect.size());
}
WSWindowManager::the().notify_rect_changed(*this, old_rect, rect);
}
@ -124,11 +126,20 @@ void WSWindow::on_message(WSMessage& message)
return;
{
LOCKER(m_process.gui_events_lock());
m_process.gui_events().append(move(gui_event));
WSWindowLocker window_locker(*this);
if (!m_process)
return;
LOCKER(m_process->gui_events_lock());
m_process->gui_events().append(move(gui_event));
}
}
void WSWindow::notify_process_died(Badge<Process>)
{
WSWindowLocker locker(*this);
m_process = nullptr;
}
void WSWindow::set_global_cursor_tracking_enabled(bool enabled)
{
dbgprintf("WSWindow{%p} global_cursor_tracking <- %u\n", enabled);