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

Unified Diff: net/socket/tcp_client_socket_win.cc

Issue 12886034: Remove experimental code to pick the "warmest" socket (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: sync, fix conflict Created 7 years, 9 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 | « net/socket/tcp_client_socket_win.h ('k') | net/socket/transport_client_socket_pool_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/tcp_client_socket_win.cc
===================================================================
--- net/socket/tcp_client_socket_win.cc (revision 191149)
+++ net/socket/tcp_client_socket_win.cc (working copy)
@@ -343,8 +343,7 @@
next_connect_state_(CONNECT_STATE_NONE),
connect_os_error_(0),
net_log_(BoundNetLog::Make(net_log, NetLog::SOURCE_SOCKET)),
- previously_disconnected_(false),
- num_bytes_read_(0) {
+ previously_disconnected_(false) {
net_log_.BeginEvent(NetLog::TYPE_SOCKET_ALIVE,
source.ToEventParametersCallback());
EnsureWinsockInit();
@@ -501,7 +500,6 @@
SockaddrStorage storage;
if (!endpoint.ToSockAddr(storage.addr, &storage.addr_len))
return ERR_INVALID_ARGUMENT;
- connect_start_time_ = base::TimeTicks::Now();
if (!connect(socket_, storage.addr, storage.addr_len)) {
// Connected without waiting!
//
@@ -542,7 +540,6 @@
}
if (result == OK) {
- connect_time_micros_ = base::TimeTicks::Now() - connect_start_time_;
use_history_.set_was_ever_connected();
return OK; // Done!
}
@@ -693,14 +690,6 @@
return false;
}
-int64 TCPClientSocketWin::NumBytesRead() const {
- return num_bytes_read_;
-}
-
-base::TimeDelta TCPClientSocketWin::GetConnectTimeMicros() const {
- return connect_time_micros_;
-}
-
bool TCPClientSocketWin::WasNpnNegotiated() const {
return false;
}
@@ -854,7 +843,6 @@
if (rv > 0) {
use_history_.set_was_used_to_convey_data();
read_bytes.Add(rv);
- num_bytes_read_ += rv;
}
net_log_.AddByteTransferEvent(NetLog::TYPE_SOCKET_BYTES_RECEIVED, rv,
buf->data());
@@ -879,7 +867,6 @@
if (num > 0) {
use_history_.set_was_used_to_convey_data();
read_bytes.Add(num);
- num_bytes_read_ += num;
}
net_log_.AddByteTransferEvent(NetLog::TYPE_SOCKET_BYTES_RECEIVED, num,
buf->data());
@@ -962,7 +949,6 @@
if (ok) {
base::StatsCounter read_bytes("tcp.read_bytes");
read_bytes.Add(num_bytes);
- num_bytes_read_ += num_bytes;
if (num_bytes > 0)
use_history_.set_was_used_to_convey_data();
net_log_.AddByteTransferEvent(NetLog::TYPE_SOCKET_BYTES_RECEIVED,
« no previous file with comments | « net/socket/tcp_client_socket_win.h ('k') | net/socket/transport_client_socket_pool_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698