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

Unified Diff: net/socket/client_socket_pool_base.cc

Issue 6990036: Deciding best connection to schedule requests on based on cwnd and idle time (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Fixing flag name Created 9 years, 6 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
Index: net/socket/client_socket_pool_base.cc
===================================================================
--- net/socket/client_socket_pool_base.cc (revision 88319)
+++ net/socket/client_socket_pool_base.cc (working copy)
@@ -4,11 +4,16 @@
#include "net/socket/client_socket_pool_base.h"
+#include <math.h>
+#include <utility>
+#include "base/command_line.h"
#include "base/compiler_specific.h"
#include "base/format_macros.h"
+#include "base/logging.h"
#include "base/message_loop.h"
#include "base/metrics/stats_counters.h"
#include "base/stl_util-inl.h"
+#include "base/string_number_conversions.h"
#include "base/string_util.h"
#include "base/time.h"
#include "base/values.h"
@@ -32,6 +37,9 @@
// after a certain timeout has passed without receiving an ACK.
bool g_connect_backup_jobs_enabled = true;
+// Decay coef.
+double g_tcp_socket_estimated_cwnd_decay_coef = 1000000;
+
} // namespace
namespace net {
@@ -363,7 +371,13 @@
const Request* request, Group* group) {
std::list<IdleSocket>* idle_sockets = group->mutable_idle_sockets();
std::list<IdleSocket>::iterator idle_socket_it = idle_sockets->end();
+ double max_benefit = -100000000;
+ std::pair<int, int64> best_pair;
+ std::string debug_log(request->handle()->group_name());
+ std::string candidates;
+ double rtt_ms = 0;
+
// Iterate through the idle sockets forwards (oldest to newest)
// * Delete any disconnected ones.
// * If we find a used idle socket, assign to |idle_socket|. At the end,
@@ -379,11 +393,34 @@
if (it->socket->WasEverUsed()) {
// We found one we can reuse!
- idle_socket_it = it;
+ int64 bytes_read = it->socket->NumBytesRead();
+ double B = static_cast<double>(bytes_read) / 1024.0;
willchan no longer on Chromium 2011/06/09 15:08:54 nit: fix your variable naming, they should follow
Gagan 2011/06/09 19:49:26 Changed the variable names to follow convention.
+
+ int64 idle_time = (base::TimeTicks::Now() - it->start_time)
+ .InMicroseconds();
+ double idle_time_mins = static_cast<double>(idle_time) / 60000000.0;
+ double T = pow(g_tcp_socket_estimated_cwnd_decay_coef, idle_time_mins);
Mike Belshe 2011/06/09 16:08:52 I believe this math is broken and we have to find
Gagan 2011/06/09 19:49:26 Yes, i want a damping function. Im choosing coef ^
+
+ debug_log = StringPrintf("%s\n%f\t%f\t%f",
Mike Belshe 2011/06/09 16:08:52 this debug_log appears unused (or overridden below
Gagan 2011/06/09 19:49:26 its appending to its previous value
+ debug_log.data(), B, idle_time_mins, T);
+ double benefit = B - T;
+
+ // Equality to prefer recently used connection.
+ if (benefit >= max_benefit) {
+ idle_socket_it = it;
+ max_benefit = benefit;
+ best_pair = std::make_pair(bytes_read, idle_time);
+ rtt_ms = it->socket->GetRTTInMs();
+ }
}
++it;
}
+ debug_log = StringPrintf("%s\nChose socket <%d %ld>\nRtt = %f",
+ debug_log.data(),
+ best_pair.first, best_pair.second,
+ rtt_ms);
+ LOG(ERROR) << "\n\n----------------------------------------" << debug_log;
// If we haven't found an idle socket, that means there are no used idle
// sockets. Pick the oldest (first) idle socket (FIFO).
@@ -649,6 +686,15 @@
return old_value;
}
+// static
+double ClientSocketPoolBaseHelper::set_tcp_socket_estimated_cwnd_decay_coef(
+ double coef) {
+ LOG(ERROR) << "Setting g_tcp_socket_estimated_cwnd_decay_coef = " << coef;
Mike Belshe 2011/06/09 16:08:52 nit: this isn't a LOG(ERROR), LOG(DEBUG) or remov
Gagan 2011/06/09 19:49:26 Changed to LOG(DEBUG)
+ double old_value = g_tcp_socket_estimated_cwnd_decay_coef;
+ g_tcp_socket_estimated_cwnd_decay_coef = coef;
+ return old_value;
+}
+
void ClientSocketPoolBaseHelper::EnableConnectBackupJobs() {
connect_backup_jobs_enabled_ = g_connect_backup_jobs_enabled;
}

Powered by Google App Engine
This is Rietveld 408576698