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

[PCLF] Fix deadlock when stats are requested during peer destruction

Browse Source 
Bug: b/238308795
Change-Id: If420846a73df22ed07184d1803bf35295a88ecff
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/268148
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Artem Titov <titovartem@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#37491}
This commit is contained in:
Artem Titov 2022-07-07 17:00:26 +02:00 committed by WebRTC LUCI CQ
parent dd4884dfb2
commit 9f1104731e
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/pc/e2e/BUILD.gn
View File

@ -236,6 +236,7 @@ if (!build_with_chromium) {
"../../../api:peer_connection_quality_test_fixture_api",
"../../../api:scoped_refptr",
"../../../api:sequence_checker",
"../../../api/task_queue:pending_task_safety_flag",
"../../../modules/audio_processing:api",
"../../../pc:peerconnection_wrapper",
"../../../rtc_base:logging",

11
test/pc/e2e/test_peer.cc
View File

@ -75,6 +75,12 @@ void TestPeer::SetVideoSubscription(VideoSubscription subscription) {
configurable_params_.video_subscription = std::move(subscription);
}
void TestPeer::GetStats(RTCStatsCollectorCallback* callback) {
pc()->signaling_thread()->PostTask(
SafeTask(signaling_thread_task_safety_,
[this, callback]() { pc()->GetStats(callback); }));
}
bool TestPeer::SetRemoteDescription(
std::unique_ptr<SessionDescriptionInterface> desc,
std::string* error_out) {
@ -115,6 +121,7 @@ bool TestPeer::AddIceCandidates(
}
void TestPeer::Close() {
signaling_thread_task_safety_->SetNotAlive();
wrapper_->pc()->Close();
remote_ice_candidates_.clear();
audio_processing_ = nullptr;
@ -139,7 +146,9 @@ TestPeer::TestPeer(
std::move(pc),
std::move(observer))),
video_sources_(std::move(video_sources)),
audio_processing_(audio_processing) {}
audio_processing_(audio_processing) {
signaling_thread_task_safety_ = PendingTaskSafetyFlag::CreateDetached();
}
} // namespace webrtc_pc_e2e
} // namespace webrtc

10
test/pc/e2e/test_peer.h
View File

@ -20,6 +20,7 @@
#include "api/scoped_refptr.h"
#include "api/sequence_checker.h"
#include "api/set_remote_description_observer_interface.h"
#include "api/task_queue/pending_task_safety_flag.h"
#include "api/test/frame_generator_interface.h"
#include "api/test/peerconnection_quality_test_fixture.h"
#include "pc/peer_connection_wrapper.h"
@ -47,9 +48,7 @@ class TestPeer final : public StatsProvider {
void SetVideoSubscription(
PeerConnectionE2EQualityTestFixture::VideoSubscription subscription);
void GetStats(RTCStatsCollectorCallback* callback) override {
pc()->GetStats(callback);
}
void GetStats(RTCStatsCollectorCallback* callback) override;
PeerConfigurerImpl::VideoSource ReleaseVideoSource(size_t i) {
RTC_CHECK(wrapper_) << "TestPeer is already closed";
@ -168,6 +167,11 @@ class TestPeer final : public StatsProvider {
mutable Mutex mutex_;
ConfigurableParams configurable_params_ RTC_GUARDED_BY(mutex_);
// Safety flag to protect all tasks posted on the signaling thread to not be
// executed after `wrapper_` object is destructed.
rtc::scoped_refptr<PendingTaskSafetyFlag> signaling_thread_task_safety_ =
nullptr;
// Keeps ownership of worker thread. It has to be destroyed after `wrapper_`.
std::unique_ptr<rtc::Thread> worker_thread_;
std::unique_ptr<PeerConnectionWrapper> wrapper_;