diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-16 00:59:10 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-16 00:59:10 +0000 |
| commit | 4429700a526a501f1a8feb597fa23f9e861e9852 (patch) | |
| tree | 734f434874b7f07e85f26b0e85f1f6422b8a6218 /net/base | |
| parent | d926bf73867d6a7c1ef777b7a555a4992f8bd62c (diff) | |
| download | chromium_src-4429700a526a501f1a8feb597fa23f9e861e9852.zip chromium_src-4429700a526a501f1a8feb597fa23f9e861e9852.tar.gz chromium_src-4429700a526a501f1a8feb597fa23f9e861e9852.tar.bz2 | |
Reland 47342.
Fixes the merge issue this time. Also fixes a TODO in another change that was blocked on this one.
Support SpdySession as a new NetLog source type. Start logging some more SPDY control frames.
Original code review: http://codereview.chromium.org/2102003/show
BUG=43237
Review URL: http://codereview.chromium.org/2114003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47376 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base')
| -rw-r--r-- | net/base/net_log.h | 1 | ||||
| -rw-r--r-- | net/base/net_log_event_type_list.h | 45 |
2 files changed, 46 insertions, 0 deletions
diff --git a/net/base/net_log.h b/net/base/net_log.h index 9270d78..02f0a4b 100644 --- a/net/base/net_log.h +++ b/net/base/net_log.h @@ -59,6 +59,7 @@ class NetLog { SOURCE_INIT_PROXY_RESOLVER, SOURCE_CONNECT_JOB, SOURCE_SOCKET, + SOURCE_SPDY_SESSION, }; // Identifies the entity that generated this log. The |id| field should diff --git a/net/base/net_log_event_type_list.h b/net/base/net_log_event_type_list.h index d849611..5ec710c 100644 --- a/net/base/net_log_event_type_list.h +++ b/net/base/net_log_event_type_list.h @@ -366,6 +366,44 @@ EVENT_TYPE(SPDY_TRANSACTION_READ_HEADERS) EVENT_TYPE(SPDY_TRANSACTION_READ_BODY) // ------------------------------------------------------------------------ +// SpdySession +// ------------------------------------------------------------------------ + +// The start/end of a SpdySession. +EVENT_TYPE(SPDY_SESSION) + +// On sending a SPDY SETTINGS frame. +// The following parameters are attached: +// { +// "settings": <The list of setting id:value pairs> +// } +EVENT_TYPE(SPDY_SESSION_SEND_SETTINGS) + +// Receipt of a SPDY SETTINGS frame. +// The following parameters are attached: +// { +// "settings": <The list of setting id:value pairs> +// } +EVENT_TYPE(SPDY_SESSION_RECV_SETTINGS) + +// Receipt of a SPDY GOAWAY frame. +// The following parameters are attached: +// { +// "last_accepted_stream_id": <Last stream id accepted by the server, duh> +// } +EVENT_TYPE(SPDY_SESSION_GOAWAY) + +// This event is sent for a SPDY SYN_STREAM pushed by the server, but no +// URLRequest has requested it yet. +// The following parameters are attached: +// { +// "flags": <The control frame flags> +// "headers": <The list of header:value pairs> +// "id": <The stream id> +// } +EVENT_TYPE(SPDY_SESSION_PUSHED_SYN_STREAM) + +// ------------------------------------------------------------------------ // SpdyStream // ------------------------------------------------------------------------ @@ -412,6 +450,13 @@ EVENT_TYPE(SPDY_STREAM_READ_BODY) // Logs that a stream attached to a pushed stream. EVENT_TYPE(SPDY_STREAM_ADOPTED_PUSH_STREAM) +// The receipt of a RST_STREAM +// The following parameters are attached: +// { +// "status": <The reason for the RST_STREAM> +// } +EVENT_TYPE(SPDY_STREAM_RST_STREAM) + // ------------------------------------------------------------------------ // HttpStreamParser // ------------------------------------------------------------------------ |