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

27
modules/rtp_rtcp/source/rtcp_transceiver.cc
View File

@ -19,6 +19,12 @@
#include "rtc_base/timeutils.h"
namespace webrtc {
namespace {
struct Destructor {
void operator()() { rtcp_transceiver = nullptr; }
std::unique_ptr<RtcpTransceiverImpl> rtcp_transceiver;
};
} // namespace
RtcpTransceiver::RtcpTransceiver(const RtcpTransceiverConfig& config)
: task_queue_(config.task_queue),
@ -29,29 +35,12 @@ RtcpTransceiver::RtcpTransceiver(const RtcpTransceiverConfig& config)
RtcpTransceiver::~RtcpTransceiver() {
if (!rtcp_transceiver_)
return;
RTC_CHECK(!task_queue_->IsCurrent());
rtc::Event done(false, false);
// TODO(danilchap): Merge cleanup into main closure when task queue does not
// silently drop tasks.
task_queue_->PostTask(rtc::NewClosure(
[this] {
// Destructor steps that better run on the task_queue_.
rtcp_transceiver_.reset();
},
/*cleanup=*/[&done] { done.Set(); }));
// Wait until destruction is complete to guarantee callbacks are not used
// after destructor returns.
done.Wait(rtc::Event::kForever);
RTC_CHECK(!rtcp_transceiver_) << "Task queue is too busy to handle rtcp";
task_queue_->PostTask(Destructor{std::move(rtcp_transceiver_)});
RTC_DCHECK(!rtcp_transceiver_);
}
void RtcpTransceiver::Stop(std::unique_ptr<rtc::QueuedTask> on_destroyed) {
RTC_DCHECK(rtcp_transceiver_);
struct Destructor {
void operator()() { rtcp_transceiver = nullptr; }
std::unique_ptr<RtcpTransceiverImpl> rtcp_transceiver;
};
task_queue_->PostTaskAndReply(Destructor{std::move(rtcp_transceiver_)},
std::move(on_destroyed));
RTC_DCHECK(!rtcp_transceiver_);