[SPDY] Add session flow control data to SPDY info in net-internals

[SPDY] Add session flow control data to SPDY info in net-internals

Also fix a typo.

BUG=176592
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=190085

[akalin, 2013-03-21 08:43:02]

+rch for review

[eroman, 2013-03-21 09:10:09]

LGTM for net_internals/*


On Thu, Mar 21, 2013 at 1:43 AM, <akalin@chromium.org> wrote:

> Reviewers: Ryan Hamilton,
>
> Message:
> +rch for review
>
> Description:
> [SPDY] Add session flow control data to SPDY info in net-internals
>
> Also fix a typo.
>
> BUG=176592
>
>
> Please review this at
https://codereview.chromium.**org/12459022/<https://codereview.chromium.org/1...
>
> SVN Base:
svn://svn.chromium.org/chrome/**trunk/src<http://svn.chromium.org/chrome/trunk/src>
>
> Affected files:
>   M chrome/browser/resources/net_**internals/spdy_view.js
>   M net/spdy/spdy_session.cc
>
>
> Index: chrome/browser/resources/net_**internals/spdy_view.js
> diff --git a/chrome/browser/resources/**net_internals/spdy_view.js
> b/chrome/browser/resources/**net_internals/spdy_view.js
> index 399af7d9735cc2bfd98503a6145e14**7486cd1196..**
> 113a02c2850065546a0119378d18a7**2033fa5670 100644
> --- a/chrome/browser/resources/**net_internals/spdy_view.js
> +++ b/chrome/browser/resources/**net_internals/spdy_view.js
> @@ -139,7 +139,7 @@ var SpdyView = (function() {
>      tablePrinter.addHeaderCell('**Host');
>      tablePrinter.addHeaderCell('**Proxy');
>      tablePrinter.addHeaderCell('**ID');
> -    tablePrinter.addHeaderCell('**Protocol Negotiatied');
> +    tablePrinter.addHeaderCell('**Protocol Negotiated');
>      tablePrinter.addHeaderCell('**Active streams');
>      tablePrinter.addHeaderCell('**Unclaimed pushed');
>      tablePrinter.addHeaderCell('**Max');
> @@ -151,6 +151,9 @@ var SpdyView = (function() {
>      tablePrinter.addHeaderCell('**Secure');
>      tablePrinter.addHeaderCell('**Sent settings');
>      tablePrinter.addHeaderCell('**Received settings');
> +    tablePrinter.addHeaderCell('**Send window');
> +    tablePrinter.addHeaderCell('**Receive window');
> +    tablePrinter.addHeaderCell('**Unacked received data');
>      tablePrinter.addHeaderCell('**Error');
>
>      for (var i = 0; i < spdySessions.length; i++) {
> @@ -178,6 +181,9 @@ var SpdyView = (function() {
>        tablePrinter.addCell(session.**is_secure);
>        tablePrinter.addCell(session.**sent_settings);
>        tablePrinter.addCell(session.**received_settings);
> +      tablePrinter.addCell(session.**send_window_size);
> +      tablePrinter.addCell(session.**recv_window_size);
> +      tablePrinter.addCell(session.**unacked_recv_window_bytes);
>        tablePrinter.addCell(session.**error);
>      }
>      return tablePrinter;
> Index: net/spdy/spdy_session.cc
> diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc
> index 56d2bacf6c428c4a05d72997cdff53**7378e6cbd0..**
> c6c38196610dbb2089c0fa74a1b08d**fa18a7ba48 100644
> --- a/net/spdy/spdy_session.cc
> +++ b/net/spdy/spdy_session.cc
> @@ -1219,6 +1219,11 @@ base::Value* SpdySession::GetInfoAsValue() const {
>
>    dict->SetBoolean("sent_**settings", sent_settings_);
>    dict->SetBoolean("received_**settings", received_settings_);
> +
> +  dict->SetInteger("send_window_**size", session_send_window_size_);
> +  dict->SetInteger("recv_window_**size", session_recv_window_size_);
> +  dict->SetInteger("unacked_**recv_window_bytes",
> +                   session_unacked_recv_window_**bytes_);
>    return dict;
>  }
>
>
>
>

[Ryan Hamilton, 2013-03-21 15:45:40]

lgtm

https://codereview.chromium.org/12459022/diff/1/chrome/browser/resources/net_...
File chrome/browser/resources/net_internals/spdy_view.js (right):

https://codereview.chromium.org/12459022/diff/1/chrome/browser/resources/net_...
chrome/browser/resources/net_internals/spdy_view.js:142:
tablePrinter.addHeaderCell('Protocol Negotiated');
Hah!  Nice :>

[commit-bot: I haz the power, 2013-03-21 18:15:09]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/akalin@chromium.org/12459022/1

[akalin, 2013-03-21 19:51:28]

On 2013/03/21 18:15:09, I haz the power (commit-bot) wrote:
> CQ is trying da patch. Follow status at
> https://chromium-status.appspot.com/cq/akalin%40chromium.org/12459022/1

Committed as r189546 (don't know why this wasn't updated).

[akalin, 2013-03-23 21:35:39]

On 2013/03/21 19:51:28, akalin wrote:
> On 2013/03/21 18:15:09, I haz the power (commit-bot) wrote:
> > CQ is trying da patch. Follow status at
> > https://chromium-status.appspot.com/cq/akalin%2540chromium.org/12459022/1
> 
> Committed as r189546 (don't know why this wasn't updated).
Actually, I confused this with another issue.  Committing now.

[commit-bot: I haz the power, 2013-03-23 21:37:18]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/akalin@chromium.org/12459022/1

[commit-bot: I haz the power, 2013-03-23 21:37:20]

Failed to apply patch for chrome/browser/resources/net_internals/spdy_view.js:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/resources/net_internals/spdy_view.js
  Hunk #1 FAILED at 139.
  Hunk #2 FAILED at 151.
  Hunk #3 FAILED at 178.
  3 out of 3 hunks FAILED -- saving rejects to file
chrome/browser/resources/net_internals/spdy_view.js.rej

Patch:       chrome/browser/resources/net_internals/spdy_view.js
Index: chrome/browser/resources/net_internals/spdy_view.js
diff --git a/chrome/browser/resources/net_internals/spdy_view.js
b/chrome/browser/resources/net_internals/spdy_view.js
index
399af7d9735cc2bfd98503a6145e147486cd1196..113a02c2850065546a0119378d18a72033fa5670
100644
--- a/chrome/browser/resources/net_internals/spdy_view.js
+++ b/chrome/browser/resources/net_internals/spdy_view.js
@@ -139,7 +139,7 @@ var SpdyView = (function() {
     tablePrinter.addHeaderCell('Host');
     tablePrinter.addHeaderCell('Proxy');
     tablePrinter.addHeaderCell('ID');
-    tablePrinter.addHeaderCell('Protocol Negotiatied');
+    tablePrinter.addHeaderCell('Protocol Negotiated');
     tablePrinter.addHeaderCell('Active streams');
     tablePrinter.addHeaderCell('Unclaimed pushed');
     tablePrinter.addHeaderCell('Max');
@@ -151,6 +151,9 @@ var SpdyView = (function() {
     tablePrinter.addHeaderCell('Secure');
     tablePrinter.addHeaderCell('Sent settings');
     tablePrinter.addHeaderCell('Received settings');
+    tablePrinter.addHeaderCell('Send window');
+    tablePrinter.addHeaderCell('Receive window');
+    tablePrinter.addHeaderCell('Unacked received data');
     tablePrinter.addHeaderCell('Error');
 
     for (var i = 0; i < spdySessions.length; i++) {
@@ -178,6 +181,9 @@ var SpdyView = (function() {
       tablePrinter.addCell(session.is_secure);
       tablePrinter.addCell(session.sent_settings);
       tablePrinter.addCell(session.received_settings);
+      tablePrinter.addCell(session.send_window_size);
+      tablePrinter.addCell(session.recv_window_size);
+      tablePrinter.addCell(session.unacked_recv_window_bytes);
       tablePrinter.addCell(session.error);
     }
     return tablePrinter;

[akalin, 2013-03-23 21:37:39]

Committed patchset #1 manually as r190085 (presubmit successful).