RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 17:37:37 +00:00
Code Issues Activity Actions

CEventLoop: Skip over null events in the queue.

Browse source 
Added some FIXME's about correctness issues in nested event loop exiting.
This commit is contained in:
Andreas Kling 2019-07-21 10:17:20 +02:00
parent d2b521f0ab
commit 98b569a702
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Libraries/LibCore/CEventLoop.cpp
View file

@ -110,8 +110,13 @@ void CEventLoop::pump(WaitMode mode)
events = move(m_queued_events); events = move(m_queued_events);
} }
for (auto& queued_event : events) { for (int i = 0; i < events.size(); ++i) {
auto& queued_event = events.at(i);
auto* receiver = queued_event.receiver.ptr(); auto* receiver = queued_event.receiver.ptr();
if (!queued_event.event) {
dbg() << "CEventLoop: FIXME: Null event in queue.";
continue;
}
auto& event = *queued_event.event; auto& event = *queued_event.event;
#ifdef CEVENTLOOP_DEBUG #ifdef CEVENTLOOP_DEBUG
dbgprintf("CEventLoop: %s{%p} event %u\n", receiver->class_name(), receiver, (unsigned)event.type()); dbgprintf("CEventLoop: %s{%p} event %u\n", receiver->class_name(), receiver, (unsigned)event.type());
@ -122,7 +127,7 @@ void CEventLoop::pump(WaitMode mode)
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
return; return;
default: default:
dbgprintf("Event type %u with no receiver :(\n", event.type()); dbg() << "Event type " << event.type() << " with no receiver :(";
} }
} else if (event.type() == CEvent::Type::DeferredInvoke) { } else if (event.type() == CEvent::Type::DeferredInvoke) {
#ifdef DEFERRED_INVOKE_DEBUG #ifdef DEFERRED_INVOKE_DEBUG
@ -135,6 +140,7 @@ void CEventLoop::pump(WaitMode mode)
if (m_exit_requested) { if (m_exit_requested) {
LOCKER(m_lock); LOCKER(m_lock);
// FIXME: Shouldn't we only prepend the events that haven't been processed yet?
m_queued_events.prepend(move(events)); m_queued_events.prepend(move(events));
return; return;
} }