Issue 1409133006: Make SendStatisticsProxy outlive ViEChannel.

Issue 1409133006: Make SendStatisticsProxy outlive ViEChannel. (Closed)

Created:
5 years, 1 month ago by pbos-webrtc

Modified:
5 years, 1 month ago

Reviewers:
mflodman

CC:
webrtc-reviews_webrtc.org, yujie_mao (webrtc), stefan-webrtc, tterriberry_mozilla.com, andresp, the sun, perkj_webrtc, mflodman

Base URL:
https://chromium.googlesource.com/external/webrtc.git@master

Target Ref:
refs/pending/heads/master

Project:
webrtc

Visibility:
Public.

More Reviews

Description

Make SendStatisticsProxy outlive ViEChannel. Prevents data race on stats_proxy_ on VideoSendStream destruction. BUG= TBR=mflodman@webrtc.org Committed: https://crrev.com/373284da06631c33a01fee6d755355cabeadf6c6 Cr-Commit-Position: refs/heads/master@{#10493}

Patch Set 1 #

Created: 5 years, 1 month ago

Download [raw] [tar.bz2]

		Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+5 lines, -5 lines)			Patch
	M	webrtc/video/video_send_stream.h	View		2 chunks	+2 lines, -2 lines	0 comments	Download
	M	webrtc/video/video_send_stream.cc	View		2 chunks	+3 lines, -3 lines	0 comments	Download

Messages

Total messages: 4 (0 generated)

Expand Messages | Collapse Messages

pbos-webrtc

On 2015/11/03 12:42:07, pbos-webrtc wrote: > PTAL, landing since this breaks tsan2. Example break report: ...

5 years, 1 month ago (2015-11-03 12:42:23 UTC) #2

On 2015/11/03 12:42:07, pbos-webrtc wrote:
> PTAL, landing since this breaks tsan2.

Example break report:

==================
WARNING: ThreadSanitizer: data race (pid=17843)
  Write of size 8 at 0x7d3800006f20 by main thread:
    #0 operator delete(void*) <null> (video_engine_tests+0x0000004b1e0b)
    #1 __deallocate
chromium/src/buildtools/third_party/libc++/trunk/include/new:164:3
(video_engine_tests+0x000000507e9a)
    #2 deallocate
chromium/src/buildtools/third_party/libc++/trunk/include/memory:1636
(video_engine_tests+0x000000507e9a)
    #3 deallocate
chromium/src/buildtools/third_party/libc++/trunk/include/memory:1447
(video_engine_tests+0x000000507e9a)
    #4 std::__1::__tree<std::__1::__value_type<unsigned int,
webrtc::VideoSendStream::StreamStats>, std::__1::__map_value_compare<unsigned
int, std::__1::__value_type<unsigned int, webrtc::VideoSendStream::StreamStats>,
std::__1::less<unsigned int>, true>,
std::__1::allocator<std::__1::__value_type<unsigned int,
webrtc::VideoSendStream::StreamStats> >
>::destroy(std::__1::__tree_node<std::__1::__value_type<unsigned int,
webrtc::VideoSendStream::StreamStats>, void*>*)
chromium/src/buildtools/third_party/libc++/trunk/include/__tree:1446
(video_engine_tests+0x000000507e9a)
    #5 ~__tree
chromium/src/buildtools/third_party/libc++/trunk/include/__tree:1433:5
(video_engine_tests+0x0000006141b8)
    #6 ~map chromium/src/buildtools/third_party/libc++/trunk/include/map:783
(video_engine_tests+0x0000006141b8)
    #7 ~Stats webrtc/video_send_stream.h:64 (video_engine_tests+0x0000006141b8)
    #8 webrtc::SendStatisticsProxy::~SendStatisticsProxy()
webrtc/video/send_statistics_proxy.cc:69 (video_engine_tests+0x0000006141b8)
    #9 webrtc::internal::VideoSendStream::~VideoSendStream()
webrtc/video/video_send_stream.cc:271:1 (video_engine_tests+0x00000061f8e9)
    #10 webrtc::internal::VideoSendStream::~VideoSendStream()
webrtc/video/video_send_stream.cc:243:37 (video_engine_tests+0x00000061fa79)
    #11 webrtc::internal::Call::DestroyVideoSendStream(webrtc::VideoSendStream*)
webrtc/call/call.cc:332:3 (video_engine_tests+0x00000060e80c)
    #12 webrtc::test::CallTest::DestroyStreams() webrtc/test/call_test.cc:168:5
(video_engine_tests+0x0000005ff348)
    #13 webrtc::test::CallTest::RunBaseTest(webrtc::test::BaseTest*,
webrtc::FakeNetworkPipe::Config const&) webrtc/test/call_test.cc:68:3
(video_engine_tests+0x0000005fe171)
    #14 webrtc::VideoSendStreamTest_SupportsCName_Test::TestBody()
webrtc/video/video_send_stream_tests.cc:123:3
(video_engine_tests+0x0000005341c0)
    #15 HandleExceptionsInMethodIfSupported<testing::Test, void>
chromium/src/testing/gtest/src/gtest.cc:2458:12
(video_engine_tests+0x000000567d5c)
    #16 testing::Test::Run() chromium/src/testing/gtest/src/gtest.cc:2474
(video_engine_tests+0x000000567d5c)
    #17 testing::TestInfo::Run() chromium/src/testing/gtest/src/gtest.cc:2656:5
(video_engine_tests+0x0000005688b3)
    #18 testing::TestCase::Run() chromium/src/testing/gtest/src/gtest.cc:2774:5
(video_engine_tests+0x0000005690b2)
    #19 testing::internal::UnitTestImpl::RunAllTests()
chromium/src/testing/gtest/src/gtest.cc:4647:11
(video_engine_tests+0x000000571f8c)
    #20 HandleExceptionsInMethodIfSupported<testing::internal::UnitTestImpl,
bool> chromium/src/testing/gtest/src/gtest.cc:2458:12
(video_engine_tests+0x0000005719d6)
    #21 testing::UnitTest::Run() chromium/src/testing/gtest/src/gtest.cc:4255
(video_engine_tests+0x0000005719d6)
    #22 RUN_ALL_TESTS testing/gtest/include/gtest/gtest.h:2237:10
(video_engine_tests+0x0000005fd33e)
    #23 main webrtc/test/test_main.cc:31 (video_engine_tests+0x0000005fd33e)

  Previous read of size 8 at 0x7d3800006f20 by thread T1 (mutexes: write M241,
write M234, write M288, write M267):
    #0 __lower_bound<unsigned int>
chromium/src/buildtools/third_party/libc++/trunk/include/__tree:2105:58
(video_engine_tests+0x000000615d87)
    #1 find<unsigned int>
chromium/src/buildtools/third_party/libc++/trunk/include/__tree:2028
(video_engine_tests+0x000000615d87)
    #2 find chromium/src/buildtools/third_party/libc++/trunk/include/map:1090
(video_engine_tests+0x000000615d87)
    #3 webrtc::SendStatisticsProxy::GetStatsEntry(unsigned int)
webrtc/video/send_statistics_proxy.cc:169 (video_engine_tests+0x000000615d87)
    #4 SendSideDelayUpdated webrtc/video/send_statistics_proxy.cc:335:41
(video_engine_tests+0x000000616d31)
    #5 non-virtual thunk to
webrtc::SendStatisticsProxy::SendSideDelayUpdated(int, int, unsigned int)
webrtc/video/send_statistics_proxy.cc:331 (video_engine_tests+0x000000616d31)
    #6
webrtc::ViEChannel::RegisterableSendSideDelayObserver::SendSideDelayUpdated(int,
int, unsigned int) webrtc/video_engine/vie_channel.h:379:9
(video_engine_tests+0x00000062ecdd)
    #7 webrtc::RTPSender::UpdateDelayStatistics(long, long)
webrtc/modules/rtp_rtcp/source/rtp_sender.cc:1118:3
(video_engine_tests+0x0000005a3441)
    #8 webrtc::RTPSender::TimeToSendPacket(unsigned short, long, bool)
webrtc/modules/rtp_rtcp/source/rtp_sender.cc:887:5
(video_engine_tests+0x0000005a2f7f)
    #9 webrtc::ModuleRtpRtcpImpl::TimeToSendPacket(unsigned int, unsigned short,
long, bool) webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc:418:12
(video_engine_tests+0x000000585fc4)
    #10 webrtc::PacketRouter::TimeToSendPacket(unsigned int, unsigned short,
long, bool) webrtc/modules/pacing/packet_router.cc:49:14
(video_engine_tests+0x0000008701ed)
    #11 webrtc::PacedSender::SendPacket(webrtc::paced_sender::Packet const&)
webrtc/modules/pacing/paced_sender.cc:366:24 (video_engine_tests+0x00000086ea98)
    #12 webrtc::PacedSender::Process()
webrtc/modules/pacing/paced_sender.cc:337:9 (video_engine_tests+0x00000086e7f7)
    #13 webrtc::ProcessThreadImpl::Process()
webrtc/modules/utility/source/process_thread_impl.cc:209:9
(video_engine_tests+0x000000666f6d)
    #14 webrtc::ProcessThreadImpl::Run(void*)
webrtc/modules/utility/source/process_thread_impl.cc:188:10
(video_engine_tests+0x0000006662d9)
    #15 webrtc::ThreadPosix::Run()
webrtc/system_wrappers/source/thread_posix.cc:161:10
(video_engine_tests+0x000000651098)
    #16 webrtc::ThreadPosix::StartThread(void*)
webrtc/system_wrappers/source/thread_posix.cc:66:3
(video_engine_tests+0x000000650fc9)

pbos-webrtc

Committed patchset #1 (id:1) manually as 373284da06631c33a01fee6d755355cabeadf6c6 (presubmit successful).

5 years, 1 month ago (2015-11-03 12:53:22 UTC) #3

commit-bot: I haz the power

5 years, 1 month ago (2015-11-03 12:53:22 UTC) #4

Message was sent while issue was closed.

Patchset 1 (id:??) landed as
https://crrev.com/373284da06631c33a01fee6d755355cabeadf6c6
Cr-Commit-Position: refs/heads/master@{#10493}

Expand Messages | Collapse Messages