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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/spdy/spdy_session.cc

Issue 934823005: Rename SPDY netlog strings to HTTP2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rename SOURCE_SPDY_SESSION. Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/spdy/spdy_proxy_client_socket_unittest.cc ('k') | net/spdy/spdy_session_pool.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_session.cc
diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc
index 58e4af7b1fbf8d9f9935fdd52f2d89992d6071a3..cf0ab1f99f680e5c59936e23f9a13c0533a91acb 100644
--- a/net/spdy/spdy_session.cc
+++ b/net/spdy/spdy_session.cc
@@ -661,7 +661,7 @@ SpdySession::SpdySession(
session_send_window_size_(0),
session_recv_window_size_(0),
session_unacked_recv_window_bytes_(0),
- net_log_(BoundNetLog::Make(net_log, NetLog::SOURCE_SPDY_SESSION)),
+ net_log_(BoundNetLog::Make(net_log, NetLog::SOURCE_HTTP2_SESSION)),
verify_domain_authentication_(verify_domain_authentication),
enable_sending_initial_data_(enable_sending_initial_data),
enable_compression_(enable_compression),
@@ -678,7 +678,7 @@ SpdySession::SpdySession(
DCHECK_LE(protocol_, kProtoSPDYMaximumVersion);
DCHECK(HttpStreamFactory::spdy_enabled());
net_log_.BeginEvent(
- NetLog::TYPE_SPDY_SESSION,
+ NetLog::TYPE_HTTP2_SESSION,
base::Bind(&NetLogSpdySessionCallback, &host_port_proxy_pair()));
next_unclaimed_push_stream_sweep_time_ = time_func_() +
base::TimeDelta::FromSeconds(kMinPushedStreamLifetimeSeconds);
@@ -697,7 +697,7 @@ SpdySession::~SpdySession() {
RecordHistograms();
- net_log_.EndEvent(NetLog::TYPE_SPDY_SESSION);
+ net_log_.EndEvent(NetLog::TYPE_HTTP2_SESSION);
}
void SpdySession::InitializeWithSocket(
@@ -754,10 +754,10 @@ void SpdySession::InitializeWithSocket(
protocol_ - kProtoSPDYHistogramOffset,
kProtoSPDYMaximumVersion - kProtoSPDYMinimumVersion + 1);
- net_log_.AddEvent(NetLog::TYPE_SPDY_SESSION_INITIALIZED,
- base::Bind(&NetLogSpdyInitializedCallback,
- connection_->socket()->NetLog().source(),
- protocol_));
+ net_log_.AddEvent(
+ NetLog::TYPE_HTTP2_SESSION_INITIALIZED,
+ base::Bind(&NetLogSpdyInitializedCallback,
+ connection_->socket()->NetLog().source(), protocol_));
DCHECK_EQ(availability_state_, STATE_AVAILABLE);
connection_->AddHigherLayeredPool(this);
@@ -852,7 +852,7 @@ int SpdySession::TryCreateStream(
}
stalled_streams_++;
- net_log().AddEvent(NetLog::TYPE_SPDY_SESSION_STALLED_MAX_STREAMS);
+ net_log().AddEvent(NetLog::TYPE_HTTP2_SESSION_STALLED_MAX_STREAMS);
RequestPriority priority = request->priority();
CHECK_GE(priority, MINIMUM_PRIORITY);
CHECK_LE(priority, MAXIMUM_PRIORITY);
@@ -1083,13 +1083,11 @@ scoped_ptr<SpdyFrame> SpdySession::CreateSynStream(
streams_initiated_count_++;
if (net_log().IsLogging()) {
- net_log().AddEvent(NetLog::TYPE_SPDY_SESSION_SYN_STREAM,
- base::Bind(&NetLogSpdySynStreamSentCallback,
- &block,
+ net_log().AddEvent(NetLog::TYPE_HTTP2_SESSION_SYN_STREAM,
+ base::Bind(&NetLogSpdySynStreamSentCallback, &block,
(flags & CONTROL_FLAG_FIN) != 0,
(flags & CONTROL_FLAG_UNIDIRECTIONAL) != 0,
- spdy_priority,
- stream_id));
+ spdy_priority, stream_id));
}
return syn_frame.Pass();
@@ -1160,7 +1158,7 @@ scoped_ptr<SpdyBuffer> SpdySession::CreateDataBuffer(SpdyStreamId stream_id,
// might end up being stalled by the session also.
QueueSendStalledStream(*stream);
net_log().AddEvent(
- NetLog::TYPE_SPDY_SESSION_STREAM_STALLED_BY_STREAM_SEND_WINDOW,
+ NetLog::TYPE_HTTP2_SESSION_STREAM_STALLED_BY_STREAM_SEND_WINDOW,
NetLog::IntegerCallback("stream_id", stream_id));
return scoped_ptr<SpdyBuffer>();
}
@@ -1175,7 +1173,7 @@ scoped_ptr<SpdyBuffer> SpdySession::CreateDataBuffer(SpdyStreamId stream_id,
stream->set_send_stalled_by_flow_control(true);
QueueSendStalledStream(*stream);
net_log().AddEvent(
- NetLog::TYPE_SPDY_SESSION_STREAM_STALLED_BY_SESSION_SEND_WINDOW,
+ NetLog::TYPE_HTTP2_SESSION_STREAM_STALLED_BY_SESSION_SEND_WINDOW,
NetLog::IntegerCallback("stream_id", stream_id));
return scoped_ptr<SpdyBuffer>();
}
@@ -1191,10 +1189,9 @@ scoped_ptr<SpdyBuffer> SpdySession::CreateDataBuffer(SpdyStreamId stream_id,
flags = static_cast<SpdyDataFlags>(flags & ~DATA_FLAG_FIN);
if (net_log().IsLogging()) {
- net_log().AddEvent(
- NetLog::TYPE_SPDY_SESSION_SEND_DATA,
- base::Bind(&NetLogSpdyDataCallback, stream_id, effective_len,
- (flags & DATA_FLAG_FIN) != 0));
+ net_log().AddEvent(NetLog::TYPE_HTTP2_SESSION_SEND_DATA,
+ base::Bind(&NetLogSpdyDataCallback, stream_id,
+ effective_len, (flags & DATA_FLAG_FIN) != 0));
}
// Send PrefacePing for DATA_FRAMEs with nonzero payload size.
@@ -1333,7 +1330,7 @@ void SpdySession::EnqueueResetStreamFrame(SpdyStreamId stream_id,
DCHECK_NE(stream_id, 0u);
net_log().AddEvent(
- NetLog::TYPE_SPDY_SESSION_SEND_RST_STREAM,
+ NetLog::TYPE_HTTP2_SESSION_SEND_RST_STREAM,
base::Bind(&NetLogSpdyRstCallback, stream_id, status, &description));
DCHECK(buffered_spdy_framer_.get());
@@ -1740,7 +1737,7 @@ void SpdySession::DoDrainSession(Error err, const std::string& description) {
error_on_close_ = err;
net_log_.AddEvent(
- NetLog::TYPE_SPDY_SESSION_CLOSE,
+ NetLog::TYPE_HTTP2_SESSION_CLOSE,
base::Bind(&NetLogSpdySessionCloseCallback, err, &description));
UMA_HISTOGRAM_SPARSE_SLOWLY("Net.SpdySession.ClosedOnError", -err);
@@ -1977,7 +1974,7 @@ base::WeakPtr<SpdyStream> SpdySession::GetActivePushStream(const GURL& url) {
return base::WeakPtr<SpdyStream>();
}
- net_log_.AddEvent(NetLog::TYPE_SPDY_STREAM_ADOPTED_PUSH_STREAM,
+ net_log_.AddEvent(NetLog::TYPE_HTTP2_STREAM_ADOPTED_PUSH_STREAM,
base::Bind(&NetLogSpdyAdoptedPushStreamCallback,
active_it->second.stream->stream_id(), &url));
return active_it->second.stream->GetWeakPtr();
@@ -2061,7 +2058,7 @@ void SpdySession::OnStreamFrameData(SpdyStreamId stream_id,
DCHECK_LT(len, 1u << 24);
if (net_log().IsLogging()) {
net_log().AddEvent(
- NetLog::TYPE_SPDY_SESSION_RECV_DATA,
+ NetLog::TYPE_HTTP2_SESSION_RECV_DATA,
base::Bind(&NetLogSpdyDataCallback, stream_id, len, fin));
}
@@ -2114,10 +2111,9 @@ void SpdySession::OnSettings(bool clear_persisted) {
http_server_properties_->ClearSpdySettings(host_port_pair());
if (net_log_.IsLogging()) {
- net_log_.AddEvent(
- NetLog::TYPE_SPDY_SESSION_RECV_SETTINGS,
- base::Bind(&NetLogSpdySettingsCallback, host_port_pair(),
- clear_persisted));
+ net_log_.AddEvent(NetLog::TYPE_HTTP2_SESSION_RECV_SETTINGS,
+ base::Bind(&NetLogSpdySettingsCallback, host_port_pair(),
+ clear_persisted));
}
if (GetProtocolVersion() >= SPDY4) {
@@ -2147,12 +2143,9 @@ void SpdySession::OnSetting(SpdySettingsIds id,
// Log the setting.
const SpdyMajorVersion protocol_version = GetProtocolVersion();
- net_log_.AddEvent(NetLog::TYPE_SPDY_SESSION_RECV_SETTING,
- base::Bind(&NetLogSpdySettingCallback,
- id,
- protocol_version,
- static_cast<SpdySettingsFlags>(flags),
- value));
+ net_log_.AddEvent(NetLog::TYPE_HTTP2_SESSION_RECV_SETTING,
+ base::Bind(&NetLogSpdySettingCallback, id, protocol_version,
+ static_cast<SpdySettingsFlags>(flags), value));
}
void SpdySession::OnSendCompressedFrame(
@@ -2232,10 +2225,9 @@ void SpdySession::OnSynStream(SpdyStreamId stream_id,
if (net_log_.IsLogging()) {
net_log_.AddEvent(
- NetLog::TYPE_SPDY_SESSION_PUSHED_SYN_STREAM,
- base::Bind(&NetLogSpdySynStreamReceivedCallback,
- &headers, fin, unidirectional, priority,
- stream_id, associated_stream_id));
+ NetLog::TYPE_HTTP2_SESSION_PUSHED_SYN_STREAM,
+ base::Bind(&NetLogSpdySynStreamReceivedCallback, &headers, fin,
+ unidirectional, priority, stream_id, associated_stream_id));
}
// Split headers to simulate push promise and response.
@@ -2304,10 +2296,9 @@ void SpdySession::OnSynReply(SpdyStreamId stream_id,
base::TimeTicks recv_first_byte_time = time_func_();
if (net_log().IsLogging()) {
- net_log().AddEvent(
- NetLog::TYPE_SPDY_SESSION_SYN_REPLY,
- base::Bind(&NetLogSpdySynReplyOrHeadersReceivedCallback,
- &headers, fin, stream_id));
+ net_log().AddEvent(NetLog::TYPE_HTTP2_SESSION_SYN_REPLY,
+ base::Bind(&NetLogSpdySynReplyOrHeadersReceivedCallback,
+ &headers, fin, stream_id));
}
ActiveStreamMap::iterator it = active_streams_.find(stream_id);
@@ -2350,10 +2341,9 @@ void SpdySession::OnHeaders(SpdyStreamId stream_id,
CHECK(in_io_loop_);
if (net_log().IsLogging()) {
- net_log().AddEvent(
- NetLog::TYPE_SPDY_SESSION_RECV_HEADERS,
- base::Bind(&NetLogSpdySynReplyOrHeadersReceivedCallback,
- &headers, fin, stream_id));
+ net_log().AddEvent(NetLog::TYPE_HTTP2_SESSION_RECV_HEADERS,
+ base::Bind(&NetLogSpdySynReplyOrHeadersReceivedCallback,
+ &headers, fin, stream_id));
}
ActiveStreamMap::iterator it = active_streams_.find(stream_id);
@@ -2414,9 +2404,8 @@ void SpdySession::OnRstStream(SpdyStreamId stream_id,
std::string description;
net_log().AddEvent(
- NetLog::TYPE_SPDY_SESSION_RST_STREAM,
- base::Bind(&NetLogSpdyRstCallback,
- stream_id, status, &description));
+ NetLog::TYPE_HTTP2_SESSION_RST_STREAM,
+ base::Bind(&NetLogSpdyRstCallback, stream_id, status, &description));
ActiveStreamMap::iterator it = active_streams_.find(stream_id);
if (it == active_streams_.end()) {
@@ -2456,12 +2445,10 @@ void SpdySession::OnGoAway(SpdyStreamId last_accepted_stream_id,
// TODO(jgraettinger): UMA histogram on |status|.
- net_log_.AddEvent(NetLog::TYPE_SPDY_SESSION_GOAWAY,
- base::Bind(&NetLogSpdyGoAwayCallback,
- last_accepted_stream_id,
- active_streams_.size(),
- unclaimed_pushed_streams_.size(),
- status));
+ net_log_.AddEvent(NetLog::TYPE_HTTP2_SESSION_GOAWAY,
+ base::Bind(&NetLogSpdyGoAwayCallback,
+ last_accepted_stream_id, active_streams_.size(),
+ unclaimed_pushed_streams_.size(), status));
MakeUnavailable();
if (status == GOAWAY_HTTP_1_1_REQUIRED) {
// TODO(bnc): Record histogram with number of open streams capped at 50.
@@ -2480,7 +2467,7 @@ void SpdySession::OnPing(SpdyPingId unique_id, bool is_ack) {
CHECK(in_io_loop_);
net_log_.AddEvent(
- NetLog::TYPE_SPDY_SESSION_PING,
+ NetLog::TYPE_HTTP2_SESSION_PING,
base::Bind(&NetLogSpdyPingCallback, unique_id, is_ack, "received"));
// Send response to a PING from server.
@@ -2511,10 +2498,9 @@ void SpdySession::OnWindowUpdate(SpdyStreamId stream_id,
CHECK(in_io_loop_);
DCHECK_LE(delta_window_size, static_cast<uint32>(kint32max));
- net_log_.AddEvent(
- NetLog::TYPE_SPDY_SESSION_RECEIVED_WINDOW_UPDATE_FRAME,
- base::Bind(&NetLogSpdyWindowUpdateFrameCallback,
- stream_id, delta_window_size));
+ net_log_.AddEvent(NetLog::TYPE_HTTP2_SESSION_RECEIVED_WINDOW_UPDATE_FRAME,
+ base::Bind(&NetLogSpdyWindowUpdateFrameCallback, stream_id,
+ delta_window_size));
if (stream_id == kSessionFlowControlStreamId) {
// WINDOW_UPDATE for the session.
@@ -2741,11 +2727,9 @@ void SpdySession::OnPushPromise(SpdyStreamId stream_id,
CHECK(in_io_loop_);
if (net_log_.IsLogging()) {
- net_log_.AddEvent(NetLog::TYPE_SPDY_SESSION_RECV_PUSH_PROMISE,
+ net_log_.AddEvent(NetLog::TYPE_HTTP2_SESSION_RECV_PUSH_PROMISE,
base::Bind(&NetLogSpdyPushPromiseReceivedCallback,
- &headers,
- stream_id,
- promised_stream_id));
+ &headers, stream_id, promised_stream_id));
}
// Any priority will do.
@@ -2836,7 +2820,7 @@ void SpdySession::SendInitialData() {
void SpdySession::SendSettings(const SettingsMap& settings) {
const SpdyMajorVersion protocol_version = GetProtocolVersion();
net_log_.AddEvent(
- NetLog::TYPE_SPDY_SESSION_SEND_SETTINGS,
+ NetLog::TYPE_HTTP2_SESSION_SEND_SETTINGS,
base::Bind(&NetLogSpdySendSettingsCallback, &settings, protocol_version));
// Create the SETTINGS frame and send it.
DCHECK(buffered_spdy_framer_.get());
@@ -2856,13 +2840,13 @@ void SpdySession::HandleSetting(uint32 id, uint32 value) {
case SETTINGS_INITIAL_WINDOW_SIZE: {
if (flow_control_state_ < FLOW_CONTROL_STREAM) {
net_log().AddEvent(
- NetLog::TYPE_SPDY_SESSION_INITIAL_WINDOW_SIZE_NO_FLOW_CONTROL);
+ NetLog::TYPE_HTTP2_SESSION_INITIAL_WINDOW_SIZE_NO_FLOW_CONTROL);
return;
}
if (value > static_cast<uint32>(kint32max)) {
net_log().AddEvent(
- NetLog::TYPE_SPDY_SESSION_INITIAL_WINDOW_SIZE_OUT_OF_RANGE,
+ NetLog::TYPE_HTTP2_SESSION_INITIAL_WINDOW_SIZE_OUT_OF_RANGE,
NetLog::IntegerCallback("initial_window_size", value));
return;
}
@@ -2873,7 +2857,7 @@ void SpdySession::HandleSetting(uint32 id, uint32 value) {
stream_initial_send_window_size_ = static_cast<int32>(value);
UpdateStreamsSendWindowSize(delta_window_size);
net_log().AddEvent(
- NetLog::TYPE_SPDY_SESSION_UPDATE_STREAMS_SEND_WINDOW_SIZE,
+ NetLog::TYPE_HTTP2_SESSION_UPDATE_STREAMS_SEND_WINDOW_SIZE,
NetLog::IntegerCallback("delta_window_size", delta_window_size));
break;
}
@@ -2919,10 +2903,9 @@ void SpdySession::SendWindowUpdateFrame(SpdyStreamId stream_id,
CHECK_EQ(stream_id, kSessionFlowControlStreamId);
}
- net_log_.AddEvent(
- NetLog::TYPE_SPDY_SESSION_SENT_WINDOW_UPDATE_FRAME,
- base::Bind(&NetLogSpdyWindowUpdateFrameCallback,
- stream_id, delta_window_size));
+ net_log_.AddEvent(NetLog::TYPE_HTTP2_SESSION_SENT_WINDOW_UPDATE_FRAME,
+ base::Bind(&NetLogSpdyWindowUpdateFrameCallback, stream_id,
+ delta_window_size));
DCHECK(buffered_spdy_framer_.get());
scoped_ptr<SpdyFrame> window_update_frame(
@@ -2938,7 +2921,7 @@ void SpdySession::WritePingFrame(SpdyPingId unique_id, bool is_ack) {
if (net_log().IsLogging()) {
net_log().AddEvent(
- NetLog::TYPE_SPDY_SESSION_PING,
+ NetLog::TYPE_HTTP2_SESSION_PING,
base::Bind(&NetLogSpdyPingCallback, unique_id, is_ack, "sent"));
}
if (!is_ack) {
@@ -3147,10 +3130,9 @@ void SpdySession::IncreaseSendWindowSize(int32 delta_window_size) {
session_send_window_size_ += delta_window_size;
- net_log_.AddEvent(
- NetLog::TYPE_SPDY_SESSION_UPDATE_SEND_WINDOW,
- base::Bind(&NetLogSpdySessionWindowUpdateCallback,
- delta_window_size, session_send_window_size_));
+ net_log_.AddEvent(NetLog::TYPE_HTTP2_SESSION_UPDATE_SEND_WINDOW,
+ base::Bind(&NetLogSpdySessionWindowUpdateCallback,
+ delta_window_size, session_send_window_size_));
DCHECK(!IsSendStalled());
ResumeSendStalledStreams();
@@ -3170,10 +3152,9 @@ void SpdySession::DecreaseSendWindowSize(int32 delta_window_size) {
session_send_window_size_ -= delta_window_size;
- net_log_.AddEvent(
- NetLog::TYPE_SPDY_SESSION_UPDATE_SEND_WINDOW,
- base::Bind(&NetLogSpdySessionWindowUpdateCallback,
- -delta_window_size, session_send_window_size_));
+ net_log_.AddEvent(NetLog::TYPE_HTTP2_SESSION_UPDATE_SEND_WINDOW,
+ base::Bind(&NetLogSpdySessionWindowUpdateCallback,
+ -delta_window_size, session_send_window_size_));
}
void SpdySession::OnReadBufferConsumed(
@@ -3198,10 +3179,9 @@ void SpdySession::IncreaseRecvWindowSize(int32 delta_window_size) {
DCHECK_LE(delta_window_size, kint32max - session_recv_window_size_);
session_recv_window_size_ += delta_window_size;
- net_log_.AddEvent(
- NetLog::TYPE_SPDY_STREAM_UPDATE_RECV_WINDOW,
- base::Bind(&NetLogSpdySessionWindowUpdateCallback,
- delta_window_size, session_recv_window_size_));
+ net_log_.AddEvent(NetLog::TYPE_HTTP2_STREAM_UPDATE_RECV_WINDOW,
+ base::Bind(&NetLogSpdySessionWindowUpdateCallback,
+ delta_window_size, session_recv_window_size_));
session_unacked_recv_window_bytes_ += delta_window_size;
if (session_unacked_recv_window_bytes_ >
@@ -3232,10 +3212,9 @@ void SpdySession::DecreaseRecvWindowSize(int32 delta_window_size) {
}
session_recv_window_size_ -= delta_window_size;
- net_log_.AddEvent(
- NetLog::TYPE_SPDY_SESSION_UPDATE_RECV_WINDOW,
- base::Bind(&NetLogSpdySessionWindowUpdateCallback,
- -delta_window_size, session_recv_window_size_));
+ net_log_.AddEvent(NetLog::TYPE_HTTP2_SESSION_UPDATE_RECV_WINDOW,
+ base::Bind(&NetLogSpdySessionWindowUpdateCallback,
+ -delta_window_size, session_recv_window_size_));
}
void SpdySession::QueueSendStalledStream(const SpdyStream& stream) {
« no previous file with comments | « net/spdy/spdy_proxy_client_socket_unittest.cc ('k') | net/spdy/spdy_session_pool.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698