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

Fixed timeout overflow in sctp reliability test.

Browse Source 
Sometimes some tests failed due to test long execution while timeout
was computed to negative value.

Bug: None
Change-Id: Icb666170323f6b757a409db575d36116f57632d8
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/165691
Commit-Queue: Yura Yaroshevich <yura.yaroshevich@gmail.com>
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30245}
This commit is contained in:
Yura Yaroshevich
2020-01-13 14:28:12 +03:00
committed by Commit Bot
parent 3e3c551ac6
commit 1546f99572
1 changed files with 39 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
media/sctp/sctp_transport_reliability_unittest.cc
View File

@ -403,7 +403,7 @@ class SctpPingPong final {
return result;
}
void WaitForCompletion(uint32_t timeout_millis) {
void WaitForCompletion(int32_t timeout_millis) {
if (data_sender1_ == nullptr) {
ReportError("SctpPingPong id = " + rtc::ToString(id_) +
", sender 1 is not created");
@ -593,6 +593,20 @@ class SctpPingPong final {
RTC_DISALLOW_COPY_AND_ASSIGN(SctpPingPong);
};
/**
* Helper function to calculate max number of milliseconds
* allowed for test to run based on test configuration.
*/
constexpr int32_t GetExecutionTimeLimitInMillis(uint32_t total_messages,
uint8_t packet_loss_percents) {
return std::min<int64_t>(
std::numeric_limits<int32_t>::max(),
std::max<int64_t>(
1LL * total_messages * 100 *
std::max(1, packet_loss_percents * packet_loss_percents),
kDefaultTimeout));
}
} // namespace
namespace cricket {
@ -631,6 +645,10 @@ TEST_F(UsrSctpReliabilityTest,
constexpr uint8_t packet_loss_percents = 0;
constexpr uint16_t avg_send_delay_millis = 10;
constexpr uint32_t messages_count = 100;
constexpr int32_t wait_timeout =
GetExecutionTimeLimitInMillis(messages_count, packet_loss_percents);
static_assert(wait_timeout > 0,
"Timeout computation must produce positive value");
cricket::SendDataParams send_params;
send_params.sid = -1;
@ -643,8 +661,7 @@ TEST_F(UsrSctpReliabilityTest,
thread2.get(), messages_count, packet_loss_percents,
avg_send_delay_millis, send_params);
EXPECT_TRUE(test.Start()) << rtc::join(test.GetErrorsList(), ';');
test.WaitForCompletion(
std::max<uint32_t>(messages_count * 100, kDefaultTimeout));
test.WaitForCompletion(wait_timeout);
auto errors_list = test.GetErrorsList();
EXPECT_TRUE(errors_list.empty()) << rtc::join(errors_list, ';');
}
@ -666,6 +683,11 @@ TEST_F(UsrSctpReliabilityTest,
constexpr uint8_t packet_loss_percents = 5;
constexpr uint16_t avg_send_delay_millis = 16;
constexpr uint32_t messages_count = 10000;
constexpr int32_t wait_timeout =
GetExecutionTimeLimitInMillis(messages_count, packet_loss_percents);
static_assert(wait_timeout > 0,
"Timeout computation must produce positive value");
cricket::SendDataParams send_params;
send_params.sid = -1;
send_params.ordered = true;
@ -678,8 +700,7 @@ TEST_F(UsrSctpReliabilityTest,
avg_send_delay_millis, send_params);
EXPECT_TRUE(test.Start()) << rtc::join(test.GetErrorsList(), ';');
test.WaitForCompletion(
std::max<uint32_t>(messages_count * 100, kDefaultTimeout));
test.WaitForCompletion(wait_timeout);
auto errors_list = test.GetErrorsList();
EXPECT_TRUE(errors_list.empty()) << rtc::join(errors_list, ';');
}
@ -700,6 +721,12 @@ TEST_F(UsrSctpReliabilityTest,
thread2->Start();
constexpr uint8_t packet_loss_percents = 5;
constexpr uint16_t avg_send_delay_millis = 16;
constexpr uint32_t messages_count = 10000;
constexpr int32_t wait_timeout =
GetExecutionTimeLimitInMillis(messages_count, packet_loss_percents);
static_assert(wait_timeout > 0,
"Timeout computation must produce positive value");
cricket::SendDataParams send_params;
send_params.sid = -1;
send_params.ordered = false;
@ -707,14 +734,12 @@ TEST_F(UsrSctpReliabilityTest,
send_params.max_rtx_count = INT_MAX;
send_params.max_rtx_ms = INT_MAX;
constexpr uint32_t messages_count = 10000;
SctpPingPong test(1, kTransport1Port, kTransport2Port, thread1.get(),
thread2.get(), messages_count, packet_loss_percents,
avg_send_delay_millis, send_params);
EXPECT_TRUE(test.Start()) << rtc::join(test.GetErrorsList(), ';');
test.WaitForCompletion(
std::max<uint32_t>(messages_count * 100, kDefaultTimeout));
test.WaitForCompletion(wait_timeout);
auto errors_list = test.GetErrorsList();
EXPECT_TRUE(errors_list.empty()) << rtc::join(errors_list, ';');
}
@ -759,10 +784,10 @@ TEST_F(UsrSctpReliabilityTest,
constexpr uint32_t parallel_ping_pongs = 16 * 1024;
constexpr uint32_t total_ping_pong_tests = 16 * parallel_ping_pongs;
constexpr uint32_t timeout = std::max<uint32_t>(
messages_count * total_ping_pong_tests * 100 *
std::max(1, packet_loss_percents * packet_loss_percents),
kDefaultTimeout);
constexpr int32_t wait_timeout = GetExecutionTimeLimitInMillis(
total_ping_pong_tests * messages_count, packet_loss_percents);
static_assert(wait_timeout > 0,
"Timeout computation must produce positive value");
std::queue<std::unique_ptr<SctpPingPong>> tests;
@ -780,7 +805,7 @@ TEST_F(UsrSctpReliabilityTest,
while (tests.size() >= parallel_ping_pongs) {
auto& oldest_test = tests.front();
oldest_test->WaitForCompletion(timeout);
oldest_test->WaitForCompletion(wait_timeout);
auto errors_list = oldest_test->GetErrorsList();
EXPECT_TRUE(errors_list.empty()) << rtc::join(errors_list, ';');
@ -790,7 +815,7 @@ TEST_F(UsrSctpReliabilityTest,
while (!tests.empty()) {
auto& oldest_test = tests.front();
oldest_test->WaitForCompletion(timeout);
oldest_test->WaitForCompletion(wait_timeout);
auto errors_list = oldest_test->GetErrorsList();
EXPECT_TRUE(errors_list.empty()) << rtc::join(errors_list, ';');