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

Unified Diff: net/socket/client_socket_pool_base.cc

Issue 3191019: A/B experiment for re-establishing TCP connections (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 4 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/client_socket_pool_base.h ('k') | net/socket/client_socket_pool_base_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/client_socket_pool_base.cc
===================================================================
--- net/socket/client_socket_pool_base.cc (revision 57274)
+++ net/socket/client_socket_pool_base.cc (working copy)
@@ -27,6 +27,10 @@
// some conditions. See http://crbug.com/4606.
const int kCleanupInterval = 10; // DO NOT INCREASE THIS TIMEOUT.
+// Indicate whether or not we should establish a new TCP connection after a
+// certain timeout has passed without receiving an ACK.
+bool g_connect_backup_jobs_enabled = true;
+
} // namespace
namespace net {
@@ -137,7 +141,7 @@
unused_idle_socket_timeout_(unused_idle_socket_timeout),
used_idle_socket_timeout_(used_idle_socket_timeout),
connect_job_factory_(connect_job_factory),
- backup_jobs_enabled_(false),
+ connect_backup_jobs_enabled_(false),
ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)),
pool_generation_number_(0),
in_destructor_(false) {
@@ -247,10 +251,11 @@
// If we don't have any sockets in this group, set a timer for potentially
// creating a new one. If the SYN is lost, this backup socket may complete
// before the slow socket, improving end user latency.
- if (group.IsEmpty() && !group.backup_job && backup_jobs_enabled_) {
- group.backup_job = connect_job_factory_->NewConnectJob(group_name,
- *request,
- this);
+ if (group.IsEmpty() && !group.connect_backup_job &&
+ connect_backup_jobs_enabled_) {
+ group.connect_backup_job = connect_job_factory_->NewConnectJob(group_name,
+ *request,
+ this);
StartBackupSocketTimer(group_name);
}
@@ -327,7 +332,7 @@
CHECK(group.backup_task);
group.backup_task = NULL;
- CHECK(group.backup_job);
+ CHECK(group.connect_backup_job);
// If there are no more jobs pending, there is no work to do.
// If we've done our cleanups correctly, this should not happen.
@@ -345,14 +350,15 @@
return;
}
- group.backup_job->net_log().AddEvent(NetLog::TYPE_SOCKET_BACKUP_CREATED,
- NULL);
+ group.connect_backup_job->net_log().AddEvent(
+ NetLog::TYPE_SOCKET_BACKUP_CREATED,
+ NULL);
SIMPLE_STATS_COUNTER("socket.backup_created");
- int rv = group.backup_job->Connect();
+ int rv = group.connect_backup_job->Connect();
connecting_socket_count_++;
- group.jobs.insert(group.backup_job);
- ConnectJob* job = group.backup_job;
- group.backup_job = NULL;
+ group.jobs.insert(group.connect_backup_job);
+ ConnectJob* job = group.connect_backup_job;
+ group.connect_backup_job = NULL;
if (rv != ERR_IO_PENDING)
OnConnectJobComplete(rv, job);
}
@@ -495,6 +501,15 @@
}
}
+// static
+void ClientSocketPoolBaseHelper::set_connect_backup_jobs_enabled(bool enabled) {
+ g_connect_backup_jobs_enabled = enabled;
+}
+
+void ClientSocketPoolBaseHelper::EnableConnectBackupJobs() {
+ connect_backup_jobs_enabled_ = g_connect_backup_jobs_enabled;
+}
+
void ClientSocketPoolBaseHelper::IncrementIdleCount() {
if (++idle_socket_count_ == 1)
timer_.Start(TimeDelta::FromSeconds(kCleanupInterval), this,
« no previous file with comments | « net/socket/client_socket_pool_base.h ('k') | net/socket/client_socket_pool_base_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698