From a0ad372b08faac00047b83b5009d154fa1475703 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Mon, 17 Feb 2020 15:25:03 +0100 Subject: [PATCH] AudioServer: Remove ASEventLoop class and do all the setup in main() This class was too small and unnecessary. --- Servers/AudioServer/ASEventLoop.cpp | 48 ----------------------------- Servers/AudioServer/ASEventLoop.h | 43 -------------------------- Servers/AudioServer/Makefile | 3 +- Servers/AudioServer/main.cpp | 23 ++++++++++++-- 4 files changed, 21 insertions(+), 96 deletions(-) delete mode 100644 Servers/AudioServer/ASEventLoop.cpp delete mode 100644 Servers/AudioServer/ASEventLoop.h diff --git a/Servers/AudioServer/ASEventLoop.cpp b/Servers/AudioServer/ASEventLoop.cpp deleted file mode 100644 index 67abab6be7..0000000000 --- a/Servers/AudioServer/ASEventLoop.cpp +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) 2018-2020, Andreas Kling - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include "ASEventLoop.h" -#include "ASClientConnection.h" -#include -#include -#include - -ASEventLoop::ASEventLoop() - : m_server(Core::LocalServer::construct()) -{ - bool ok = m_server->take_over_from_system_server(); - ASSERT(ok); - m_server->on_ready_to_accept = [this] { - auto client_socket = m_server->accept(); - if (!client_socket) { - dbg() << "AudioServer: accept failed."; - return; - } - static int s_next_client_id = 0; - int client_id = ++s_next_client_id; - IPC::new_client_connection(*client_socket, client_id, m_mixer); - }; -} diff --git a/Servers/AudioServer/ASEventLoop.h b/Servers/AudioServer/ASEventLoop.h deleted file mode 100644 index 5f88ddf759..0000000000 --- a/Servers/AudioServer/ASEventLoop.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (c) 2018-2020, Andreas Kling - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#pragma once - -#include "ASMixer.h" -#include -#include -#include - -class ASEventLoop { -public: - ASEventLoop(); - int exec() { return m_event_loop.exec(); } - -private: - Core::EventLoop m_event_loop; - RefPtr m_server; - ASMixer m_mixer; -}; diff --git a/Servers/AudioServer/Makefile b/Servers/AudioServer/Makefile index 2955a06a97..7b6b3dd031 100644 --- a/Servers/AudioServer/Makefile +++ b/Servers/AudioServer/Makefile @@ -1,8 +1,7 @@ OBJS = \ main.o \ ASMixer.o \ - ASClientConnection.o \ - ASEventLoop.o + ASClientConnection.o PROGRAM = AudioServer diff --git a/Servers/AudioServer/main.cpp b/Servers/AudioServer/main.cpp index e56d183f12..5907dd77c6 100644 --- a/Servers/AudioServer/main.cpp +++ b/Servers/AudioServer/main.cpp @@ -24,9 +24,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "ASMixer.h" #include - -#include "ASEventLoop.h" +#include int main(int, char**) { @@ -34,7 +34,24 @@ int main(int, char**) perror("pledge"); return 1; } - ASEventLoop event_loop; + + Core::EventLoop event_loop; + ASMixer mixer; + + auto server = Core::LocalServer::construct(); + bool ok = server->take_over_from_system_server(); + ASSERT(ok); + server->on_ready_to_accept = [&] { + auto client_socket = server->accept(); + if (!client_socket) { + dbg() << "AudioServer: accept failed."; + return; + } + static int s_next_client_id = 0; + int client_id = ++s_next_client_id; + IPC::new_client_connection(*client_socket, client_id, mixer); + }; + if (pledge("stdio thread shared_buffer accept", nullptr) < 0) { perror("pledge"); return 1;