2014-05-13 18:00:26 +00:00
|
|
|
/*
|
|
|
|
|
* Copyright 2004 The WebRTC Project Authors. All rights reserved.
|
|
|
|
|
*
|
|
|
|
|
* Use of this source code is governed by a BSD-style license
|
|
|
|
|
* that can be found in the LICENSE file in the root of the source
|
|
|
|
|
* tree. An additional intellectual property rights grant can be found
|
|
|
|
|
* in the file PATENTS. All contributing project authors may
|
|
|
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
|
|
|
*/
|
|
|
|
|
|
2017-09-15 06:47:31 +02:00
|
|
|
#include "rtc_base/testclient.h"
|
Update VirtualSocketServerTest to use a fake clock.
Since this is a test for a fake network, it's only natural that it uses
a fake clock as well. This makes the tests much faster, less flaky, and
lets them be moved out of "webrtc_nonparallel_tests", since they no
longer have a dependency on any "real" thing (sockets, or time) and
can be run in parallel as easily as any other tests.
As part of this CL, added the fake clock as an argument to
VirtualSocketServer's and TestClient's constructors, since these classes
have methods that wait synchronously for something to occur, and if the
test is using a fake clock, they need to advance it in order to make
progress.
Lastly, added a DCHECK in Thread::ProcessMessages. If called with a
nonzero time while a fake clock is used, it will get stuck in an
infinite loop; a DCHECK is easier to notice than an infinite loop.
BUG=webrtc:7727, webrtc:2409
Review-Url: https://codereview.webrtc.org/2927413002
Cr-Commit-Position: refs/heads/master@{#18544}
2017-06-12 14:30:28 -07:00
|
|
|
|
2018-11-28 16:47:49 +01:00
|
|
|
#include <string.h>
|
|
|
|
|
#include <utility>
|
|
|
|
|
|
Use absl::make_unique and absl::WrapUnique directly
Instead of going through our wrappers in ptr_util.h.
This CL was generated by the following script:
git grep -l ptr_util | xargs perl -pi -e 's,#include "rtc_base/ptr_util.h",#include "absl/memory/memory.h",'
git grep -l MakeUnique | xargs perl -pi -e 's,\b(rtc::)?MakeUnique\b,absl::make_unique,g'
git grep -l WrapUnique | xargs perl -pi -e 's,\b(rtc::)?WrapUnique\b,absl::WrapUnique,g'
git checkout -- rtc_base/ptr_util{.h,_unittest.cc}
git cl format
Followed by manually adding dependencies on
//third_party/abseil-cpp/absl/memory until `gn check` stopped
complaining.
Bug: webrtc:9473
Change-Id: I89ccd363f070479b8c431eb2c3d404a46eaacc1c
Reviewed-on: https://webrtc-review.googlesource.com/86600
Commit-Queue: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23850}
2018-07-05 11:40:33 +02:00
|
|
|
#include "absl/memory/memory.h"
|
2017-09-15 06:47:31 +02:00
|
|
|
#include "rtc_base/gunit.h"
|
|
|
|
|
#include "rtc_base/thread.h"
|
|
|
|
|
#include "rtc_base/timeutils.h"
|
2014-05-13 18:00:26 +00:00
|
|
|
|
|
|
|
|
namespace rtc {
|
|
|
|
|
|
|
|
|
|
// DESIGN: Each packet received is put it into a list of packets.
|
|
|
|
|
// Callers can retrieve received packets from any thread by calling
|
|
|
|
|
// NextPacket.
|
|
|
|
|
|
2017-05-08 01:57:18 -07:00
|
|
|
TestClient::TestClient(std::unique_ptr<AsyncPacketSocket> socket)
|
Update VirtualSocketServerTest to use a fake clock.
Since this is a test for a fake network, it's only natural that it uses
a fake clock as well. This makes the tests much faster, less flaky, and
lets them be moved out of "webrtc_nonparallel_tests", since they no
longer have a dependency on any "real" thing (sockets, or time) and
can be run in parallel as easily as any other tests.
As part of this CL, added the fake clock as an argument to
VirtualSocketServer's and TestClient's constructors, since these classes
have methods that wait synchronously for something to occur, and if the
test is using a fake clock, they need to advance it in order to make
progress.
Lastly, added a DCHECK in Thread::ProcessMessages. If called with a
nonzero time while a fake clock is used, it will get stuck in an
infinite loop; a DCHECK is easier to notice than an infinite loop.
BUG=webrtc:7727, webrtc:2409
Review-Url: https://codereview.webrtc.org/2927413002
Cr-Commit-Position: refs/heads/master@{#18544}
2017-06-12 14:30:28 -07:00
|
|
|
: TestClient(std::move(socket), nullptr) {}
|
|
|
|
|
|
|
|
|
|
TestClient::TestClient(std::unique_ptr<AsyncPacketSocket> socket,
|
|
|
|
|
FakeClock* fake_clock)
|
|
|
|
|
: fake_clock_(fake_clock),
|
|
|
|
|
socket_(std::move(socket)),
|
|
|
|
|
prev_packet_timestamp_(-1) {
|
2014-05-13 18:00:26 +00:00
|
|
|
socket_->SignalReadPacket.connect(this, &TestClient::OnPacket);
|
|
|
|
|
socket_->SignalReadyToSend.connect(this, &TestClient::OnReadyToSend);
|
|
|
|
|
}
|
|
|
|
|
|
2017-05-08 01:57:18 -07:00
|
|
|
TestClient::~TestClient() {}
|
2014-05-13 18:00:26 +00:00
|
|
|
|
|
|
|
|
bool TestClient::CheckConnState(AsyncPacketSocket::State state) {
|
|
|
|
|
// Wait for our timeout value until the socket reaches the desired state.
|
2016-05-19 14:57:31 -07:00
|
|
|
int64_t end = TimeAfter(kTimeoutMs);
|
|
|
|
|
while (socket_->GetState() != state && TimeUntil(end) > 0) {
|
Update VirtualSocketServerTest to use a fake clock.
Since this is a test for a fake network, it's only natural that it uses
a fake clock as well. This makes the tests much faster, less flaky, and
lets them be moved out of "webrtc_nonparallel_tests", since they no
longer have a dependency on any "real" thing (sockets, or time) and
can be run in parallel as easily as any other tests.
As part of this CL, added the fake clock as an argument to
VirtualSocketServer's and TestClient's constructors, since these classes
have methods that wait synchronously for something to occur, and if the
test is using a fake clock, they need to advance it in order to make
progress.
Lastly, added a DCHECK in Thread::ProcessMessages. If called with a
nonzero time while a fake clock is used, it will get stuck in an
infinite loop; a DCHECK is easier to notice than an infinite loop.
BUG=webrtc:7727, webrtc:2409
Review-Url: https://codereview.webrtc.org/2927413002
Cr-Commit-Position: refs/heads/master@{#18544}
2017-06-12 14:30:28 -07:00
|
|
|
AdvanceTime(1);
|
2016-05-19 14:57:31 -07:00
|
|
|
}
|
2014-05-13 18:00:26 +00:00
|
|
|
return (socket_->GetState() == state);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int TestClient::Send(const char* buf, size_t size) {
|
|
|
|
|
rtc::PacketOptions options;
|
|
|
|
|
return socket_->Send(buf, size, options);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int TestClient::SendTo(const char* buf,
|
|
|
|
|
size_t size,
|
|
|
|
|
const SocketAddress& dest) {
|
|
|
|
|
rtc::PacketOptions options;
|
|
|
|
|
return socket_->SendTo(buf, size, dest, options);
|
|
|
|
|
}
|
|
|
|
|
|
2017-05-08 01:57:18 -07:00
|
|
|
std::unique_ptr<TestClient::Packet> TestClient::NextPacket(int timeout_ms) {
|
2014-05-13 18:00:26 +00:00
|
|
|
// If no packets are currently available, we go into a get/dispatch loop for
|
2015-02-07 22:37:59 +00:00
|
|
|
// at most timeout_ms. If, during the loop, a packet arrives, then we can
|
|
|
|
|
// stop early and return it.
|
2014-05-13 18:00:26 +00:00
|
|
|
|
|
|
|
|
// Note that the case where no packet arrives is important. We often want to
|
|
|
|
|
// test that a packet does not arrive.
|
|
|
|
|
|
|
|
|
|
// Note also that we only try to pump our current thread's message queue.
|
|
|
|
|
// Pumping another thread's queue could lead to messages being dispatched from
|
|
|
|
|
// the wrong thread to non-thread-safe objects.
|
|
|
|
|
|
2016-05-19 14:57:31 -07:00
|
|
|
int64_t end = TimeAfter(timeout_ms);
|
2014-05-13 18:00:26 +00:00
|
|
|
while (TimeUntil(end) > 0) {
|
|
|
|
|
{
|
|
|
|
|
CritScope cs(&crit_);
|
2017-05-08 01:57:18 -07:00
|
|
|
if (packets_.size() != 0) {
|
2014-05-13 18:00:26 +00:00
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
Update VirtualSocketServerTest to use a fake clock.
Since this is a test for a fake network, it's only natural that it uses
a fake clock as well. This makes the tests much faster, less flaky, and
lets them be moved out of "webrtc_nonparallel_tests", since they no
longer have a dependency on any "real" thing (sockets, or time) and
can be run in parallel as easily as any other tests.
As part of this CL, added the fake clock as an argument to
VirtualSocketServer's and TestClient's constructors, since these classes
have methods that wait synchronously for something to occur, and if the
test is using a fake clock, they need to advance it in order to make
progress.
Lastly, added a DCHECK in Thread::ProcessMessages. If called with a
nonzero time while a fake clock is used, it will get stuck in an
infinite loop; a DCHECK is easier to notice than an infinite loop.
BUG=webrtc:7727, webrtc:2409
Review-Url: https://codereview.webrtc.org/2927413002
Cr-Commit-Position: refs/heads/master@{#18544}
2017-06-12 14:30:28 -07:00
|
|
|
AdvanceTime(1);
|
2014-05-13 18:00:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Return the first packet placed in the queue.
|
2017-05-08 01:57:18 -07:00
|
|
|
std::unique_ptr<Packet> packet;
|
2014-05-13 18:00:26 +00:00
|
|
|
CritScope cs(&crit_);
|
2017-05-08 01:57:18 -07:00
|
|
|
if (packets_.size() > 0) {
|
|
|
|
|
packet = std::move(packets_.front());
|
|
|
|
|
packets_.erase(packets_.begin());
|
2014-05-13 18:00:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return packet;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool TestClient::CheckNextPacket(const char* buf,
|
|
|
|
|
size_t size,
|
|
|
|
|
SocketAddress* addr) {
|
|
|
|
|
bool res = false;
|
2017-05-08 01:57:18 -07:00
|
|
|
std::unique_ptr<Packet> packet = NextPacket(kTimeoutMs);
|
2014-05-13 18:00:26 +00:00
|
|
|
if (packet) {
|
2016-05-23 18:19:26 +02:00
|
|
|
res = (packet->size == size && memcmp(packet->buf, buf, size) == 0 &&
|
2018-11-05 13:01:41 +01:00
|
|
|
CheckTimestamp(packet->packet_time_us));
|
2014-05-13 18:00:26 +00:00
|
|
|
if (addr)
|
|
|
|
|
*addr = packet->addr;
|
|
|
|
|
}
|
|
|
|
|
return res;
|
|
|
|
|
}
|
|
|
|
|
|
2016-05-23 18:19:26 +02:00
|
|
|
bool TestClient::CheckTimestamp(int64_t packet_timestamp) {
|
|
|
|
|
bool res = true;
|
|
|
|
|
if (packet_timestamp == -1) {
|
|
|
|
|
res = false;
|
|
|
|
|
}
|
|
|
|
|
if (prev_packet_timestamp_ != -1) {
|
|
|
|
|
if (packet_timestamp < prev_packet_timestamp_) {
|
|
|
|
|
res = false;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
prev_packet_timestamp_ = packet_timestamp;
|
|
|
|
|
return res;
|
|
|
|
|
}
|
|
|
|
|
|
Update VirtualSocketServerTest to use a fake clock.
Since this is a test for a fake network, it's only natural that it uses
a fake clock as well. This makes the tests much faster, less flaky, and
lets them be moved out of "webrtc_nonparallel_tests", since they no
longer have a dependency on any "real" thing (sockets, or time) and
can be run in parallel as easily as any other tests.
As part of this CL, added the fake clock as an argument to
VirtualSocketServer's and TestClient's constructors, since these classes
have methods that wait synchronously for something to occur, and if the
test is using a fake clock, they need to advance it in order to make
progress.
Lastly, added a DCHECK in Thread::ProcessMessages. If called with a
nonzero time while a fake clock is used, it will get stuck in an
infinite loop; a DCHECK is easier to notice than an infinite loop.
BUG=webrtc:7727, webrtc:2409
Review-Url: https://codereview.webrtc.org/2927413002
Cr-Commit-Position: refs/heads/master@{#18544}
2017-06-12 14:30:28 -07:00
|
|
|
void TestClient::AdvanceTime(int ms) {
|
|
|
|
|
// If the test is using a fake clock, we must advance the fake clock to
|
|
|
|
|
// advance time. Otherwise, ProcessMessages will work.
|
|
|
|
|
if (fake_clock_) {
|
|
|
|
|
SIMULATED_WAIT(false, ms, *fake_clock_);
|
|
|
|
|
} else {
|
|
|
|
|
Thread::Current()->ProcessMessages(1);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2014-05-13 18:00:26 +00:00
|
|
|
bool TestClient::CheckNoPacket() {
|
2017-05-08 01:57:18 -07:00
|
|
|
return NextPacket(kNoPacketTimeoutMs) == nullptr;
|
2014-05-13 18:00:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int TestClient::GetError() {
|
|
|
|
|
return socket_->GetError();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int TestClient::SetOption(Socket::Option opt, int value) {
|
|
|
|
|
return socket_->SetOption(opt, value);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void TestClient::OnPacket(AsyncPacketSocket* socket,
|
|
|
|
|
const char* buf,
|
|
|
|
|
size_t size,
|
|
|
|
|
const SocketAddress& remote_addr,
|
2018-11-05 13:01:41 +01:00
|
|
|
const int64_t& packet_time_us) {
|
2014-05-13 18:00:26 +00:00
|
|
|
CritScope cs(&crit_);
|
Use absl::make_unique and absl::WrapUnique directly
Instead of going through our wrappers in ptr_util.h.
This CL was generated by the following script:
git grep -l ptr_util | xargs perl -pi -e 's,#include "rtc_base/ptr_util.h",#include "absl/memory/memory.h",'
git grep -l MakeUnique | xargs perl -pi -e 's,\b(rtc::)?MakeUnique\b,absl::make_unique,g'
git grep -l WrapUnique | xargs perl -pi -e 's,\b(rtc::)?WrapUnique\b,absl::WrapUnique,g'
git checkout -- rtc_base/ptr_util{.h,_unittest.cc}
git cl format
Followed by manually adding dependencies on
//third_party/abseil-cpp/absl/memory until `gn check` stopped
complaining.
Bug: webrtc:9473
Change-Id: I89ccd363f070479b8c431eb2c3d404a46eaacc1c
Reviewed-on: https://webrtc-review.googlesource.com/86600
Commit-Queue: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23850}
2018-07-05 11:40:33 +02:00
|
|
|
packets_.push_back(
|
2018-11-05 13:01:41 +01:00
|
|
|
absl::make_unique<Packet>(remote_addr, buf, size, packet_time_us));
|
2014-05-13 18:00:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void TestClient::OnReadyToSend(AsyncPacketSocket* socket) {
|
2016-09-09 13:16:15 -07:00
|
|
|
++ready_to_send_count_;
|
2014-05-13 18:00:26 +00:00
|
|
|
}
|
|
|
|
|
|
2016-05-23 18:19:26 +02:00
|
|
|
TestClient::Packet::Packet(const SocketAddress& a,
|
|
|
|
|
const char* b,
|
|
|
|
|
size_t s,
|
2018-11-05 13:01:41 +01:00
|
|
|
int64_t packet_time_us)
|
|
|
|
|
: addr(a), buf(0), size(s), packet_time_us(packet_time_us) {
|
2014-05-13 18:00:26 +00:00
|
|
|
buf = new char[size];
|
|
|
|
|
memcpy(buf, b, size);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
TestClient::Packet::Packet(const Packet& p)
|
2018-11-05 13:01:41 +01:00
|
|
|
: addr(p.addr), buf(0), size(p.size), packet_time_us(p.packet_time_us) {
|
2014-05-13 18:00:26 +00:00
|
|
|
buf = new char[size];
|
|
|
|
|
memcpy(buf, p.buf, size);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
TestClient::Packet::~Packet() {
|
|
|
|
|
delete[] buf;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
} // namespace rtc
|