From 99a33c9a67a412fe675818a0d9c4c2b7ce4e1683 Mon Sep 17 00:00:00 2001
From: Andreas Kling <kling@serenityos.org>
Date: Wed, 3 Nov 2021 19:55:59 +0100
Subject: [PATCH] Revert "LibIPC: Use a zero-delay timer for message
 processing"

This reverts commit 3bed7d5a5ee5870de4805dd2bf47e0523e387e76.

As discovered by tomuta, this caused a large increase in WindowServer
CPU usage.
---
 Userland/Libraries/LibIPC/Connection.cpp | 6 +++---
 Userland/Libraries/LibIPC/Connection.h   | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Userland/Libraries/LibIPC/Connection.cpp b/Userland/Libraries/LibIPC/Connection.cpp
index 7aef9aeada..5780761d24 100644
--- a/Userland/Libraries/LibIPC/Connection.cpp
+++ b/Userland/Libraries/LibIPC/Connection.cpp
@@ -17,7 +17,6 @@ ConnectionBase::ConnectionBase(IPC::Stub& local_stub, NonnullRefPtr<Core::LocalS
     , m_local_endpoint_magic(local_endpoint_magic)
 {
     m_responsiveness_timer = Core::Timer::create_single_shot(3000, [this] { may_have_become_unresponsive(); });
-    m_processing_timer = Core::Timer::create_single_shot(0, [this] { handle_messages(); });
 }
 
 ConnectionBase::~ConnectionBase()
@@ -176,8 +175,9 @@ bool ConnectionBase::drain_messages_from_peer()
     }
 
     if (!m_unprocessed_messages.is_empty()) {
-        if (!m_processing_timer->is_active())
-            m_processing_timer->start();
+        deferred_invoke([this] {
+            handle_messages();
+        });
     }
     return true;
 }
diff --git a/Userland/Libraries/LibIPC/Connection.h b/Userland/Libraries/LibIPC/Connection.h
index 64b29b1569..446ba9e151 100644
--- a/Userland/Libraries/LibIPC/Connection.h
+++ b/Userland/Libraries/LibIPC/Connection.h
@@ -60,7 +60,6 @@ protected:
 
     NonnullRefPtr<Core::LocalSocket> m_socket;
     RefPtr<Core::Timer> m_responsiveness_timer;
-    RefPtr<Core::Timer> m_processing_timer;
 
     RefPtr<Core::Notifier> m_notifier;
     NonnullOwnPtrVector<Message> m_unprocessed_messages;