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

Side by Side Diff: webrtc/test/fake_network_pipe.h

Issue 1606183002: Allow packets to be reordered in the fake network pipe. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: uint8_t[] instead of uint8_t Created 4 years, 11 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
« no previous file with comments | « no previous file | webrtc/test/fake_network_pipe.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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_TEST_FAKE_NETWORK_PIPE_H_ 11 #ifndef WEBRTC_TEST_FAKE_NETWORK_PIPE_H_
12 #define WEBRTC_TEST_FAKE_NETWORK_PIPE_H_ 12 #define WEBRTC_TEST_FAKE_NETWORK_PIPE_H_
13 13
14 #include <set>
15 #include <string.h>
14 #include <queue> 16 #include <queue>
15 17
16 #include "webrtc/base/constructormagic.h" 18 #include "webrtc/base/constructormagic.h"
17 #include "webrtc/base/criticalsection.h" 19 #include "webrtc/base/criticalsection.h"
20 #include "webrtc/base/random.h"
18 #include "webrtc/base/scoped_ptr.h" 21 #include "webrtc/base/scoped_ptr.h"
19 #include "webrtc/typedefs.h" 22 #include "webrtc/typedefs.h"
20 23
21 namespace webrtc { 24 namespace webrtc {
22 25
23 class Clock; 26 class Clock;
24 class CriticalSectionWrapper; 27 class CriticalSectionWrapper;
25 class NetworkPacket;
26 class PacketReceiver; 28 class PacketReceiver;
27 29
30 class NetworkPacket {
31 public:
32 NetworkPacket(const uint8_t* data,
33 size_t length,
34 int64_t send_time,
35 int64_t arrival_time)
36 : data_(new uint8_t[length]),
37 data_length_(length),
38 send_time_(send_time),
39 arrival_time_(arrival_time) {
40 memcpy(data_.get(), data, length);
41 }
42
43 uint8_t* data() const { return data_.get(); }
44 size_t data_length() const { return data_length_; }
45 int64_t send_time() const { return send_time_; }
46 int64_t arrival_time() const { return arrival_time_; }
47 void IncrementArrivalTime(int64_t extra_delay) {
48 arrival_time_ += extra_delay;
49 }
50
51 private:
52 // The packet data.
53 rtc::scoped_ptr<uint8_t[]> data_;
54 // Length of data_.
55 size_t data_length_;
56 // The time the packet was sent out on the network.
57 const int64_t send_time_;
58 // The time the packet should arrive at the receiver.
59 int64_t arrival_time_;
60 };
61
28 // Class faking a network link. This is a simple and naive solution just faking 62 // Class faking a network link. This is a simple and naive solution just faking
29 // capacity and adding an extra transport delay in addition to the capacity 63 // capacity and adding an extra transport delay in addition to the capacity
30 // introduced delay. 64 // introduced delay.
31 65
32 // TODO(mflodman) Add random and bursty packet loss. 66 // TODO(mflodman) Add random and bursty packet loss.
33 class FakeNetworkPipe { 67 class FakeNetworkPipe {
34 public: 68 public:
35 struct Config { 69 struct Config {
36 Config() {} 70 Config() {}
37 // Queue length in number of packets. 71 // Queue length in number of packets.
38 size_t queue_length_packets = 0; 72 size_t queue_length_packets = 0;
39 // Delay in addition to capacity induced delay. 73 // Delay in addition to capacity induced delay.
40 int queue_delay_ms = 0; 74 int queue_delay_ms = 0;
41 // Standard deviation of the extra delay. 75 // Standard deviation of the extra delay.
42 int delay_standard_deviation_ms = 0; 76 int delay_standard_deviation_ms = 0;
43 // Link capacity in kbps. 77 // Link capacity in kbps.
44 int link_capacity_kbps = 0; 78 int link_capacity_kbps = 0;
45 // Random packet loss. 79 // Random packet loss.
46 int loss_percent = 0; 80 int loss_percent = 0;
81 // If packets are allowed to be reordered.
82 bool allow_reordering = false;
47 }; 83 };
48 84
49 FakeNetworkPipe(Clock* clock, const FakeNetworkPipe::Config& config); 85 FakeNetworkPipe(Clock* clock, const FakeNetworkPipe::Config& config);
86 FakeNetworkPipe(Clock* clock,
87 const FakeNetworkPipe::Config& config,
88 uint64_t seed);
50 ~FakeNetworkPipe(); 89 ~FakeNetworkPipe();
51 90
52 // Must not be called in parallel with SendPacket or Process. 91 // Must not be called in parallel with SendPacket or Process.
53 void SetReceiver(PacketReceiver* receiver); 92 void SetReceiver(PacketReceiver* receiver);
54 93
55 // Sets a new configuration. This won't affect packets already in the pipe. 94 // Sets a new configuration. This won't affect packets already in the pipe.
56 void SetConfig(const FakeNetworkPipe::Config& config); 95 void SetConfig(const FakeNetworkPipe::Config& config);
57 96
58 // Sends a new packet to the link. 97 // Sends a new packet to the link.
59 void SendPacket(const uint8_t* packet, size_t packet_length); 98 void SendPacket(const uint8_t* packet, size_t packet_length);
60 99
61 // Processes the network queues and trigger PacketReceiver::IncomingPacket for 100 // Processes the network queues and trigger PacketReceiver::IncomingPacket for
62 // packets ready to be delivered. 101 // packets ready to be delivered.
63 void Process(); 102 void Process();
64 int64_t TimeUntilNextProcess() const; 103 int64_t TimeUntilNextProcess() const;
65 104
66 // Get statistics. 105 // Get statistics.
67 float PercentageLoss(); 106 float PercentageLoss();
68 int AverageDelay(); 107 int AverageDelay();
69 size_t dropped_packets() { return dropped_packets_; } 108 size_t dropped_packets() { return dropped_packets_; }
70 size_t sent_packets() { return sent_packets_; } 109 size_t sent_packets() { return sent_packets_; }
71 110
72 private: 111 private:
73 Clock* const clock_; 112 Clock* const clock_;
74 mutable rtc::CriticalSection lock_; 113 mutable rtc::CriticalSection lock_;
75 PacketReceiver* packet_receiver_; 114 PacketReceiver* packet_receiver_;
76 std::queue<NetworkPacket*> capacity_link_; 115 std::queue<NetworkPacket*> capacity_link_;
77 std::queue<NetworkPacket*> delay_link_; 116 Random random_;
117
118 // Since we need to access both the packet with the earliest and latest
119 // arrival time we need to use a multiset to keep all packets sorted,
120 // hence, we cannot use a priority queue.
121 struct PacketArrivalTimeComparator {
122 bool operator()(const NetworkPacket* p1, const NetworkPacket* p2) {
123 return p1->arrival_time() < p2->arrival_time();
124 }
125 };
126 std::multiset<NetworkPacket*, PacketArrivalTimeComparator> delay_link_;
78 127
79 // Link configuration. 128 // Link configuration.
80 Config config_; 129 Config config_;
81 130
82 // Statistics. 131 // Statistics.
83 size_t dropped_packets_; 132 size_t dropped_packets_;
84 size_t sent_packets_; 133 size_t sent_packets_;
85 int total_packet_delay_; 134 int total_packet_delay_;
86 135
87 int64_t next_process_time_; 136 int64_t next_process_time_;
88 137
89 RTC_DISALLOW_COPY_AND_ASSIGN(FakeNetworkPipe); 138 RTC_DISALLOW_COPY_AND_ASSIGN(FakeNetworkPipe);
90 }; 139 };
91 140
92 } // namespace webrtc 141 } // namespace webrtc
93 142
94 #endif // WEBRTC_TEST_FAKE_NETWORK_PIPE_H_ 143 #endif // WEBRTC_TEST_FAKE_NETWORK_PIPE_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/test/fake_network_pipe.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698