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

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: Fix comments 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
« no previous file with comments | « net/spdy/spdy_network_transaction_spdy3_unittest.cc ('k') | net/spdy/spdy_session.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 522 matching lines...) Expand 10 before | Expand all | Expand 10 after
533 HttpServerProperties* const http_server_properties_; 533 HttpServerProperties* const http_server_properties_;
534 534
535 // The socket handle for this session. 535 // The socket handle for this session.
536 scoped_ptr<ClientSocketHandle> connection_; 536 scoped_ptr<ClientSocketHandle> connection_;
537 537
538 // The read buffer used to read data from the socket. 538 // The read buffer used to read data from the socket.
539 scoped_refptr<IOBuffer> read_buffer_; 539 scoped_refptr<IOBuffer> read_buffer_;
540 bool read_pending_; 540 bool read_pending_;
541 541
542 int stream_hi_water_mark_; // The next stream id to use. 542 int stream_hi_water_mark_; // The next stream id to use.
543 // The stream id of the last SYN_STREAM frame written on this session.
544 SpdyStreamId last_syn_stream_id_;
543 545
544 // Queue, for each priority, of pending Create Streams that have not 546 // Queue, for each priority, of pending Create Streams that have not
545 // yet been satisfied 547 // yet been satisfied
546 PendingCreateStreamQueue create_stream_queues_[NUM_PRIORITIES]; 548 PendingCreateStreamQueue create_stream_queues_[NUM_PRIORITIES];
547 549
548 // Map from stream id to all active streams. Streams are active in the sense 550 // Map from stream id to all active streams. Streams are active in the sense
549 // that they have a consumer (typically SpdyNetworkTransaction and regardless 551 // that they have a consumer (typically SpdyNetworkTransaction and regardless
550 // of whether or not there is currently any ongoing IO [might be waiting for 552 // of whether or not there is currently any ongoing IO [might be waiting for
551 // the server to start pushing the stream]) or there are still network events 553 // the server to start pushing the stream]) or there are still network events
552 // incoming even though the consumer has already gone away (cancellation). 554 // incoming even though the consumer has already gone away (cancellation).
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
680 private: 682 private:
681 const linked_ptr<SpdyHeaderBlock> headers_; 683 const linked_ptr<SpdyHeaderBlock> headers_;
682 const SpdyControlFlags flags_; 684 const SpdyControlFlags flags_;
683 const SpdyStreamId stream_id_; 685 const SpdyStreamId stream_id_;
684 const SpdyStreamId associated_stream_; 686 const SpdyStreamId associated_stream_;
685 687
686 DISALLOW_COPY_AND_ASSIGN(NetLogSpdySynParameter); 688 DISALLOW_COPY_AND_ASSIGN(NetLogSpdySynParameter);
687 }; 689 };
688 690
689 691
692 class NetLogSpdySynRenumberParameter : public NetLog::EventParameters {
693 public:
694 NetLogSpdySynRenumberParameter(SpdyStreamId old_id,
695 SpdyStreamId new_id);
696
697 virtual base::Value* ToValue() const OVERRIDE;
698
699 protected:
700 virtual ~NetLogSpdySynRenumberParameter();
701
702 private:
703 const SpdyStreamId old_id_;
704 const SpdyStreamId new_id_;
705
706 DISALLOW_COPY_AND_ASSIGN(NetLogSpdySynRenumberParameter);
707 };
708
709
690 class NetLogSpdyCredentialParameter : public NetLog::EventParameters { 710 class NetLogSpdyCredentialParameter : public NetLog::EventParameters {
691 public: 711 public:
692 NetLogSpdyCredentialParameter(size_t slot, const std::string& origin); 712 NetLogSpdyCredentialParameter(size_t slot, const std::string& origin);
693 713
694 virtual base::Value* ToValue() const OVERRIDE; 714 virtual base::Value* ToValue() const OVERRIDE;
695 715
696 protected: 716 protected:
697 virtual ~NetLogSpdyCredentialParameter(); 717 virtual ~NetLogSpdyCredentialParameter();
698 718
699 private: 719 private:
(...skipping 17 matching lines...) Expand all
717 private: 737 private:
718 const int status_; 738 const int status_;
719 const std::string description_; 739 const std::string description_;
720 740
721 DISALLOW_COPY_AND_ASSIGN(NetLogSpdySessionCloseParameter); 741 DISALLOW_COPY_AND_ASSIGN(NetLogSpdySessionCloseParameter);
722 }; 742 };
723 743
724 } // namespace net 744 } // namespace net
725 745
726 #endif // NET_SPDY_SPDY_SESSION_H_ 746 #endif // NET_SPDY_SPDY_SESSION_H_
OLDNEW
« no previous file with comments | « net/spdy/spdy_network_transaction_spdy3_unittest.cc ('k') | net/spdy/spdy_session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698