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

Side by Side Diff: net/base/network_quality_estimator_unittest.cc

Issue 1376473003: Notify NQE of TCP RTT values (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed rsleevi comments Created 4 years, 10 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 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/base/network_quality_estimator.h" 5 #include "net/base/network_quality_estimator.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 #include <netinet/tcp.h>
9
8 #include <limits> 10 #include <limits>
9 #include <map> 11 #include <map>
12 #include <string>
10 #include <utility> 13 #include <utility>
11 #include <vector> 14 #include <vector>
12 15
13 #include "base/files/file_path.h" 16 #include "base/files/file_path.h"
14 #include "base/logging.h" 17 #include "base/logging.h"
15 #include "base/macros.h" 18 #include "base/macros.h"
16 #include "base/memory/scoped_ptr.h" 19 #include "base/memory/scoped_ptr.h"
17 #include "base/metrics/histogram_samples.h" 20 #include "base/metrics/histogram_samples.h"
18 #include "base/run_loop.h" 21 #include "base/run_loop.h"
19 #include "base/strings/string_number_conversions.h" 22 #include "base/strings/string_number_conversions.h"
20 #include "base/test/histogram_tester.h" 23 #include "base/test/histogram_tester.h"
21 #include "base/time/time.h" 24 #include "base/time/time.h"
22 #include "build/build_config.h" 25 #include "build/build_config.h"
23 #include "net/base/external_estimate_provider.h" 26 #include "net/base/external_estimate_provider.h"
24 #include "net/base/load_flags.h" 27 #include "net/base/load_flags.h"
25 #include "net/base/network_change_notifier.h" 28 #include "net/base/network_change_notifier.h"
29 #include "net/http/http_network_session.h"
26 #include "net/http/http_status_code.h" 30 #include "net/http/http_status_code.h"
27 #include "net/test/embedded_test_server/embedded_test_server.h" 31 #include "net/test/embedded_test_server/embedded_test_server.h"
28 #include "net/test/embedded_test_server/http_request.h" 32 #include "net/test/embedded_test_server/http_request.h"
29 #include "net/test/embedded_test_server/http_response.h" 33 #include "net/test/embedded_test_server/http_response.h"
34 #include "net/url_request/url_request.h"
30 #include "net/url_request/url_request_test_util.h" 35 #include "net/url_request/url_request_test_util.h"
31 #include "testing/gtest/include/gtest/gtest.h" 36 #include "testing/gtest/include/gtest/gtest.h"
32 #include "url/gurl.h" 37 #include "url/gurl.h"
33 38
34 namespace { 39 namespace {
35 40
36 // Helps in setting the current network type and id. 41 // Helps in setting the current network type and id.
37 class TestNetworkQualityEstimator : public net::NetworkQualityEstimator { 42 class TestNetworkQualityEstimator : public net::NetworkQualityEstimator {
38 public: 43 public:
39 TestNetworkQualityEstimator( 44 TestNetworkQualityEstimator(
40 const std::map<std::string, std::string>& variation_params, 45 const std::map<std::string, std::string>& variation_params,
41 scoped_ptr<net::ExternalEstimateProvider> external_estimate_provider) 46 scoped_ptr<net::ExternalEstimateProvider> external_estimate_provider)
42 : NetworkQualityEstimator(std::move(external_estimate_provider), 47 : NetworkQualityEstimator(std::move(external_estimate_provider),
43 variation_params, 48 variation_params,
44 true, 49 true,
45 true) { 50 true),
51 watcher_reset_notification_received_count_(0) {
46 // Set up embedded test server. 52 // Set up embedded test server.
47 embedded_test_server_.ServeFilesFromDirectory( 53 embedded_test_server_.ServeFilesFromDirectory(
48 base::FilePath(FILE_PATH_LITERAL("net/data/url_request_unittest"))); 54 base::FilePath(FILE_PATH_LITERAL("net/data/url_request_unittest")));
49 EXPECT_TRUE(embedded_test_server_.Start()); 55 EXPECT_TRUE(embedded_test_server_.Start());
50 embedded_test_server_.RegisterRequestHandler(base::Bind( 56 embedded_test_server_.RegisterRequestHandler(base::Bind(
51 &TestNetworkQualityEstimator::HandleRequest, base::Unretained(this))); 57 &TestNetworkQualityEstimator::HandleRequest, base::Unretained(this)));
52 } 58 }
53 59
54 explicit TestNetworkQualityEstimator( 60 explicit TestNetworkQualityEstimator(
55 const std::map<std::string, std::string>& variation_params) 61 const std::map<std::string, std::string>& variation_params)
(...skipping 21 matching lines...) Expand all
77 http_response->set_content("hello"); 83 http_response->set_content("hello");
78 http_response->set_content_type("text/plain"); 84 http_response->set_content_type("text/plain");
79 return std::move(http_response); 85 return std::move(http_response);
80 } 86 }
81 87
82 // Returns a GURL hosted at embedded test server. 88 // Returns a GURL hosted at embedded test server.
83 const GURL GetEchoURL() const { 89 const GURL GetEchoURL() const {
84 return embedded_test_server_.GetURL("/echo.html"); 90 return embedded_test_server_.GetURL("/echo.html");
85 } 91 }
86 92
93 void WatcherReset() override { watcher_reset_notification_received_count_++; }
94
95 size_t watcher_reset_notification_received_count() const {
96 return watcher_reset_notification_received_count_;
97 }
98
87 using NetworkQualityEstimator::ReadCachedNetworkQualityEstimate; 99 using NetworkQualityEstimator::ReadCachedNetworkQualityEstimate;
88 using NetworkQualityEstimator::OnConnectionTypeChanged; 100 using NetworkQualityEstimator::OnConnectionTypeChanged;
89 101
90 private: 102 private:
91 // NetworkQualityEstimator implementation that returns the overridden network 103 // NetworkQualityEstimator implementation that returns the overridden network
92 // id (instead of invoking platform APIs). 104 // id (instead of invoking platform APIs).
93 NetworkQualityEstimator::NetworkID GetCurrentNetworkID() const override { 105 NetworkQualityEstimator::NetworkID GetCurrentNetworkID() const override {
94 return NetworkQualityEstimator::NetworkID(current_network_type_, 106 return NetworkQualityEstimator::NetworkID(current_network_type_,
95 current_network_id_); 107 current_network_id_);
96 } 108 }
97 109
98 net::NetworkChangeNotifier::ConnectionType current_network_type_; 110 net::NetworkChangeNotifier::ConnectionType current_network_type_;
99 std::string current_network_id_; 111 std::string current_network_id_;
100 112
101 // Embedded server used for testing. 113 // Embedded server used for testing.
102 net::EmbeddedTestServer embedded_test_server_; 114 net::EmbeddedTestServer embedded_test_server_;
103 115
116 size_t watcher_reset_notification_received_count_;
117
104 DISALLOW_COPY_AND_ASSIGN(TestNetworkQualityEstimator); 118 DISALLOW_COPY_AND_ASSIGN(TestNetworkQualityEstimator);
105 }; 119 };
106 120
107 class TestRTTObserver : public net::NetworkQualityEstimator::RTTObserver { 121 class TestRTTObserver : public net::NetworkQualityEstimator::RTTObserver {
108 public: 122 public:
109 struct Observation { 123 struct Observation {
110 Observation(int32_t ms, 124 Observation(int32_t ms,
111 const base::TimeTicks& ts, 125 const base::TimeTicks& ts,
112 net::NetworkQualityEstimator::ObservationSource src) 126 net::NetworkQualityEstimator::ObservationSource src)
113 : rtt_ms(ms), timestamp(ts), source(src) {} 127 : rtt_ms(ms), timestamp(ts), source(src) {}
(...skipping 972 matching lines...) Expand 10 before | Expand all | Expand 10 after
1086 quic_watcher->OnUpdatedRTTAvailable(quic_rtt); 1100 quic_watcher->OnUpdatedRTTAvailable(quic_rtt);
1087 1101
1088 EXPECT_EQ(4U, rtt_observer.observations().size()); 1102 EXPECT_EQ(4U, rtt_observer.observations().size());
1089 EXPECT_EQ(2U, throughput_observer.observations().size()); 1103 EXPECT_EQ(2U, throughput_observer.observations().size());
1090 1104
1091 EXPECT_EQ(tcp_rtt.InMilliseconds(), rtt_observer.observations().at(2).rtt_ms); 1105 EXPECT_EQ(tcp_rtt.InMilliseconds(), rtt_observer.observations().at(2).rtt_ms);
1092 EXPECT_EQ(quic_rtt.InMilliseconds(), 1106 EXPECT_EQ(quic_rtt.InMilliseconds(),
1093 rtt_observer.observations().at(3).rtt_ms); 1107 rtt_observer.observations().at(3).rtt_ms);
1094 } 1108 }
1095 1109
1110 // TestTCPSocketRTT requires kernel support for tcp_info struct, and so it is
1111 // enabled only on the Linux platform.
Ryan Sleevi 2016/02/25 22:48:46 This comment does not match line 1112 :)
tbansal1 2016/02/26 23:43:34 Thanks, fixed.
1112 #if defined(TCP_INFO)
1113 #define MAYBE_TestTCPSocketRTT TestTCPSocketRTT
1114 #else
1115 #define MAYBE_TestTCPSocketRTT DISABLED_TestTCPSocketRTT
1116 #endif
1117 // Tests that the TCP socket notifies the Network Quality Estimator of TCP RTTs,
1118 // which in turn notifies registered RTT observers.
1119 TEST(NetworkQualityEstimatorTest, MAYBE_TestTCPSocketRTT) {
1120 base::HistogramTester histogram_tester;
1121 TestRTTObserver rtt_observer;
1122 std::map<std::string, std::string> variation_params;
1123 TestNetworkQualityEstimator estimator(variation_params);
1124 estimator.AddRTTObserver(&rtt_observer);
1125
1126 TestDelegate test_delegate;
1127 TestURLRequestContext context(true);
1128 context.set_network_quality_estimator(&estimator);
1129
1130 scoped_ptr<HttpNetworkSession::Params> params(new HttpNetworkSession::Params);
1131 // |estimator| should be notified of TCP RTT observations.
1132 params->socket_performance_watcher_factory = &estimator;
1133 context.set_http_network_session_params(std::move(params));
1134 context.Init();
1135
1136 EXPECT_EQ(0U, rtt_observer.observations().size());
1137 EXPECT_EQ(0U, estimator.watcher_reset_notification_received_count());
1138
1139 int total_tcp_rtt_notifications_received = 0;
1140
1141 const size_t kNumRequests = 2;
1142
1143 // Send two requests. Verify that the completion of each request generates at
1144 // least one TCP RTT observation.
1145 for (size_t i = 0; i < kNumRequests; ++i) {
1146 size_t before_count_tcp_rtt_observations = 0;
1147 for (auto observation : rtt_observer.observations()) {
1148 if (observation.source == NetworkQualityEstimator::TCP)
1149 ++before_count_tcp_rtt_observations;
1150 }
1151
1152 scoped_ptr<URLRequest> request(context.CreateRequest(
1153 estimator.GetEchoURL(), DEFAULT_PRIORITY, &test_delegate));
1154 request->Start();
1155 base::RunLoop().Run();
1156
1157 size_t after_count_tcp_rtt_observations = 0;
1158 for (auto observation : rtt_observer.observations()) {
1159 if (observation.source == NetworkQualityEstimator::TCP)
1160 ++after_count_tcp_rtt_observations;
1161 }
1162 EXPECT_LT(before_count_tcp_rtt_observations,
1163 after_count_tcp_rtt_observations)
1164 << i;
1165 total_tcp_rtt_notifications_received +=
1166 (after_count_tcp_rtt_observations - before_count_tcp_rtt_observations);
1167 }
1168 EXPECT_EQ(total_tcp_rtt_notifications_received,
1169 histogram_tester
1170 .GetHistogramSamplesSinceCreation("SPW.TCPRTT.NotifyDelay")
1171 ->TotalCount());
1172 // One reset should be received for each request.
1173 EXPECT_LE(kNumRequests,
1174 estimator.watcher_reset_notification_received_count());
1175 }
1176
1096 } // namespace net 1177 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698