From ca85194e40ae4b78c9e9c6024468109970b4365e Mon Sep 17 00:00:00 2001 From: Fredrik Solenberg Date: Tue, 2 Aug 2022 10:48:48 +0200 Subject: [PATCH] Remove unused sigslot::repeater Bug: webrtc:11943 Change-Id: I7a98038983edd8a14e741b204fc0e3a64741b3ee Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/270380 Commit-Queue: Fredrik Solenberg Reviewed-by: Harald Alvestrand Cr-Commit-Position: refs/heads/main@{#37659} --- rtc_base/BUILD.gn | 1 - rtc_base/sigslot_repeater.h | 56 ------------------------------------ rtc_base/sigslot_unittest.cc | 34 ---------------------- 3 files changed, 91 deletions(-) delete mode 100644 rtc_base/sigslot_repeater.h diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn index 17e7a0fd3a..abcdb12d41 100644 --- a/rtc_base/BUILD.gn +++ b/rtc_base/BUILD.gn @@ -1178,7 +1178,6 @@ rtc_library("rtc_base") { "rtc_certificate.h", "rtc_certificate_generator.cc", "rtc_certificate_generator.h", - "sigslot_repeater.h", "socket_adapters.cc", "socket_adapters.h", "socket_address_pair.cc", diff --git a/rtc_base/sigslot_repeater.h b/rtc_base/sigslot_repeater.h deleted file mode 100644 index f562c5aa7b..0000000000 --- a/rtc_base/sigslot_repeater.h +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright 2017 The WebRTC Project Authors. All rights reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#ifndef RTC_BASE_SIGSLOT_REPEATER_H__ -#define RTC_BASE_SIGSLOT_REPEATER_H__ - -// repeaters are both signals and slots, which are designed as intermediate -// pass-throughs for signals and slots which don't know about each other (for -// modularity or encapsulation). This eliminates the need to declare a signal -// handler whose sole purpose is to fire another signal. The repeater connects -// to the originating signal using the 'repeat' method. When the repeated -// signal fires, the repeater will also fire. -// -// TODO(deadbeef): Actually use this, after we decide on some style points on -// using signals, so it doesn't get deleted again. - -#include "rtc_base/third_party/sigslot/sigslot.h" - -namespace sigslot { - -template -class repeater_with_thread_policy - : public signal_with_thread_policy, - public has_slots { - private: - // These typedefs are just to make the code below more readable. Code using - // repeaters shouldn't need to reference these types directly. - typedef signal_with_thread_policy base_type; - typedef repeater_with_thread_policy this_type; - - public: - repeater_with_thread_policy() {} - repeater_with_thread_policy(const this_type& s) : base_type(s) {} - - void reemit(Args... args) { base_type::emit(args...); } - void repeat(base_type& s) { s.connect(this, &this_type::reemit); } - void stop(base_type& s) { s.disconnect(this); } -}; - -// Alias with default thread policy. Needed because both default arguments -// and variadic template arguments must go at the end of the list, so we -// can't have both at once. -template -using repeater = - repeater_with_thread_policy; - -} // namespace sigslot - -#endif // RTC_BASE_SIGSLOT_REPEATER_H__ diff --git a/rtc_base/sigslot_unittest.cc b/rtc_base/sigslot_unittest.cc index 317cd62a45..e9fdba503c 100644 --- a/rtc_base/sigslot_unittest.cc +++ b/rtc_base/sigslot_unittest.cc @@ -10,7 +10,6 @@ #include "rtc_base/third_party/sigslot/sigslot.h" -#include "rtc_base/sigslot_repeater.h" #include "test/gtest.h" // This function, when passed a has_slots or signalx, will break the build if @@ -349,36 +348,3 @@ TEST(SigslotTest, CallDisconnectAllWhileSignalFiring) { EXPECT_EQ(1, receiver1.signal_count()); EXPECT_EQ(0, receiver2.signal_count()); } - -// Basic test that a sigslot repeater works. -TEST(SigslotRepeaterTest, RepeatsSignalsAfterRepeatCalled) { - sigslot::signal<> signal; - sigslot::repeater<> repeater; - repeater.repeat(signal); - // Note that receiver is connected to the repeater, not directly to the - // source signal. - SigslotReceiver<> receiver; - receiver.Connect(&repeater); - // The repeater should repeat the signal, causing the receiver to see it. - signal(); - EXPECT_EQ(1, receiver.signal_count()); - // Repeat another signal for good measure. - signal(); - EXPECT_EQ(2, receiver.signal_count()); -} - -// After calling "stop", a repeater should stop repeating signals. -TEST(SigslotRepeaterTest, StopsRepeatingSignalsAfterStopCalled) { - // Same setup as above test. - sigslot::signal<> signal; - sigslot::repeater<> repeater; - repeater.repeat(signal); - SigslotReceiver<> receiver; - receiver.Connect(&repeater); - signal(); - ASSERT_EQ(1, receiver.signal_count()); - // Now call stop. The next signal should NOT propagate to the receiver. - repeater.stop(signal); - signal(); - EXPECT_EQ(1, receiver.signal_count()); -}