mirror of
https://github.com/RGBCube/serenity
synced 2025-07-23 18:17:41 +00:00
LibCore: Use dbgln_if in EventLoop.cpp
This commit is contained in:
parent
209de3bcb3
commit
e83caffccc
1 changed files with 18 additions and 39 deletions
|
@ -27,6 +27,7 @@
|
||||||
#include <AK/Badge.h>
|
#include <AK/Badge.h>
|
||||||
#include <AK/ByteBuffer.h>
|
#include <AK/ByteBuffer.h>
|
||||||
#include <AK/Debug.h>
|
#include <AK/Debug.h>
|
||||||
|
#include <AK/Format.h>
|
||||||
#include <AK/IDAllocator.h>
|
#include <AK/IDAllocator.h>
|
||||||
#include <AK/JsonObject.h>
|
#include <AK/JsonObject.h>
|
||||||
#include <AK/JsonValue.h>
|
#include <AK/JsonValue.h>
|
||||||
|
@ -154,9 +155,7 @@ public:
|
||||||
u32 length;
|
u32 length;
|
||||||
int nread = m_socket->read((u8*)&length, sizeof(length));
|
int nread = m_socket->read((u8*)&length, sizeof(length));
|
||||||
if (nread == 0) {
|
if (nread == 0) {
|
||||||
# ifdef EVENTLOOP_DEBUG
|
dbgln_if(EVENTLOOP_DEBUG, "RPC client disconnected");
|
||||||
dbgln("RPC client disconnected");
|
|
||||||
# endif
|
|
||||||
shutdown();
|
shutdown();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -307,9 +306,7 @@ EventLoop::EventLoop()
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
#if EVENTLOOP_DEBUG
|
dbgln_if(EVENTLOOP_DEBUG, "{} Core::EventLoop constructed :)", getpid());
|
||||||
dbgln("{} Core::EventLoop constructed :)", getpid());
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
EventLoop::~EventLoop()
|
EventLoop::~EventLoop()
|
||||||
|
@ -345,18 +342,14 @@ EventLoop& EventLoop::current()
|
||||||
|
|
||||||
void EventLoop::quit(int code)
|
void EventLoop::quit(int code)
|
||||||
{
|
{
|
||||||
#if EVENTLOOP_DEBUG
|
dbgln_if(EVENTLOOP_DEBUG, "Core::EventLoop::quit({})", code);
|
||||||
dbgln("Core::EventLoop::quit({})", code);
|
|
||||||
#endif
|
|
||||||
m_exit_requested = true;
|
m_exit_requested = true;
|
||||||
m_exit_code = code;
|
m_exit_code = code;
|
||||||
}
|
}
|
||||||
|
|
||||||
void EventLoop::unquit()
|
void EventLoop::unquit()
|
||||||
{
|
{
|
||||||
#if EVENTLOOP_DEBUG
|
dbgln_if(EVENTLOOP_DEBUG, "Core::EventLoop::unquit()");
|
||||||
dbgln("Core::EventLoop::unquit()");
|
|
||||||
#endif
|
|
||||||
m_exit_requested = false;
|
m_exit_requested = false;
|
||||||
m_exit_code = 0;
|
m_exit_code = 0;
|
||||||
}
|
}
|
||||||
|
@ -408,19 +401,16 @@ void EventLoop::pump(WaitMode mode)
|
||||||
auto& queued_event = events.at(i);
|
auto& queued_event = events.at(i);
|
||||||
auto receiver = queued_event.receiver.strong_ref();
|
auto receiver = queued_event.receiver.strong_ref();
|
||||||
auto& event = *queued_event.event;
|
auto& event = *queued_event.event;
|
||||||
#if EVENTLOOP_DEBUG
|
|
||||||
if (receiver)
|
if (receiver)
|
||||||
dbgln("Core::EventLoop: {} event {}", *receiver, event.type());
|
dbgln_if(EVENTLOOP_DEBUG, "Core::EventLoop: {} event {}", *receiver, event.type());
|
||||||
#endif
|
|
||||||
if (!receiver) {
|
if (!receiver) {
|
||||||
switch (event.type()) {
|
switch (event.type()) {
|
||||||
case Event::Quit:
|
case Event::Quit:
|
||||||
VERIFY_NOT_REACHED();
|
VERIFY_NOT_REACHED();
|
||||||
return;
|
return;
|
||||||
default:
|
default:
|
||||||
#if EVENTLOOP_DEBUG
|
dbgln_if(EVENTLOOP_DEBUG, "Event type {} with no receiver :(", event.type());
|
||||||
dbgln("Event type {} with no receiver :(", event.type());
|
|
||||||
#endif
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
} else if (event.type() == Event::Type::DeferredInvoke) {
|
} else if (event.type() == Event::Type::DeferredInvoke) {
|
||||||
|
@ -435,9 +425,7 @@ void EventLoop::pump(WaitMode mode)
|
||||||
|
|
||||||
if (m_exit_requested) {
|
if (m_exit_requested) {
|
||||||
LOCKER(m_private->lock);
|
LOCKER(m_private->lock);
|
||||||
#if EVENTLOOP_DEBUG
|
dbgln_if(EVENTLOOP_DEBUG, "Core::EventLoop: Exit requested. Rejigging {} events.", events.size() - i);
|
||||||
dbgln("Core::EventLoop: Exit requested. Rejigging {} events.", events.size() - i);
|
|
||||||
#endif
|
|
||||||
decltype(m_queued_events) new_event_queue;
|
decltype(m_queued_events) new_event_queue;
|
||||||
new_event_queue.ensure_capacity(m_queued_events.size() + events.size());
|
new_event_queue.ensure_capacity(m_queued_events.size() + events.size());
|
||||||
for (++i; i < events.size(); ++i)
|
for (++i; i < events.size(); ++i)
|
||||||
|
@ -452,9 +440,7 @@ void EventLoop::pump(WaitMode mode)
|
||||||
void EventLoop::post_event(Object& receiver, NonnullOwnPtr<Event>&& event)
|
void EventLoop::post_event(Object& receiver, NonnullOwnPtr<Event>&& event)
|
||||||
{
|
{
|
||||||
LOCKER(m_private->lock);
|
LOCKER(m_private->lock);
|
||||||
#if EVENTLOOP_DEBUG
|
dbgln_if(EVENTLOOP_DEBUG, "Core::EventLoop::post_event: ({}) << receivier={}, event={}", m_queued_events.size(), receiver, event);
|
||||||
dbgln("Core::EventLoop::post_event: ({}) << receivier={}, event={}", m_queued_events.size(), receiver, event);
|
|
||||||
#endif
|
|
||||||
m_queued_events.empend(receiver, move(event));
|
m_queued_events.empend(receiver, move(event));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -462,16 +448,12 @@ SignalHandlers::SignalHandlers(int signo, void (*handle_signal)(int))
|
||||||
: m_signo(signo)
|
: m_signo(signo)
|
||||||
, m_original_handler(signal(signo, handle_signal))
|
, m_original_handler(signal(signo, handle_signal))
|
||||||
{
|
{
|
||||||
#if EVENTLOOP_DEBUG
|
dbgln_if(EVENTLOOP_DEBUG, "Core::EventLoop: Registered handler for signal {}", m_signo);
|
||||||
dbgln("Core::EventLoop: Registered handler for signal {}", m_signo);
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
SignalHandlers::~SignalHandlers()
|
SignalHandlers::~SignalHandlers()
|
||||||
{
|
{
|
||||||
#if EVENTLOOP_DEBUG
|
dbgln_if(EVENTLOOP_DEBUG, "Core::EventLoop: Unregistering handler for signal {}", m_signo);
|
||||||
dbgln("Core::EventLoop: Unregistering handler for signal {}", m_signo);
|
|
||||||
#endif
|
|
||||||
signal(m_signo, m_original_handler);
|
signal(m_signo, m_original_handler);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -535,9 +517,7 @@ void EventLoop::dispatch_signal(int signo)
|
||||||
// This allows a handler to unregister/register while the handlers
|
// This allows a handler to unregister/register while the handlers
|
||||||
// are being called!
|
// are being called!
|
||||||
auto handler = handlers->value;
|
auto handler = handlers->value;
|
||||||
#if EVENTLOOP_DEBUG
|
dbgln_if(EVENTLOOP_DEBUG, "Core::EventLoop: dispatching signal {}", signo);
|
||||||
dbgln("Core::EventLoop: dispatching signal {}", signo);
|
|
||||||
#endif
|
|
||||||
handler->dispatch();
|
handler->dispatch();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -677,9 +657,8 @@ try_select_again:
|
||||||
return;
|
return;
|
||||||
goto try_select_again;
|
goto try_select_again;
|
||||||
}
|
}
|
||||||
#if EVENTLOOP_DEBUG
|
dbgln_if(EVENTLOOP_DEBUG, "Core::EventLoop::wait_for_event: {} ({}: {})", marked_fd_count, saved_errno, strerror(saved_errno));
|
||||||
dbgln("Core::EventLoop::wait_for_event: {} ({}: {})", marked_fd_count, saved_errno, strerror(saved_errno));
|
|
||||||
#endif
|
|
||||||
// Blow up, similar to Core::safe_syscall.
|
// Blow up, similar to Core::safe_syscall.
|
||||||
VERIFY_NOT_REACHED();
|
VERIFY_NOT_REACHED();
|
||||||
}
|
}
|
||||||
|
@ -720,9 +699,9 @@ try_select_again:
|
||||||
&& owner && !owner->is_visible_for_timer_purposes()) {
|
&& owner && !owner->is_visible_for_timer_purposes()) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
#if EVENTLOOP_DEBUG
|
|
||||||
dbgln("Core::EventLoop: Timer {} has expired, sending Core::TimerEvent to {}", timer.timer_id, *owner);
|
dbgln_if(EVENTLOOP_DEBUG, "Core::EventLoop: Timer {} has expired, sending Core::TimerEvent to {}", timer.timer_id, *owner);
|
||||||
#endif
|
|
||||||
if (owner)
|
if (owner)
|
||||||
post_event(*owner, make<TimerEvent>(timer.timer_id));
|
post_event(*owner, make<TimerEvent>(timer.timer_id));
|
||||||
if (timer.should_reload) {
|
if (timer.should_reload) {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue