dcsctp: Relax thread sequence checker
The DcSctpSocket is thread compatible. As long as you serialize accesses to it - either by calling it from the same thread, or using some kind of concurrency primitive (e.g. mutex) to avoid calling the API methods from different threads concurrently, it's fine. Using the sequence checker, we can verify that the socket is called from the thread it was created on, or from the same task queue. This provided a more strict verification, as it didn't allow e.g. creating a socket on one thread, and then handing it to a different thread where it was used. Nor did it allow having multiple threads use it, protecting any calls to it using an external mutex. One can avoid these checks using webrtc::CurrentTaskQueueSetter to allow the sequence checker to believe it's running where it's not running, but this is a hack. This CL removes the sequence checker in the socket, to simplify using it in environments that don't use task queues for synchronization. Since it is still kept in dcsctp::TaskQueueTimeoutFactory, it's still used in all environments where the task queue is used (e.g. Chrome). This makes it easier to use dcSCTP without WebRTC. Bug: None Change-Id: I2674d7cd902bad45ed3d0816c908ecf3ee971727 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/333801 Reviewed-by: Florent Castelli <orphis@webrtc.org> Commit-Queue: Victor Boivie <boivie@webrtc.org> Cr-Commit-Position: refs/heads/main@{#41482}
This commit is contained in:
parent
9702f6c9fb
commit
6791c9d17e
@ -140,7 +140,6 @@ rtc_library("dcsctp_socket") {
|
||||
"../../../api:make_ref_counted",
|
||||
"../../../api:refcountedbase",
|
||||
"../../../api:scoped_refptr",
|
||||
"../../../api:sequence_checker",
|
||||
"../../../api/task_queue:task_queue",
|
||||
"../../../rtc_base:checks",
|
||||
"../../../rtc_base:logging",
|
||||
|
||||
@ -297,7 +297,6 @@ void DcSctpSocket::SendInit() {
|
||||
}
|
||||
|
||||
void DcSctpSocket::Connect() {
|
||||
RTC_DCHECK_RUN_ON(&thread_checker_);
|
||||
CallbackDeferrer::ScopedDeferrer deferrer(callbacks_);
|
||||
|
||||
if (state_ == State::kClosed) {
|
||||
@ -343,7 +342,6 @@ void DcSctpSocket::CreateTransmissionControlBlock(
|
||||
}
|
||||
|
||||
void DcSctpSocket::RestoreFromState(const DcSctpSocketHandoverState& state) {
|
||||
RTC_DCHECK_RUN_ON(&thread_checker_);
|
||||
CallbackDeferrer::ScopedDeferrer deferrer(callbacks_);
|
||||
|
||||
if (state_ != State::kClosed) {
|
||||
@ -386,7 +384,6 @@ void DcSctpSocket::RestoreFromState(const DcSctpSocketHandoverState& state) {
|
||||
}
|
||||
|
||||
void DcSctpSocket::Shutdown() {
|
||||
RTC_DCHECK_RUN_ON(&thread_checker_);
|
||||
CallbackDeferrer::ScopedDeferrer deferrer(callbacks_);
|
||||
|
||||
if (tcb_ != nullptr) {
|
||||
@ -415,7 +412,6 @@ void DcSctpSocket::Shutdown() {
|
||||
}
|
||||
|
||||
void DcSctpSocket::Close() {
|
||||
RTC_DCHECK_RUN_ON(&thread_checker_);
|
||||
CallbackDeferrer::ScopedDeferrer deferrer(callbacks_);
|
||||
|
||||
if (state_ != State::kClosed) {
|
||||
@ -463,17 +459,14 @@ void DcSctpSocket::InternalClose(ErrorKind error, absl::string_view message) {
|
||||
|
||||
void DcSctpSocket::SetStreamPriority(StreamID stream_id,
|
||||
StreamPriority priority) {
|
||||
RTC_DCHECK_RUN_ON(&thread_checker_);
|
||||
send_queue_.SetStreamPriority(stream_id, priority);
|
||||
}
|
||||
StreamPriority DcSctpSocket::GetStreamPriority(StreamID stream_id) const {
|
||||
RTC_DCHECK_RUN_ON(&thread_checker_);
|
||||
return send_queue_.GetStreamPriority(stream_id);
|
||||
}
|
||||
|
||||
SendStatus DcSctpSocket::Send(DcSctpMessage message,
|
||||
const SendOptions& send_options) {
|
||||
RTC_DCHECK_RUN_ON(&thread_checker_);
|
||||
CallbackDeferrer::ScopedDeferrer deferrer(callbacks_);
|
||||
SendStatus send_status = InternalSend(message, send_options);
|
||||
if (send_status != SendStatus::kSuccess)
|
||||
@ -490,7 +483,6 @@ SendStatus DcSctpSocket::Send(DcSctpMessage message,
|
||||
std::vector<SendStatus> DcSctpSocket::SendMany(
|
||||
rtc::ArrayView<DcSctpMessage> messages,
|
||||
const SendOptions& send_options) {
|
||||
RTC_DCHECK_RUN_ON(&thread_checker_);
|
||||
CallbackDeferrer::ScopedDeferrer deferrer(callbacks_);
|
||||
Timestamp now = callbacks_.Now();
|
||||
std::vector<SendStatus> send_statuses;
|
||||
@ -554,7 +546,6 @@ SendStatus DcSctpSocket::InternalSend(const DcSctpMessage& message,
|
||||
|
||||
ResetStreamsStatus DcSctpSocket::ResetStreams(
|
||||
rtc::ArrayView<const StreamID> outgoing_streams) {
|
||||
RTC_DCHECK_RUN_ON(&thread_checker_);
|
||||
CallbackDeferrer::ScopedDeferrer deferrer(callbacks_);
|
||||
|
||||
if (tcb_ == nullptr) {
|
||||
@ -576,7 +567,6 @@ ResetStreamsStatus DcSctpSocket::ResetStreams(
|
||||
}
|
||||
|
||||
SocketState DcSctpSocket::state() const {
|
||||
RTC_DCHECK_RUN_ON(&thread_checker_);
|
||||
switch (state_) {
|
||||
case State::kClosed:
|
||||
return SocketState::kClosed;
|
||||
@ -594,29 +584,23 @@ SocketState DcSctpSocket::state() const {
|
||||
}
|
||||
|
||||
void DcSctpSocket::SetMaxMessageSize(size_t max_message_size) {
|
||||
RTC_DCHECK_RUN_ON(&thread_checker_);
|
||||
options_.max_message_size = max_message_size;
|
||||
}
|
||||
|
||||
size_t DcSctpSocket::buffered_amount(StreamID stream_id) const {
|
||||
RTC_DCHECK_RUN_ON(&thread_checker_);
|
||||
return send_queue_.buffered_amount(stream_id);
|
||||
}
|
||||
|
||||
size_t DcSctpSocket::buffered_amount_low_threshold(StreamID stream_id) const {
|
||||
RTC_DCHECK_RUN_ON(&thread_checker_);
|
||||
return send_queue_.buffered_amount_low_threshold(stream_id);
|
||||
}
|
||||
|
||||
void DcSctpSocket::SetBufferedAmountLowThreshold(StreamID stream_id,
|
||||
size_t bytes) {
|
||||
RTC_DCHECK_RUN_ON(&thread_checker_);
|
||||
send_queue_.SetBufferedAmountLowThreshold(stream_id, bytes);
|
||||
}
|
||||
|
||||
absl::optional<Metrics> DcSctpSocket::GetMetrics() const {
|
||||
RTC_DCHECK_RUN_ON(&thread_checker_);
|
||||
|
||||
if (tcb_ == nullptr) {
|
||||
return absl::nullopt;
|
||||
}
|
||||
@ -771,7 +755,6 @@ bool DcSctpSocket::ValidatePacket(const SctpPacket& packet) {
|
||||
}
|
||||
|
||||
void DcSctpSocket::HandleTimeout(TimeoutID timeout_id) {
|
||||
RTC_DCHECK_RUN_ON(&thread_checker_);
|
||||
CallbackDeferrer::ScopedDeferrer deferrer(callbacks_);
|
||||
|
||||
timer_manager_.HandleTimeout(timeout_id);
|
||||
@ -785,7 +768,6 @@ void DcSctpSocket::HandleTimeout(TimeoutID timeout_id) {
|
||||
}
|
||||
|
||||
void DcSctpSocket::ReceivePacket(rtc::ArrayView<const uint8_t> data) {
|
||||
RTC_DCHECK_RUN_ON(&thread_checker_);
|
||||
CallbackDeferrer::ScopedDeferrer deferrer(callbacks_);
|
||||
|
||||
++metrics_.rx_packets_count;
|
||||
@ -1789,7 +1771,6 @@ void DcSctpSocket::SendShutdownAck() {
|
||||
}
|
||||
|
||||
HandoverReadinessStatus DcSctpSocket::GetHandoverReadiness() const {
|
||||
RTC_DCHECK_RUN_ON(&thread_checker_);
|
||||
HandoverReadinessStatus status;
|
||||
if (state_ != State::kClosed && state_ != State::kEstablished) {
|
||||
status.Add(HandoverUnreadinessReason::kWrongConnectionState);
|
||||
@ -1803,7 +1784,6 @@ HandoverReadinessStatus DcSctpSocket::GetHandoverReadiness() const {
|
||||
|
||||
absl::optional<DcSctpSocketHandoverState>
|
||||
DcSctpSocket::GetHandoverStateAndClose() {
|
||||
RTC_DCHECK_RUN_ON(&thread_checker_);
|
||||
CallbackDeferrer::ScopedDeferrer deferrer(callbacks_);
|
||||
|
||||
if (!GetHandoverReadiness().IsReady()) {
|
||||
|
||||
@ -18,7 +18,6 @@
|
||||
|
||||
#include "absl/strings/string_view.h"
|
||||
#include "api/array_view.h"
|
||||
#include "api/sequence_checker.h"
|
||||
#include "net/dcsctp/packet/chunk/abort_chunk.h"
|
||||
#include "net/dcsctp/packet/chunk/chunk.h"
|
||||
#include "net/dcsctp/packet/chunk/cookie_ack_chunk.h"
|
||||
@ -271,7 +270,6 @@ class DcSctpSocket : public DcSctpSocketInterface {
|
||||
|
||||
const std::string log_prefix_;
|
||||
const std::unique_ptr<PacketObserver> packet_observer_;
|
||||
RTC_NO_UNIQUE_ADDRESS webrtc::SequenceChecker thread_checker_;
|
||||
Metrics metrics_;
|
||||
DcSctpOptions options_;
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user