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

Side by Side Diff: webrtc/tools/network_tester/test_controller.h

Issue 2790513002: Add packet logger and server (Closed)
Patch Set: Respond to comments. 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright 2017 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2017 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #ifndef WEBRTC_TOOLS_NETWORK_TESTER_TEST_CONTROLLER_H_ 11 #ifndef WEBRTC_TOOLS_NETWORK_TESTER_TEST_CONTROLLER_H_
12 #define WEBRTC_TOOLS_NETWORK_TESTER_TEST_CONTROLLER_H_ 12 #define WEBRTC_TOOLS_NETWORK_TESTER_TEST_CONTROLLER_H_
13 13
14 #include <array> 14 #include <array>
15 #include <limits> 15 #include <limits>
16 #include <memory> 16 #include <memory>
17 #include <string> 17 #include <string>
18 #include <utility> 18 #include <utility>
19 19
20 #include "webrtc/base/constructormagic.h"
20 #include "webrtc/base/ignore_wundef.h" 21 #include "webrtc/base/ignore_wundef.h"
21 #include "webrtc/p2p/base/basicpacketsocketfactory.h" 22 #include "webrtc/p2p/base/basicpacketsocketfactory.h"
22 #include "webrtc/p2p/base/udptransport.h" 23 #include "webrtc/p2p/base/udptransport.h"
24 #include "webrtc/tools/network_tester/packet_logger.h"
23 #include "webrtc/tools/network_tester/packet_sender.h" 25 #include "webrtc/tools/network_tester/packet_sender.h"
24 26
25 #ifdef WEBRTC_NETWORK_TESTER_PROTO 27 #ifdef WEBRTC_NETWORK_TESTER_PROTO
26 RTC_PUSH_IGNORING_WUNDEF() 28 RTC_PUSH_IGNORING_WUNDEF()
27 #include "webrtc/tools/network_tester/network_tester_packet.pb.h" 29 #include "webrtc/tools/network_tester/network_tester_packet.pb.h"
28 RTC_POP_IGNORING_WUNDEF() 30 RTC_POP_IGNORING_WUNDEF()
29 using webrtc::network_tester::packet::NetworkTesterPacket; 31 using webrtc::network_tester::packet::NetworkTesterPacket;
30 #else 32 #else
31 class NetworkTesterPacket; 33 class NetworkTesterPacket;
32 #endif // WEBRTC_NETWORK_TESTER_PROTO 34 #endif // WEBRTC_NETWORK_TESTER_PROTO
33 35
34 namespace webrtc { 36 namespace webrtc {
35 37
36 constexpr size_t kEthernetMtu = 1500; 38 constexpr size_t kEthernetMtu = 1500;
37 39
38 class TestController : public sigslot::has_slots<> { 40 class TestController : public sigslot::has_slots<> {
39 public: 41 public:
40 TestController(int min_port, 42 TestController(int min_port,
41 int max_port, 43 int max_port,
42 const std::string& config_file_path); 44 const std::string& config_file_path,
45 const std::string& log_file_path);
43 46
44 void Run(); 47 void Run();
45 48
46 void SendConnectTo(const std::string& hostname, int port); 49 void SendConnectTo(const std::string& hostname, int port);
47 50
48 void SendData(const NetworkTesterPacket& packet, 51 void SendData(const NetworkTesterPacket& packet,
49 rtc::Optional<size_t> data_size); 52 rtc::Optional<size_t> data_size);
50 53
51 void OnTestDone(); 54 void OnTestDone();
52 55
53 bool IsTestDone() { 56 bool IsTestDone() {
54 RTC_DCHECK_RUN_ON(&test_controller_thread_checker_); 57 RTC_DCHECK_RUN_ON(&test_controller_thread_checker_);
55 rtc::CritScope scoped_lock(&local_test_done_lock_); 58 rtc::CritScope scoped_lock(&local_test_done_lock_);
56 return local_test_done_ && remote_test_done_; 59 return local_test_done_ && remote_test_done_;
57 } 60 }
58 61
59 private: 62 private:
60 void OnReadPacket(rtc::AsyncPacketSocket* socket, 63 void OnReadPacket(rtc::AsyncPacketSocket* socket,
61 const char* data, 64 const char* data,
62 size_t len, 65 size_t len,
63 const rtc::SocketAddress& remote_addr, 66 const rtc::SocketAddress& remote_addr,
64 const rtc::PacketTime& packet_time); 67 const rtc::PacketTime& packet_time);
65 rtc::ThreadChecker test_controller_thread_checker_; 68 rtc::ThreadChecker test_controller_thread_checker_;
66 rtc::SequencedTaskChecker packet_sender_checker_; 69 rtc::SequencedTaskChecker packet_sender_checker_;
67 rtc::BasicPacketSocketFactory socket_factory_; 70 rtc::BasicPacketSocketFactory socket_factory_;
68 std::unique_ptr<cricket::UdpTransport> udp_transport_; 71 std::unique_ptr<cricket::UdpTransport> udp_transport_;
69 std::unique_ptr<PacketSender> packet_sender_; 72 std::unique_ptr<PacketSender> packet_sender_;
70 const std::string config_file_path_; 73 const std::string config_file_path_;
74 PacketLogger packet_logger_;
71 rtc::CriticalSection local_test_done_lock_; 75 rtc::CriticalSection local_test_done_lock_;
72 bool local_test_done_ GUARDED_BY(local_test_done_lock_); 76 bool local_test_done_ GUARDED_BY(local_test_done_lock_);
73 bool remote_test_done_; 77 bool remote_test_done_;
74 std::array<char, kEthernetMtu> send_data_; 78 std::array<char, kEthernetMtu> send_data_;
79
80 RTC_DISALLOW_COPY_AND_ASSIGN(TestController);
75 }; 81 };
76 82
77 } // namespace webrtc 83 } // namespace webrtc
78 84
79 #endif // WEBRTC_TOOLS_NETWORK_TESTER_TEST_CONTROLLER_H_ 85 #endif // WEBRTC_TOOLS_NETWORK_TESTER_TEST_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698