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

Side by Side Diff: net/spdy/spdy_session.h

Issue 10382107: Change the stream_id for streams which are serialized out of order. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add spdy2 version of the test. Created 8 years, 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef NET_SPDY_SPDY_SESSION_H_ 5 #ifndef NET_SPDY_SPDY_SESSION_H_
6 #define NET_SPDY_SPDY_SESSION_H_ 6 #define NET_SPDY_SPDY_SESSION_H_
7 #pragma once 7 #pragma once
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <list> 10 #include <list>
(...skipping 537 matching lines...) Expand 10 before | Expand all | Expand 10 after
548 HttpServerProperties* const http_server_properties_; 548 HttpServerProperties* const http_server_properties_;
549 549
550 // The socket handle for this session. 550 // The socket handle for this session.
551 scoped_ptr<ClientSocketHandle> connection_; 551 scoped_ptr<ClientSocketHandle> connection_;
552 552
553 // The read buffer used to read data from the socket. 553 // The read buffer used to read data from the socket.
554 scoped_refptr<IOBuffer> read_buffer_; 554 scoped_refptr<IOBuffer> read_buffer_;
555 bool read_pending_; 555 bool read_pending_;
556 556
557 int stream_hi_water_mark_; // The next stream id to use. 557 int stream_hi_water_mark_; // The next stream id to use.
558 // The stream id of the last SYN_STREAM frame written on this session.
559 SpdyStreamId last_syn_stream_id_;
558 560
559 // Queue, for each priority, of pending Create Streams that have not 561 // Queue, for each priority, of pending Create Streams that have not
560 // yet been satisfied 562 // yet been satisfied
561 PendingCreateStreamQueue create_stream_queues_[NUM_PRIORITIES]; 563 PendingCreateStreamQueue create_stream_queues_[NUM_PRIORITIES];
562 564
563 // Map from stream id to all active streams. Streams are active in the sense 565 // Map from stream id to all active streams. Streams are active in the sense
564 // that they have a consumer (typically SpdyNetworkTransaction and regardless 566 // that they have a consumer (typically SpdyNetworkTransaction and regardless
565 // of whether or not there is currently any ongoing IO [might be waiting for 567 // of whether or not there is currently any ongoing IO [might be waiting for
566 // the server to start pushing the stream]) or there are still network events 568 // the server to start pushing the stream]) or there are still network events
567 // incoming even though the consumer has already gone away (cancellation). 569 // incoming even though the consumer has already gone away (cancellation).
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
746 private: 748 private:
747 const int status_; 749 const int status_;
748 const std::string description_; 750 const std::string description_;
749 751
750 DISALLOW_COPY_AND_ASSIGN(NetLogSpdySessionCloseParameter); 752 DISALLOW_COPY_AND_ASSIGN(NetLogSpdySessionCloseParameter);
751 }; 753 };
752 754
753 } // namespace net 755 } // namespace net
754 756
755 #endif // NET_SPDY_SPDY_SESSION_H_ 757 #endif // NET_SPDY_SPDY_SESSION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698