generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Properly shut down the SCTP stack.

Browse Source 
TBR phoglund@webrtc.org for the tsan_v2/suppressions.txt change.
R=ldixon@webrtc.org, pthatcher@webrtc.org
TBR=phoglund@webrtc.org
BUG=2749

Review URL: https://webrtc-codereview.appspot.com/12739004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6484 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
jiayl@webrtc.org 2014-06-18 21:30:40 +00:00
parent a19b930b5b
commit f8063d34de
6 changed files with 37 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
talk/app/webrtc/javatests/src/org/webrtc/PeerConnectionTest.java
View File

@ -525,7 +525,7 @@ public class PeerConnectionTest extends TestCase {
private void doTest() throws Exception {
CountDownLatch testDone = new CountDownLatch(1);
System.gc(); // Encourage any GC-related threads to start up.
//TreeSet<String> threadsBeforeTest = allThreads();
TreeSet<String> threadsBeforeTest = allThreads();
PeerConnectionFactory factory = new PeerConnectionFactory();
// Uncomment to get ALL WebRTC tracing and SENSITIVE libjingle logging.
@ -742,11 +742,8 @@ public class PeerConnectionTest extends TestCase {
factory.dispose();
System.gc();
// TODO(ldixon): the usrsctp threads are not cleaned up (issue 2749) and
// caused the assert to fail. We should reenable the assert once issue 2749
// is fixed.
//TreeSet<String> threadsAfterTest = allThreads();
//assertEquals(threadsBeforeTest, threadsAfterTest);
TreeSet<String> threadsAfterTest = allThreads();
assertEquals(threadsBeforeTest, threadsAfterTest);
Thread.sleep(100);
}

4
talk/libjingle_tests.gyp
View File

@ -287,9 +287,7 @@
'media/base/videoengine_unittest.h',
'media/devices/dummydevicemanager_unittest.cc',
'media/devices/filevideocapturer_unittest.cc',
# TODO(jiayl): Enable the SCTP test once the memcheck and tsan bots
# failures are fixed (issue 2846).
#'media/sctp/sctpdataengine_unittest.cc',
'media/sctp/sctpdataengine_unittest.cc',
'media/webrtc/webrtcpassthroughrender_unittest.cc',
'media/webrtc/webrtcvideocapturer_unittest.cc',
# Omitted because depends on non-open-source testdata files.

26
talk/media/sctp/sctpdataengine.cc
View File

@ -277,18 +277,20 @@ SctpDataEngine::SctpDataEngine() {
}
SctpDataEngine::~SctpDataEngine() {
// TODO(ldixon): There is currently a bug in teardown of usrsctp that blocks
// indefintely if a finish call made too soon after close calls. So teardown
// has been skipped. Once the bug is fixed, retest and enable teardown.
// Tracked in webrtc issue 2749.
//
// usrsctp_engines_count--;
// LOG(LS_VERBOSE) << "usrsctp_engines_count:" << usrsctp_engines_count;
// if (usrsctp_engines_count == 0) {
// if (usrsctp_finish() != 0) {
// LOG(LS_WARNING) << "usrsctp_finish.";
// }
// }
usrsctp_engines_count--;
LOG(LS_VERBOSE) << "usrsctp_engines_count:" << usrsctp_engines_count;
if (usrsctp_engines_count == 0) {
// usrsctp_finish() may fail if it's called too soon after the channels are
// closed. Wait and try again until it succeeds for up to 3 seconds.
for (size_t i = 0; i < 300; ++i) {
if (usrsctp_finish() == 0)
return;
talk_base::Thread::SleepMs(10);
}
LOG(LS_ERROR) << "Failed to shutdown usrsctp.";
}
}
DataMediaChannel* SctpDataEngine::CreateChannel(

20
talk/media/sctp/sctpdataengine_unittest.cc
View File

@ -295,7 +295,7 @@ class SctpDataMediaChannelTest : public testing::Test,
params.ssrc = ssrc;
return chan->SendData(params, talk_base::Buffer(
msg.data(), msg.length()), result);
&msg[0], msg.length()), result);
}
bool ReceivedData(const SctpFakeDataReceiver* recv, uint32 ssrc,
@ -364,26 +364,26 @@ TEST_F(SctpDataMediaChannelTest, SendData) {
EXPECT_EQ(cricket::SDR_SUCCESS, result);
EXPECT_TRUE_WAIT(ReceivedData(receiver2(), 1, "hello?"), 1000);
LOG(LS_VERBOSE) << "recv2.received=" << receiver2()->received()
<< "recv2.last_params.ssrc="
<< ", recv2.last_params.ssrc="
<< receiver2()->last_params().ssrc
<< "recv2.last_params.timestamp="
<< ", recv2.last_params.timestamp="
<< receiver2()->last_params().ssrc
<< "recv2.last_params.seq_num="
<< ", recv2.last_params.seq_num="
<< receiver2()->last_params().seq_num
<< "recv2.last_data=" << receiver2()->last_data();
<< ", recv2.last_data=" << receiver2()->last_data();
LOG(LS_VERBOSE) << "chan2 sending: 'hi chan1' -----------------------------";
ASSERT_TRUE(SendData(channel2(), 2, "hi chan1", &result));
EXPECT_EQ(cricket::SDR_SUCCESS, result);
EXPECT_TRUE_WAIT(ReceivedData(receiver1(), 2, "hi chan1"), 1000);
LOG(LS_VERBOSE) << "recv1.received=" << receiver1()->received()
<< "recv1.last_params.ssrc="
<< ", recv1.last_params.ssrc="
<< receiver1()->last_params().ssrc
<< "recv1.last_params.timestamp="
<< ", recv1.last_params.timestamp="
<< receiver1()->last_params().ssrc
<< "recv1.last_params.seq_num="
<< ", recv1.last_params.seq_num="
<< receiver1()->last_params().seq_num
<< "recv1.last_data=" << receiver1()->last_data();
<< ", recv1.last_data=" << receiver1()->last_data();
}
// Sends a lot of large messages at once and verifies SDR_BLOCK is returned.
@ -398,7 +398,7 @@ TEST_F(SctpDataMediaChannelTest, SendDataBlocked) {
for (size_t i = 0; i < 100; ++i) {
channel1()->SendData(
params, talk_base::Buffer(buffer.data(), buffer.size()), &result);
params, talk_base::Buffer(&buffer[0], buffer.size()), &result);
if (result == cricket::SDR_BLOCK)
break;
}

7
tools/valgrind-webrtc/gtest_exclude/libjingle_media_unittest.gtest-memcheck.txt
View File

@ -1,2 +1,5 @@
TODO(wu): https://code.google.com/p/webrtc/issues/detail?id=2380
WebRtcVideoMediaChannelTest.TwoStreamsSendAndUnsignalledRecv
#TODO(wu): https://code.google.com/p/webrtc/issues/detail?id=2380
WebRtcVideoMediaChannelTest.TwoStreamsSendAndUnsignalledRecv
#TODO(jiayl): https://code.google.com/p/webrtc/issues/detail?id=3492
SctpDataMediaChannelTest.*

4
tools/valgrind-webrtc/tsan_v2/suppressions.txt
View File

@ -31,3 +31,7 @@ race:talk/base/logging.cc
race:talk/base/sharedexclusivelock_unittest.cc
race:talk/base/signalthread_unittest.cc
race:talk/base/thread.cc
# third_party/usrsctp
# TODO(jiayl): https://code.google.com/p/webrtc/issues/detail?id=3492
race:third_party/usrsctp/usrsctplib/user_sctp_timer_iterate.c