Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(308)

Unified Diff: webrtc/tools/network_tester/test_controller.cc

Issue 2800403003: Revert of Add first part of the network_tester functionality. (Closed)
Patch Set: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/tools/network_tester/test_controller.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/tools/network_tester/test_controller.cc
diff --git a/webrtc/tools/network_tester/test_controller.cc b/webrtc/tools/network_tester/test_controller.cc
deleted file mode 100644
index 713a974995b770399b550042404fb8ff300a4375..0000000000000000000000000000000000000000
--- a/webrtc/tools/network_tester/test_controller.cc
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright 2017 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.
- */
-
-#include "webrtc/tools/network_tester/test_controller.h"
-
-namespace webrtc {
-
-TestController::TestController(int min_port,
- int max_port,
- const std::string& config_file_path)
- : config_file_path_(config_file_path),
- local_test_done_(false),
- remote_test_done_(false) {
- RTC_DCHECK_RUN_ON(&test_controller_thread_checker_);
- send_data_.fill(42);
- packet_sender_checker_.Detach();
- auto socket =
- std::unique_ptr<rtc::AsyncPacketSocket>(socket_factory_.CreateUdpSocket(
- rtc::SocketAddress(rtc::GetAnyIP(AF_INET), 0), min_port, max_port));
- socket->SignalReadPacket.connect(this, &TestController::OnReadPacket);
- udp_transport_.reset(
- new cricket::UdpTransport("network tester transport", std::move(socket)));
-}
-
-void TestController::SendConnectTo(const std::string& hostname, int port) {
- RTC_DCHECK_RUN_ON(&test_controller_thread_checker_);
- udp_transport_->SetRemoteAddress(rtc::SocketAddress(hostname, port));
- NetworkTesterPacket packet;
- packet.set_type(NetworkTesterPacket::HAND_SHAKING);
- SendData(packet, rtc::Optional<size_t>());
- rtc::CritScope scoped_lock(&local_test_done_lock_);
- local_test_done_ = false;
- remote_test_done_ = false;
-}
-
-void TestController::Run() {
- RTC_DCHECK_RUN_ON(&test_controller_thread_checker_);
- rtc::Thread::Current()->ProcessMessages(0);
-}
-
-void TestController::SendData(const NetworkTesterPacket& packet,
- rtc::Optional<size_t> data_size) {
- // Can be call from packet_sender or from test_controller thread.
- size_t packet_size = packet.ByteSize();
- send_data_[0] = packet_size;
- packet.SerializeToArray(&send_data_[1], std::numeric_limits<char>::max());
- if (data_size && *data_size > packet_size)
- packet_size = *data_size;
- udp_transport_->SendPacket(send_data_.data(), packet_size + 1,
- rtc::PacketOptions(), 0);
-}
-
-void TestController::OnTestDone() {
- RTC_DCHECK_CALLED_SEQUENTIALLY(&packet_sender_checker_);
- NetworkTesterPacket packet;
- packet.set_type(NetworkTesterPacket::TEST_DONE);
- SendData(packet, rtc::Optional<size_t>());
- rtc::CritScope scoped_lock(&local_test_done_lock_);
- local_test_done_ = true;
-}
-
-bool TestController::IsTestDone() {
- RTC_DCHECK_RUN_ON(&test_controller_thread_checker_);
- rtc::CritScope scoped_lock(&local_test_done_lock_);
- return local_test_done_ && remote_test_done_;
-}
-
-void TestController::OnReadPacket(rtc::AsyncPacketSocket* socket,
- const char* data,
- size_t len,
- const rtc::SocketAddress& remote_addr,
- const rtc::PacketTime& packet_time) {
- RTC_DCHECK_RUN_ON(&test_controller_thread_checker_);
- size_t packet_size = data[0];
- std::string receive_data(&data[1], packet_size);
- NetworkTesterPacket packet;
- packet.ParseFromString(receive_data);
- RTC_CHECK(packet.has_type());
- switch (packet.type()) {
- case NetworkTesterPacket::HAND_SHAKING: {
- NetworkTesterPacket packet;
- packet.set_type(NetworkTesterPacket::TEST_START);
- udp_transport_->SetRemoteAddress(remote_addr);
- SendData(packet, rtc::Optional<size_t>());
- packet_sender_.reset(new PacketSender(this, config_file_path_));
- packet_sender_->StartSending();
- rtc::CritScope scoped_lock(&local_test_done_lock_);
- local_test_done_ = false;
- remote_test_done_ = false;
- break;
- }
- case NetworkTesterPacket::TEST_START: {
- packet_sender_.reset(new PacketSender(this, config_file_path_));
- packet_sender_->StartSending();
- break;
- }
- case NetworkTesterPacket::TEST_DATA: {
- packet.set_arrival_timestamp(packet_time.timestamp);
- packet.set_packet_size(len);
- // log packet
- break;
- }
- case NetworkTesterPacket::TEST_DONE: {
- remote_test_done_ = true;
- break;
- }
- default: { RTC_NOTREACHED(); }
- }
-}
-
-} // namespace webrtc
« no previous file with comments | « webrtc/tools/network_tester/test_controller.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698