summaryrefslogtreecommitdiffstats
path: root/net/flip
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-07 22:09:23 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-07 22:09:23 +0000
commiteec34d7da071598b3f3ea6bda91b8c7f7b9fd42d (patch)
tree37612d5d33157d4eccfaaa9094a62a45a7d36db7 /net/flip
parent3473ff12dc6cbfcc67643cba8f5fff89e4a3e4f7 (diff)
downloadchromium_src-eec34d7da071598b3f3ea6bda91b8c7f7b9fd42d.zip
chromium_src-eec34d7da071598b3f3ea6bda91b8c7f7b9fd42d.tar.gz
chromium_src-eec34d7da071598b3f3ea6bda91b8c7f7b9fd42d.tar.bz2
Flip: Add LoadLog for TCP connect().
Review URL: http://codereview.chromium.org/460113 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34000 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/flip')
-rw-r--r--net/flip/flip_network_transaction.cc3
-rw-r--r--net/flip/flip_session.cc6
-rw-r--r--net/flip/flip_session.h4
3 files changed, 9 insertions, 4 deletions
diff --git a/net/flip/flip_network_transaction.cc b/net/flip/flip_network_transaction.cc
index f331665..1e1320a 100644
--- a/net/flip/flip_network_transaction.cc
+++ b/net/flip/flip_network_transaction.cc
@@ -226,7 +226,8 @@ int FlipNetworkTransaction::DoInitConnection() {
flip_ = session_->flip_session_pool()->Get(resolve_info, session_);
DCHECK(flip_);
- return flip_->Connect(connection_group, resolve_info, request_->priority);
+ return flip_->Connect(
+ connection_group, resolve_info, request_->priority, load_log_);
}
int FlipNetworkTransaction::DoInitConnectionComplete(int result) {
diff --git a/net/flip/flip_session.cc b/net/flip/flip_session.cc
index d02a506..05065b0 100644
--- a/net/flip/flip_session.cc
+++ b/net/flip/flip_session.cc
@@ -12,6 +12,7 @@
#include "base/stl_util-inl.h"
#include "base/string_util.h"
#include "net/base/load_flags.h"
+#include "net/base/load_log.h"
#include "net/base/net_util.h"
#include "net/flip/flip_frame_builder.h"
#include "net/flip/flip_protocol.h"
@@ -213,7 +214,8 @@ FlipSession::~FlipSession() {
net::Error FlipSession::Connect(const std::string& group_name,
const HostResolver::RequestInfo& host,
- RequestPriority priority) {
+ RequestPriority priority,
+ LoadLog* load_log) {
DCHECK(priority >= FLIP_PRIORITY_HIGHEST && priority <= FLIP_PRIORITY_LOWEST);
// If the connect process is started, let the caller continue.
@@ -226,7 +228,7 @@ net::Error FlipSession::Connect(const std::string& group_name,
flip_sessions.Increment();
int rv = connection_.Init(group_name, host, priority, &connect_callback_,
- session_->tcp_socket_pool(), NULL);
+ session_->tcp_socket_pool(), load_log);
DCHECK(rv <= 0);
// If the connect is pending, we still return ok. The APIs enqueue
diff --git a/net/flip/flip_session.h b/net/flip/flip_session.h
index a0be118..965f515 100644
--- a/net/flip/flip_session.h
+++ b/net/flip/flip_session.h
@@ -32,6 +32,7 @@ class FlipStream;
class HttpNetworkSession;
class HttpRequestInfo;
class HttpResponseInfo;
+class LoadLog;
class FlipSession : public base::RefCounted<FlipSession>,
public flip::FlipFramerVisitorInterface {
@@ -45,7 +46,8 @@ class FlipSession : public base::RefCounted<FlipSession>,
// immediately start using the FlipSession while it connects.
net::Error Connect(const std::string& group_name,
const HostResolver::RequestInfo& host,
- RequestPriority priority);
+ RequestPriority priority,
+ LoadLog* load_log);
// Get a stream for a given |request|. In the typical case, this will involve
// the creation of a new stream (and will send the SYN frame). If the server