admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disallow invokes from network thread to itself

Browse Source 
https://webrtc-review.googlesource.com/c/src/+/265060 removed the last
case the network thread invokes itself, now we can use
DisallowAllInvokes on the network thread.

Bug: webrtc:12802
Change-Id: I262d65bb557e2976bab5b0d9e73756222b4e02ef
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/266100
Commit-Queue: Daniel.L (Byoungchan) Lee <daniel.l@hpcnt.com>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#37251}
This commit is contained in:
Byoungchan Lee 2022-06-17 17:29:03 +09:00 committed by WebRTC LUCI CQ
parent ef9bcd17a5
commit 142104183d
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pc/connection_context.cc
View File

@ -12,6 +12,7 @@
#include <type_traits>
#include <utility>
#include <vector>
#include "api/task_queue/to_queued_task.h"
#include "api/transport/field_trial_based_config.h"
@ -106,21 +107,25 @@ ConnectionContext::ConnectionContext(
MaybeCreateSctpFactory(std::move(dependencies->sctp_factory),
network_thread(),
*trials_.get())) {
RTC_DCHECK_RUN_ON(signaling_thread_);
signaling_thread_->AllowInvokesToThread(worker_thread());
signaling_thread_->AllowInvokesToThread(network_thread_);
worker_thread_->AllowInvokesToThread(network_thread_);
if (network_thread_->IsCurrent()) {
// TODO(https://crbug.com/webrtc/12802) switch to DisallowAllInvokes
network_thread_->AllowInvokesToThread(network_thread_);
} else {
network_thread_->PostTask(ToQueuedTask([thread = network_thread_] {
if (!network_thread_->IsCurrent()) {
// network_thread_->IsCurrent() == true means signaling_thread_ is
// network_thread_. In this case, no further action is required as
// signaling_thread_ can already invoke network_thread_.
network_thread_->PostTask(ToQueuedTask(
[thread = network_thread_, worker_thread = worker_thread_.get()] {
thread->DisallowBlockingCalls();
// TODO(https://crbug.com/webrtc/12802) switch to DisallowAllInvokes
thread->DisallowAllInvokes();
if (worker_thread == thread) {
// In this case, worker_thread_ == network_thread_
thread->AllowInvokesToThread(thread);
}
}));
}
RTC_DCHECK_RUN_ON(signaling_thread_);
rtc::InitRandom(rtc::Time32());
rtc::SocketFactory* socket_factory = dependencies->socket_factory;