From 751e6430fa4ab8c650d9581c700c36df6eaf1f5b Mon Sep 17 00:00:00 2001 From: Martin Stein Date: Sat, 4 May 2019 14:24:39 +0200 Subject: [PATCH] base-hw: obsolete Kernel::Thread::_signal_receiver Ref #3308 --- repos/base-hw/src/core/kernel/signal_receiver.cc | 2 +- repos/base-hw/src/core/kernel/thread.cc | 5 ++--- repos/base-hw/src/core/kernel/thread.h | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/repos/base-hw/src/core/kernel/signal_receiver.cc b/repos/base-hw/src/core/kernel/signal_receiver.cc index 97149c1ea..691c56a3b 100644 --- a/repos/base-hw/src/core/kernel/signal_receiver.cc +++ b/repos/base-hw/src/core/kernel/signal_receiver.cc @@ -199,7 +199,7 @@ int Signal_receiver::add_handler(Signal_handler &h) if (h._receiver) { return -1; } _handlers.enqueue(h._handlers_fe); h._receiver = this; - h._thread.signal_wait_for_signal(*this); + h._thread.signal_wait_for_signal(); _listen(); return 0; } diff --git a/repos/base-hw/src/core/kernel/thread.cc b/repos/base-hw/src/core/kernel/thread.cc index eaa56e78a..60d4ef390 100644 --- a/repos/base-hw/src/core/kernel/thread.cc +++ b/repos/base-hw/src/core/kernel/thread.cc @@ -165,10 +165,9 @@ void Thread::signal_context_kill_failed() } -void Thread::signal_wait_for_signal(Signal_receiver &receiver) +void Thread::signal_wait_for_signal() { _become_inactive(AWAITS_SIGNAL); - _signal_receiver = &receiver; } @@ -821,7 +820,7 @@ Thread::Thread(unsigned const priority, unsigned const quota, : Kernel::Object { *this }, Cpu_job(priority, quota), _ipc_node(*this), _state(AWAITS_START), - _signal_receiver(0), _label(label), _core(core), regs(core) { } + _label(label), _core(core), regs(core) { } void Thread::print(Genode::Output &out) const diff --git a/repos/base-hw/src/core/kernel/thread.h b/repos/base-hw/src/core/kernel/thread.h index e3a1d33e5..fb436066b 100644 --- a/repos/base-hw/src/core/kernel/thread.h +++ b/repos/base-hw/src/core/kernel/thread.h @@ -136,7 +136,6 @@ class Kernel::Thread : private Kernel::Object, public Cpu_job, private Timeout State _state; Signal_handler _signal_handler { *this }; Signal_context_killer _signal_context_killer { *this }; - Signal_receiver *_signal_receiver; char const *const _label; capid_t _timeout_sigid { 0 }; bool _paused { false }; @@ -378,7 +377,7 @@ class Kernel::Thread : private Kernel::Object, public Cpu_job, private Timeout void signal_context_kill_pending(); void signal_context_kill_failed(); void signal_context_kill_done(); - void signal_wait_for_signal(Signal_receiver &receiver); + void signal_wait_for_signal(); void signal_receive_signal(void * const base, size_t const size);