zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make RtcpTransceiver destructor non-blocking

Browse Source 
At cost of removing assumption callbacks can't be used after destructor.

Bug: webrtc:8239
Change-Id: Id79f7553528cf6c102d3ee0bf7aa2de5b0437d2a
Reviewed-on: https://webrtc-review.googlesource.com/98860
Reviewed-by: Per Kjellander <perkj@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24632}
This commit is contained in:
Danil Chapovalov
2018-09-07 13:03:32 +02:00
committed by Commit Bot
parent d7027dc081
commit 792df6b4b9
3 changed files with 51 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
modules/rtp_rtcp/source/rtcp_transceiver_unittest.cc
View File

@ -47,8 +47,8 @@ void WaitPostedTasks(rtc::TaskQueue* queue) {
}
TEST(RtcpTransceiverTest, SendsRtcpOnTaskQueueWhenCreatedOffTaskQueue) {
rtc::TaskQueue queue("rtcp");
MockTransport outgoing_transport;
rtc::TaskQueue queue("rtcp");
RtcpTransceiverConfig config;
config.outgoing_transport = &outgoing_transport;
config.task_queue = &queue;
@ -64,8 +64,8 @@ TEST(RtcpTransceiverTest, SendsRtcpOnTaskQueueWhenCreatedOffTaskQueue) {
}
TEST(RtcpTransceiverTest, SendsRtcpOnTaskQueueWhenCreatedOnTaskQueue) {
rtc::TaskQueue queue("rtcp");
MockTransport outgoing_transport;
rtc::TaskQueue queue("rtcp");
RtcpTransceiverConfig config;
config.outgoing_transport = &outgoing_transport;
config.task_queue = &queue;
@ -83,39 +83,62 @@ TEST(RtcpTransceiverTest, SendsRtcpOnTaskQueueWhenCreatedOnTaskQueue) {
WaitPostedTasks(&queue);
}
TEST(RtcpTransceiverTest, CanBeDestroyedOnTaskQueueAfterStop) {
rtc::TaskQueue queue("rtcp");
TEST(RtcpTransceiverTest, CanBeDestroyedOnTaskQueue) {
NiceMock<MockTransport> outgoing_transport;
rtc::TaskQueue queue("rtcp");
RtcpTransceiverConfig config;
config.outgoing_transport = &outgoing_transport;
config.task_queue = &queue;
auto rtcp_transceiver = absl::make_unique<RtcpTransceiver>(config);
rtcp_transceiver->Stop(rtc::NewClosure([] {}));
queue.PostTask([&] { rtcp_transceiver.reset(); });
queue.PostTask([&] {
// Insert a packet just before destruction to test for races.
rtcp_transceiver->SendCompoundPacket();
rtcp_transceiver.reset();
});
WaitPostedTasks(&queue);
}
TEST(RtcpTransceiverTest, CanBeDestroyedWithoutBlockingAfterStop) {
TEST(RtcpTransceiverTest, CanBeDestroyedWithoutBlocking) {
rtc::TaskQueue queue("rtcp");
NiceMock<MockTransport> outgoing_transport;
RtcpTransceiverConfig config;
config.outgoing_transport = &outgoing_transport;
config.task_queue = &queue;
auto rtcp_transceiver = absl::make_unique<RtcpTransceiver>(config);
auto* rtcp_transceiver = new RtcpTransceiver(config);
rtcp_transceiver->SendCompoundPacket();
rtc::Event heavy_task(false, false);
queue.PostTask(
rtc::NewClosure([&] { EXPECT_TRUE(heavy_task.Wait(kTimeoutMs)); }));
rtc::Event done(false, false);
rtcp_transceiver->Stop(rtc::NewClosure([&done] { done.Set(); }));
rtcp_transceiver = nullptr;
rtc::Event heavy_task(false, false);
queue.PostTask([&] {
EXPECT_TRUE(heavy_task.Wait(kTimeoutMs));
done.Set();
});
delete rtcp_transceiver;
heavy_task.Set();
EXPECT_TRUE(done.Wait(kTimeoutMs));
}
TEST(RtcpTransceiverTest, MaySendPacketsAfterDestructor) { // i.e. Be careful!
NiceMock<MockTransport> outgoing_transport; // Must outlive queue below.
rtc::TaskQueue queue("rtcp");
RtcpTransceiverConfig config;
config.outgoing_transport = &outgoing_transport;
config.task_queue = &queue;
auto* rtcp_transceiver = new RtcpTransceiver(config);
rtc::Event heavy_task(false, false);
queue.PostTask([&] { EXPECT_TRUE(heavy_task.Wait(kTimeoutMs)); });
rtcp_transceiver->SendCompoundPacket();
delete rtcp_transceiver;
EXPECT_CALL(outgoing_transport, SendRtcp);
heavy_task.Set();
WaitPostedTasks(&queue);
}
// Use rtp timestamp to distinguish different incoming sender reports.
rtc::CopyOnWriteBuffer CreateSenderReport(uint32_t ssrc, uint32_t rtp_time) {
webrtc::rtcp::SenderReport sr;