Replace sigslot usages with robocaller library.
- Replace all the top level signals from jsep_transport_controller.
- There are still sigslot usages in this file so keep the inheritance
and that is the reason for not having a binary size gain in this CL.
Bug: webrtc:11943
Change-Id: I249d3b9710783aef70ba273e082ceeafe3056898
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/185540
Commit-Queue: Lahiru Ginnaliya Gamathige <glahiru@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32321}
diff --git a/p2p/BUILD.gn b/p2p/BUILD.gn
index a376c74..330923e 100644
--- a/p2p/BUILD.gn
+++ b/p2p/BUILD.gn
@@ -97,6 +97,7 @@
"../logging:ice_log",
"../rtc_base",
"../rtc_base:checks",
+ "../rtc_base:robo_caller",
"../rtc_base:rtc_numerics",
"../rtc_base/experiments:field_trial_parser",
"../rtc_base/synchronization:sequence_checker",
diff --git a/p2p/base/dtls_transport.cc b/p2p/base/dtls_transport.cc
index 52fe5c6..68fc29c 100644
--- a/p2p/base/dtls_transport.cc
+++ b/p2p/base/dtls_transport.cc
@@ -23,6 +23,7 @@
#include "rtc_base/checks.h"
#include "rtc_base/dscp.h"
#include "rtc_base/logging.h"
+#include "rtc_base/robo_caller.h"
#include "rtc_base/rtc_certificate.h"
#include "rtc_base/ssl_stream_adapter.h"
#include "rtc_base/stream.h"
@@ -358,8 +359,8 @@
dtls_->SetMaxProtocolVersion(ssl_max_version_);
dtls_->SetServerRole(*dtls_role_);
dtls_->SignalEvent.connect(this, &DtlsTransport::OnDtlsEvent);
- dtls_->SignalSSLHandshakeError.connect(this,
- &DtlsTransport::OnDtlsHandshakeError);
+ dtls_->SignalSSLHandshakeError.AddReceiver(
+ [this](rtc::SSLHandshakeError e) { OnDtlsHandshakeError(e); });
if (remote_fingerprint_value_.size() &&
!dtls_->SetPeerCertificateDigest(
remote_fingerprint_algorithm_,
@@ -820,7 +821,7 @@
}
void DtlsTransport::OnDtlsHandshakeError(rtc::SSLHandshakeError error) {
- SignalDtlsHandshakeError(error);
+ SignalDtlsHandshakeError.Send(error);
}
void DtlsTransport::ConfigureHandshakeTimeout() {
diff --git a/p2p/base/dtls_transport_internal.h b/p2p/base/dtls_transport_internal.h
index 4c35d73..a3ca782 100644
--- a/p2p/base/dtls_transport_internal.h
+++ b/p2p/base/dtls_transport_internal.h
@@ -23,6 +23,7 @@
#include "p2p/base/ice_transport_internal.h"
#include "p2p/base/packet_transport_internal.h"
#include "rtc_base/constructor_magic.h"
+#include "rtc_base/robo_caller.h"
#include "rtc_base/ssl_certificate.h"
#include "rtc_base/ssl_fingerprint.h"
#include "rtc_base/ssl_stream_adapter.h"
@@ -115,7 +116,7 @@
sigslot::signal2<DtlsTransportInternal*, DtlsTransportState> SignalDtlsState;
// Emitted whenever the Dtls handshake failed on some transport channel.
- sigslot::signal1<rtc::SSLHandshakeError> SignalDtlsHandshakeError;
+ webrtc::RoboCaller<rtc::SSLHandshakeError> SignalDtlsHandshakeError;
protected:
DtlsTransportInternal();
diff --git a/pc/jsep_transport_controller.cc b/pc/jsep_transport_controller.cc
index 4999f2a..8a469e2 100644
--- a/pc/jsep_transport_controller.cc
+++ b/pc/jsep_transport_controller.cc
@@ -462,8 +462,8 @@
this, &JsepTransportController::OnTransportWritableState_n);
dtls->SignalReceivingState.connect(
this, &JsepTransportController::OnTransportReceivingState_n);
- dtls->SignalDtlsHandshakeError.connect(
- this, &JsepTransportController::OnDtlsHandshakeError);
+ dtls->SignalDtlsHandshakeError.AddReceiver(
+ [this](rtc::SSLHandshakeError error) { OnDtlsHandshakeError(error); });
dtls->ice_transport()->SignalGatheringState.connect(
this, &JsepTransportController::OnTransportGatheringState_n);
dtls->ice_transport()->SignalCandidateGathered.connect(
@@ -1154,7 +1154,8 @@
std::string transport_name = transport->transport_name();
invoker_.AsyncInvoke<void>(
RTC_FROM_HERE, signaling_thread_, [this, transport_name, candidate] {
- SignalIceCandidatesGathered(transport_name, {candidate});
+ SignalIceCandidatesGathered.Send(
+ transport_name, std::vector<cricket::Candidate>{candidate});
});
}
@@ -1163,20 +1164,21 @@
const cricket::IceCandidateErrorEvent& event) {
RTC_DCHECK(network_thread_->IsCurrent());
- invoker_.AsyncInvoke<void>(RTC_FROM_HERE, signaling_thread_,
- [this, event] { SignalIceCandidateError(event); });
+ invoker_.AsyncInvoke<void>(RTC_FROM_HERE, signaling_thread_, [this, event] {
+ SignalIceCandidateError.Send(event);
+ });
}
void JsepTransportController::OnTransportCandidatesRemoved_n(
cricket::IceTransportInternal* transport,
const cricket::Candidates& candidates) {
invoker_.AsyncInvoke<void>(
RTC_FROM_HERE, signaling_thread_,
- [this, candidates] { SignalIceCandidatesRemoved(candidates); });
+ [this, candidates] { SignalIceCandidatesRemoved.Send(candidates); });
}
void JsepTransportController::OnTransportCandidatePairChanged_n(
const cricket::CandidatePairChangeEvent& event) {
invoker_.AsyncInvoke<void>(RTC_FROM_HERE, signaling_thread_, [this, event] {
- SignalIceCandidatePairChanged(event);
+ SignalIceCandidatePairChanged.Send(event);
});
}
@@ -1317,14 +1319,14 @@
PeerConnectionInterface::kIceConnectionCompleted) {
// Ensure that we never skip over the "connected" state.
invoker_.AsyncInvoke<void>(RTC_FROM_HERE, signaling_thread_, [this] {
- SignalStandardizedIceConnectionState(
+ SignalStandardizedIceConnectionState.Send(
PeerConnectionInterface::kIceConnectionConnected);
});
}
standardized_ice_connection_state_ = new_ice_connection_state;
invoker_.AsyncInvoke<void>(
RTC_FROM_HERE, signaling_thread_, [this, new_ice_connection_state] {
- SignalStandardizedIceConnectionState(new_ice_connection_state);
+ SignalStandardizedIceConnectionState.Send(new_ice_connection_state);
});
}
@@ -1378,7 +1380,7 @@
combined_connection_state_ = new_combined_state;
invoker_.AsyncInvoke<void>(RTC_FROM_HERE, signaling_thread_,
[this, new_combined_state] {
- SignalConnectionState(new_combined_state);
+ SignalConnectionState.Send(new_combined_state);
});
}
@@ -1392,10 +1394,10 @@
}
if (ice_gathering_state_ != new_gathering_state) {
ice_gathering_state_ = new_gathering_state;
- invoker_.AsyncInvoke<void>(RTC_FROM_HERE, signaling_thread_,
- [this, new_gathering_state] {
- SignalIceGatheringState(new_gathering_state);
- });
+ invoker_.AsyncInvoke<void>(
+ RTC_FROM_HERE, signaling_thread_, [this, new_gathering_state] {
+ SignalIceGatheringState.Send(new_gathering_state);
+ });
}
}
@@ -1408,7 +1410,7 @@
void JsepTransportController::OnDtlsHandshakeError(
rtc::SSLHandshakeError error) {
- SignalDtlsHandshakeError(error);
+ SignalDtlsHandshakeError.Send(error);
}
} // namespace webrtc
diff --git a/pc/jsep_transport_controller.h b/pc/jsep_transport_controller.h
index f3a9294..9ee8aae 100644
--- a/pc/jsep_transport_controller.h
+++ b/pc/jsep_transport_controller.h
@@ -200,31 +200,29 @@
// Else => connecting
RoboCaller<cricket::IceConnectionState> SignalIceConnectionState;
- sigslot::signal1<PeerConnectionInterface::PeerConnectionState>
+ RoboCaller<PeerConnectionInterface::PeerConnectionState>
SignalConnectionState;
- sigslot::signal1<PeerConnectionInterface::IceConnectionState>
+ RoboCaller<PeerConnectionInterface::IceConnectionState>
SignalStandardizedIceConnectionState;
// If all transports done gathering => complete,
// Else if any are gathering => gathering,
// Else => new
- sigslot::signal1<cricket::IceGatheringState> SignalIceGatheringState;
+ RoboCaller<cricket::IceGatheringState> SignalIceGatheringState;
- // (mid, candidates)
- sigslot::signal2<const std::string&, const std::vector<cricket::Candidate>&>
+ // [mid, candidates]
+ RoboCaller<const std::string&, const std::vector<cricket::Candidate>&>
SignalIceCandidatesGathered;
- sigslot::signal1<const cricket::IceCandidateErrorEvent&>
- SignalIceCandidateError;
+ RoboCaller<const cricket::IceCandidateErrorEvent&> SignalIceCandidateError;
- sigslot::signal1<const std::vector<cricket::Candidate>&>
- SignalIceCandidatesRemoved;
+ RoboCaller<const std::vector<cricket::Candidate>&> SignalIceCandidatesRemoved;
- sigslot::signal1<const cricket::CandidatePairChangeEvent&>
+ RoboCaller<const cricket::CandidatePairChangeEvent&>
SignalIceCandidatePairChanged;
- sigslot::signal1<rtc::SSLHandshakeError> SignalDtlsHandshakeError;
+ RoboCaller<rtc::SSLHandshakeError> SignalDtlsHandshakeError;
private:
RTCError ApplyDescription_n(bool local,
diff --git a/pc/jsep_transport_controller_unittest.cc b/pc/jsep_transport_controller_unittest.cc
index 40dc23e..191051a 100644
--- a/pc/jsep_transport_controller_unittest.cc
+++ b/pc/jsep_transport_controller_unittest.cc
@@ -93,14 +93,24 @@
[this](cricket::IceConnectionState s) {
JsepTransportControllerTest::OnConnectionState(s);
});
- transport_controller_->SignalStandardizedIceConnectionState.connect(
- this, &JsepTransportControllerTest::OnStandardizedIceConnectionState);
- transport_controller_->SignalConnectionState.connect(
- this, &JsepTransportControllerTest::OnCombinedConnectionState);
- transport_controller_->SignalIceGatheringState.connect(
- this, &JsepTransportControllerTest::OnGatheringState);
- transport_controller_->SignalIceCandidatesGathered.connect(
- this, &JsepTransportControllerTest::OnCandidatesGathered);
+ transport_controller_->SignalConnectionState.AddReceiver(
+ [this](PeerConnectionInterface::PeerConnectionState s) {
+ JsepTransportControllerTest::OnCombinedConnectionState(s);
+ });
+ transport_controller_->SignalStandardizedIceConnectionState.AddReceiver(
+ [this](PeerConnectionInterface::IceConnectionState s) {
+ JsepTransportControllerTest::OnStandardizedIceConnectionState(s);
+ });
+ transport_controller_->SignalIceGatheringState.AddReceiver(
+ [this](cricket::IceGatheringState s) {
+ JsepTransportControllerTest::OnGatheringState(s);
+ });
+ transport_controller_->SignalIceCandidatesGathered.AddReceiver(
+ [this](const std::string& transport,
+ const std::vector<cricket::Candidate>& candidates) {
+ JsepTransportControllerTest::OnCandidatesGathered(transport,
+ candidates);
+ });
}
std::unique_ptr<cricket::SessionDescription>
diff --git a/pc/peer_connection.cc b/pc/peer_connection.cc
index e4edfcc..5887275 100644
--- a/pc/peer_connection.cc
+++ b/pc/peer_connection.cc
@@ -545,28 +545,52 @@
transport_controller_.reset(new JsepTransportController(
signaling_thread(), network_thread(), port_allocator_.get(),
async_resolver_factory_.get(), config));
- transport_controller_->SignalStandardizedIceConnectionState.connect(
- this, &PeerConnection::SetStandardizedIceConnectionState);
- transport_controller_->SignalConnectionState.connect(
- this, &PeerConnection::SetConnectionState);
- transport_controller_->SignalIceGatheringState.connect(
- this, &PeerConnection::OnTransportControllerGatheringState);
- transport_controller_->SignalIceCandidatesGathered.connect(
- this, &PeerConnection::OnTransportControllerCandidatesGathered);
- transport_controller_->SignalIceCandidateError.connect(
- this, &PeerConnection::OnTransportControllerCandidateError);
- transport_controller_->SignalIceCandidatesRemoved.connect(
- this, &PeerConnection::OnTransportControllerCandidatesRemoved);
- transport_controller_->SignalDtlsHandshakeError.connect(
- this, &PeerConnection::OnTransportControllerDtlsHandshakeError);
- transport_controller_->SignalIceCandidatePairChanged.connect(
- this, &PeerConnection::OnTransportControllerCandidateChanged);
-
transport_controller_->SignalIceConnectionState.AddReceiver(
[this](cricket::IceConnectionState s) {
RTC_DCHECK_RUN_ON(signaling_thread());
OnTransportControllerConnectionState(s);
});
+ transport_controller_->SignalConnectionState.AddReceiver(
+ [this](PeerConnectionInterface::PeerConnectionState s) {
+ RTC_DCHECK_RUN_ON(signaling_thread());
+ SetConnectionState(s);
+ });
+ transport_controller_->SignalStandardizedIceConnectionState.AddReceiver(
+ [this](PeerConnectionInterface::IceConnectionState s) {
+ RTC_DCHECK_RUN_ON(signaling_thread());
+ SetStandardizedIceConnectionState(s);
+ });
+ transport_controller_->SignalIceGatheringState.AddReceiver(
+ [this](cricket::IceGatheringState s) {
+ RTC_DCHECK_RUN_ON(signaling_thread());
+ OnTransportControllerGatheringState(s);
+ });
+ transport_controller_->SignalIceCandidatesGathered.AddReceiver(
+ [this](const std::string& transport,
+ const std::vector<cricket::Candidate>& candidates) {
+ RTC_DCHECK_RUN_ON(signaling_thread());
+ OnTransportControllerCandidatesGathered(transport, candidates);
+ });
+ transport_controller_->SignalIceCandidateError.AddReceiver(
+ [this](const cricket::IceCandidateErrorEvent& event) {
+ RTC_DCHECK_RUN_ON(signaling_thread());
+ OnTransportControllerCandidateError(event);
+ });
+ transport_controller_->SignalIceCandidatesRemoved.AddReceiver(
+ [this](const std::vector<cricket::Candidate>& c) {
+ RTC_DCHECK_RUN_ON(signaling_thread());
+ OnTransportControllerCandidatesRemoved(c);
+ });
+ transport_controller_->SignalIceCandidatePairChanged.AddReceiver(
+ [this](const cricket::CandidatePairChangeEvent& event) {
+ RTC_DCHECK_RUN_ON(signaling_thread());
+ OnTransportControllerCandidateChanged(event);
+ });
+ transport_controller_->SignalDtlsHandshakeError.AddReceiver(
+ [this](rtc::SSLHandshakeError event) {
+ RTC_DCHECK_RUN_ON(signaling_thread());
+ OnTransportControllerDtlsHandshakeError(event);
+ });
stats_.reset(new StatsCollector(this));
stats_collector_ = RTCStatsCollector::Create(this);
diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index 49008a2..a0f659d 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -819,6 +819,7 @@
deps = [
":checks",
":deprecation",
+ ":robo_caller",
":rtc_task_queue",
":stringutils",
"../api:array_view",
diff --git a/rtc_base/openssl_stream_adapter.cc b/rtc_base/openssl_stream_adapter.cc
index 5790b1b..19c6134 100644
--- a/rtc_base/openssl_stream_adapter.cc
+++ b/rtc_base/openssl_stream_adapter.cc
@@ -33,6 +33,7 @@
#include "rtc_base/openssl_adapter.h"
#include "rtc_base/openssl_digest.h"
#include "rtc_base/openssl_identity.h"
+#include "rtc_base/robo_caller.h"
#include "rtc_base/ssl_certificate.h"
#include "rtc_base/stream.h"
#include "rtc_base/task_utils/to_queued_task.h"
@@ -930,7 +931,7 @@
}
RTC_DLOG(LS_VERBOSE) << " -- error " << code << ", " << err_code << ", "
<< ERR_GET_REASON(err_code);
- SignalSSLHandshakeError(ssl_handshake_err);
+ SignalSSLHandshakeError.Send(ssl_handshake_err);
return (ssl_error != 0) ? ssl_error : -1;
}
diff --git a/rtc_base/ssl_stream_adapter.h b/rtc_base/ssl_stream_adapter.h
index 3da0b09..00de4b4 100644
--- a/rtc_base/ssl_stream_adapter.h
+++ b/rtc_base/ssl_stream_adapter.h
@@ -19,10 +19,10 @@
#include "absl/memory/memory.h"
#include "rtc_base/deprecation.h"
+#include "rtc_base/robo_caller.h"
#include "rtc_base/ssl_certificate.h"
#include "rtc_base/ssl_identity.h"
#include "rtc_base/stream.h"
-#include "rtc_base/third_party/sigslot/sigslot.h"
namespace rtc {
@@ -268,7 +268,7 @@
// authentication.
bool GetClientAuthEnabled() const { return client_auth_enabled_; }
- sigslot::signal1<SSLHandshakeError> SignalSSLHandshakeError;
+ webrtc::RoboCaller<SSLHandshakeError> SignalSSLHandshakeError;
private:
// If true (default), the client is required to provide a certificate during
diff --git a/test/peer_scenario/scenario_connection.cc b/test/peer_scenario/scenario_connection.cc
index 92082f5..372ba5e 100644
--- a/test/peer_scenario/scenario_connection.cc
+++ b/test/peer_scenario/scenario_connection.cc
@@ -165,8 +165,12 @@
const std::string& remote_sdp) {
RTC_DCHECK_RUN_ON(signaling_thread_);
remote_description_ = webrtc::CreateSessionDescription(type, remote_sdp);
- jsep_controller_->SignalIceCandidatesGathered.connect(
- this, &ScenarioIceConnectionImpl::OnCandidates);
+ jsep_controller_->SignalIceCandidatesGathered.AddReceiver(
+ [this](const std::string& transport,
+ const std::vector<cricket::Candidate>& candidate) {
+ ScenarioIceConnectionImpl::OnCandidates(transport, candidate);
+ });
+
auto res = jsep_controller_->SetRemoteDescription(
remote_description_->GetType(), remote_description_->description());
RTC_CHECK(res.ok()) << res.message();
