From d2ab699cd5704f6288ebcf31d399e5e659735656 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Tue, 23 Apr 2019 14:10:49 +0200 Subject: [PATCH] Remove Post_signal_hook from Entrypoint The Post_signal_hook mechanism has been completely replaced by Io_progress_handler and can be removed. Ref #3132 Fix #3302 --- repos/base/include/base/entrypoint.h | 28 --------------------------- repos/base/src/lib/base/entrypoint.cc | 4 ---- 2 files changed, 32 deletions(-) diff --git a/repos/base/include/base/entrypoint.h b/repos/base/include/base/entrypoint.h index 71b4849ad..b329c30da 100644 --- a/repos/base/include/base/entrypoint.h +++ b/repos/base/include/base/entrypoint.h @@ -48,14 +48,6 @@ class Genode::Entrypoint : Noncopyable virtual void handle_io_progress() = 0; }; - /** - * Functor for post signal-handler hook - * - * \deprecated - * \noapi - */ - struct Post_signal_hook : Interface { virtual void function() = 0; }; - private: struct Signal_proxy : Interface @@ -118,7 +110,6 @@ class Genode::Entrypoint : Noncopyable Genode::Lock _signal_pending_ack_lock { }; Io_progress_handler *_io_progress_handler { nullptr }; - Post_signal_hook *_post_signal_hook { nullptr }; void _handle_io_progress() { @@ -126,14 +117,6 @@ class Genode::Entrypoint : Noncopyable _io_progress_handler->handle_io_progress(); } - void _execute_post_signal_hook() - { - if (_post_signal_hook != nullptr) - _post_signal_hook->function(); - - _post_signal_hook = nullptr; - } - /* * This signal handler is solely used to force an iteration of the * signal-dispatch loop. It is triggered by 'schedule_suspend' to @@ -259,17 +242,6 @@ class Genode::Entrypoint : Noncopyable } _io_progress_handler = &handler; } - - /** - * Register hook functor to be called after signal was handled - * - * \deprecated - * \noapi - */ - void schedule_post_signal_hook(Post_signal_hook *hook) - { - _post_signal_hook = hook; - } }; #endif /* _INCLUDE__BASE__ENTRYPOINT_H_ */ diff --git a/repos/base/src/lib/base/entrypoint.cc b/repos/base/src/lib/base/entrypoint.cc index a0cebfa58..3227af05e 100644 --- a/repos/base/src/lib/base/entrypoint.cc +++ b/repos/base/src/lib/base/entrypoint.cc @@ -59,9 +59,6 @@ void Entrypoint::Signal_proxy_component::signal() if (sig.context()->level() == Signal_context::Level::Io) { /* trigger the progress handler */ io_progress = true; - - /* execute deprecated per-signal hook */ - ep._execute_post_signal_hook(); } } catch (Signal_receiver::Signal_not_pending) { } @@ -214,7 +211,6 @@ bool Entrypoint::_wait_and_dispatch_one_io_signal(bool const dont_block) } _dispatch_signal(sig); - _execute_post_signal_hook(); break; } catch (Signal_receiver::Signal_not_pending) {