From fc7d231b004e6d141caf880dc837b701dd1898f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?kleines=20Filmr=C3=B6llchen?= Date: Tue, 1 Feb 2022 20:49:29 +0100 Subject: [PATCH] LibIPC: Allow transporting a SharedCircularQueue over IPC --- Userland/Libraries/LibIPC/Decoder.h | 15 +++++++++++++++ Userland/Libraries/LibIPC/Encoder.h | 8 ++++++++ 2 files changed, 23 insertions(+) diff --git a/Userland/Libraries/LibIPC/Decoder.h b/Userland/Libraries/LibIPC/Decoder.h index 57d4014c73..fc5ea6e117 100644 --- a/Userland/Libraries/LibIPC/Decoder.h +++ b/Userland/Libraries/LibIPC/Decoder.h @@ -11,7 +11,10 @@ #include #include #include +#include +#include #include +#include #include #include @@ -117,6 +120,18 @@ public: return {}; } + template + ErrorOr decode(Core::SharedSingleProducerCircularQueue& queue) + { + // FIXME: We don't support decoding into valid queues. + VERIFY(!queue.is_valid()); + + IPC::File anon_file; + TRY(decode(anon_file)); + queue = TRY((Core::SharedSingleProducerCircularQueue::try_create(anon_file.take_fd()))); + return {}; + } + template ErrorOr decode(Optional& optional) { diff --git a/Userland/Libraries/LibIPC/Encoder.h b/Userland/Libraries/LibIPC/Encoder.h index b207e73ccd..4c39ebd64b 100644 --- a/Userland/Libraries/LibIPC/Encoder.h +++ b/Userland/Libraries/LibIPC/Encoder.h @@ -8,6 +8,7 @@ #include #include +#include #include #include @@ -77,6 +78,13 @@ public: return *this; } + template + Encoder& operator<<(Core::SharedSingleProducerCircularQueue const& queue) + { + *this << IPC::File(queue.fd()); + return *this; + } + template Encoder& operator<<(T const& enum_value) {