This reverts commit fe53fec24e02d2d644220f913c3f9ae596bbb2d9. Reason for revert: Speculative revert, may be breaking downstream project Original change's description: > [DataChannel] Send and receive packets on the network thread. > > This updates sctp channels, including work that happens between the > data channel controller and the transport, to run on the network > thread. Previously all network traffic related to data channels was > routed through the signaling thread before going to either the network > thread or the caller's thread (e.g. js thread in chrome). Now the > calls can go straight from the network thread to the JS thread with > enabling a special flag on the observer (see below) and similarly > calls to send data, involve 2 threads instead of 3. > > * Custom data channel observer adapter implementation that > maintains compatibility with existing observer implementations in > that notifications are delivered on the signaling thread. > The adapter can be explicitly disabled for implementations that > want to optimize the callback path and promise to not block the > network thread. > * Remove the signaling thread copy of data channels in the controller. > * Remove several PostTask operations that were needed to keep things > in sync (but the need has gone away). > * Update tests for the controller to consistently call > TeardownDataChannelTransport_n to match with production. > * Update stats collectors (current and legacy) to fetch the data > channel stats on the network thread where they're maintained. > * Remove the AsyncChannelCloseTeardown test since the async teardown > step has gone away. > * Remove `sid_s` in the channel code since we only need the network > state now. > * For the custom observer support (with and without data adapter) and > maintain compatibility with existing implementations, added a new > proxy macro that allows an implementation to selectively provide > its own implementation without being proxied. This is used for > registering/unregistering a data channel observer. > * Update the data channel proxy to map most methods to the network > thread, avoiding the interim jump to the signaling thread. > * Update a plethora of thread checkers from signaling to network. > > Bug: webrtc:11547 > Change-Id: Ib4cff1482e31c46008e187189a79e967389bc518 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/299142 > Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org> > Reviewed-by: Henrik Boström <hbos@webrtc.org> > Cr-Commit-Position: refs/heads/main@{#39760} Bug: webrtc:11547 Change-Id: Id0d65594bf727ccea5c49093c942b09714d101ad No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/300341 Auto-Submit: Andrey Logvin <landrey@webrtc.org> Owners-Override: Andrey Logvin <landrey@webrtc.org> Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/main@{#39764}
196 lines
6.6 KiB
C++
196 lines
6.6 KiB
C++
/*
|
|
* Copyright 2013 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 PC_TEST_FAKE_DATA_CHANNEL_CONTROLLER_H_
|
|
#define PC_TEST_FAKE_DATA_CHANNEL_CONTROLLER_H_
|
|
|
|
#include <set>
|
|
#include <string>
|
|
#include <utility>
|
|
|
|
#include "pc/sctp_data_channel.h"
|
|
#include "rtc_base/checks.h"
|
|
#include "rtc_base/weak_ptr.h"
|
|
|
|
class FakeDataChannelController
|
|
: public webrtc::SctpDataChannelControllerInterface {
|
|
public:
|
|
explicit FakeDataChannelController(rtc::Thread* network_thread)
|
|
: signaling_thread_(rtc::Thread::Current()),
|
|
network_thread_(network_thread),
|
|
send_blocked_(false),
|
|
transport_available_(false),
|
|
ready_to_send_(false),
|
|
transport_error_(false) {}
|
|
virtual ~FakeDataChannelController() {}
|
|
|
|
rtc::WeakPtr<FakeDataChannelController> weak_ptr() {
|
|
return weak_factory_.GetWeakPtr();
|
|
}
|
|
|
|
rtc::scoped_refptr<webrtc::SctpDataChannel> CreateDataChannel(
|
|
absl::string_view label,
|
|
webrtc::InternalDataChannelInit init) {
|
|
rtc::WeakPtr<FakeDataChannelController> my_weak_ptr = weak_ptr();
|
|
// Explicitly associate the weak ptr instance with the current thread to
|
|
// catch early any inappropriate referencing of it on the network thread.
|
|
RTC_CHECK(my_weak_ptr);
|
|
|
|
rtc::scoped_refptr<webrtc::SctpDataChannel> channel =
|
|
network_thread_->BlockingCall([&]() {
|
|
RTC_DCHECK_RUN_ON(network_thread_);
|
|
rtc::scoped_refptr<webrtc::SctpDataChannel> channel =
|
|
webrtc::SctpDataChannel::Create(
|
|
std::move(my_weak_ptr), std::string(label),
|
|
transport_available_, init, signaling_thread_,
|
|
network_thread_);
|
|
if (transport_available_ && channel->sid_n().HasValue()) {
|
|
AddSctpDataStream(channel->sid_n());
|
|
}
|
|
return channel;
|
|
});
|
|
if (ready_to_send_) {
|
|
signaling_thread_->PostTask(
|
|
SafeTask(signaling_safety_.flag(), [channel = channel] {
|
|
if (channel->state() !=
|
|
webrtc::DataChannelInterface::DataState::kClosed) {
|
|
channel->OnTransportReady();
|
|
}
|
|
}));
|
|
}
|
|
connected_channels_.insert(channel.get());
|
|
return channel;
|
|
}
|
|
|
|
webrtc::RTCError SendData(webrtc::StreamId sid,
|
|
const webrtc::SendDataParams& params,
|
|
const rtc::CopyOnWriteBuffer& payload) override {
|
|
RTC_CHECK(ready_to_send_);
|
|
RTC_CHECK(transport_available_);
|
|
if (send_blocked_) {
|
|
return webrtc::RTCError(webrtc::RTCErrorType::RESOURCE_EXHAUSTED);
|
|
}
|
|
|
|
if (transport_error_) {
|
|
return webrtc::RTCError(webrtc::RTCErrorType::INTERNAL_ERROR);
|
|
}
|
|
|
|
last_sid_ = sid.stream_id_int();
|
|
last_send_data_params_ = params;
|
|
return webrtc::RTCError::OK();
|
|
}
|
|
|
|
void AddSctpDataStream(webrtc::StreamId sid) override {
|
|
RTC_DCHECK_RUN_ON(network_thread_);
|
|
RTC_CHECK(sid.HasValue());
|
|
if (!transport_available_) {
|
|
return;
|
|
}
|
|
known_stream_ids_.insert(sid);
|
|
}
|
|
|
|
void RemoveSctpDataStream(webrtc::StreamId sid) override {
|
|
RTC_DCHECK_RUN_ON(network_thread_);
|
|
RTC_CHECK(sid.HasValue());
|
|
known_stream_ids_.erase(sid);
|
|
signaling_thread_->PostTask(SafeTask(signaling_safety_.flag(), [this, sid] {
|
|
// Unlike the real SCTP transport, act like the closing procedure finished
|
|
// instantly.
|
|
auto it = absl::c_find_if(connected_channels_, [&](const auto* c) {
|
|
return c->sid_s() == sid;
|
|
});
|
|
// This path mimics the DCC's OnChannelClosed handler since the FDCC
|
|
// (this class) doesn't have a transport that would do that.
|
|
if (it != connected_channels_.end())
|
|
(*it)->OnClosingProcedureComplete();
|
|
}));
|
|
}
|
|
|
|
void OnChannelStateChanged(
|
|
webrtc::SctpDataChannel* data_channel,
|
|
webrtc::DataChannelInterface::DataState state) override {
|
|
if (state == webrtc::DataChannelInterface::DataState::kOpen) {
|
|
++channels_opened_;
|
|
} else if (state == webrtc::DataChannelInterface::DataState::kClosed) {
|
|
++channels_closed_;
|
|
connected_channels_.erase(data_channel);
|
|
}
|
|
}
|
|
|
|
// Set true to emulate the SCTP stream being blocked by congestion control.
|
|
void set_send_blocked(bool blocked) {
|
|
send_blocked_ = blocked;
|
|
if (!blocked) {
|
|
RTC_CHECK(transport_available_);
|
|
// Make a copy since `connected_channels_` may change while
|
|
// OnTransportReady is called.
|
|
auto copy = connected_channels_;
|
|
for (webrtc::SctpDataChannel* ch : copy) {
|
|
ch->OnTransportReady();
|
|
}
|
|
}
|
|
}
|
|
|
|
// Set true to emulate the transport channel creation, e.g. after
|
|
// setLocalDescription/setRemoteDescription called with data content.
|
|
void set_transport_available(bool available) {
|
|
transport_available_ = available;
|
|
}
|
|
|
|
// Set true to emulate the transport OnTransportReady signal when the
|
|
// transport becomes writable for the first time.
|
|
void set_ready_to_send(bool ready) {
|
|
RTC_CHECK(transport_available_);
|
|
ready_to_send_ = ready;
|
|
if (ready) {
|
|
std::set<webrtc::SctpDataChannel*>::iterator it;
|
|
for (it = connected_channels_.begin(); it != connected_channels_.end();
|
|
++it) {
|
|
(*it)->OnTransportReady();
|
|
}
|
|
}
|
|
}
|
|
|
|
void set_transport_error() { transport_error_ = true; }
|
|
|
|
int last_sid() const { return last_sid_; }
|
|
const webrtc::SendDataParams& last_send_data_params() const {
|
|
return last_send_data_params_;
|
|
}
|
|
|
|
bool IsConnected(webrtc::SctpDataChannel* data_channel) const {
|
|
return connected_channels_.find(data_channel) != connected_channels_.end();
|
|
}
|
|
|
|
bool IsStreamAdded(webrtc::StreamId id) const {
|
|
return known_stream_ids_.find(id) != known_stream_ids_.end();
|
|
}
|
|
|
|
int channels_opened() const { return channels_opened_; }
|
|
int channels_closed() const { return channels_closed_; }
|
|
|
|
private:
|
|
rtc::Thread* const signaling_thread_;
|
|
rtc::Thread* const network_thread_;
|
|
int last_sid_;
|
|
webrtc::SendDataParams last_send_data_params_;
|
|
bool send_blocked_;
|
|
bool transport_available_;
|
|
bool ready_to_send_;
|
|
bool transport_error_;
|
|
int channels_closed_ = 0;
|
|
int channels_opened_ = 0;
|
|
std::set<webrtc::SctpDataChannel*> connected_channels_;
|
|
std::set<webrtc::StreamId> known_stream_ids_;
|
|
rtc::WeakPtrFactory<FakeDataChannelController> weak_factory_{this};
|
|
webrtc::ScopedTaskSafety signaling_safety_;
|
|
};
|
|
#endif // PC_TEST_FAKE_DATA_CHANNEL_CONTROLLER_H_
|