Landing Recent QUIC changes until 12:43 PM, Nov 5, 2016 UTC+8

net/quic/core/quic_session.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // A QuicSession, which demuxes a single connection to individual streams.
 
 #ifndef NET_QUIC_QUIC_SESSION_H_
 #define NET_QUIC_QUIC_SESSION_H_
 
 #include <stddef.h>
 
 #include <map>
 #include <memory>
 #include <string>
 #include <unordered_map>
 #include <unordered_set>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/containers/small_map.h"
 #include "base/macros.h"
 #include "base/strings/string_piece.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_export.h"
 #include "net/quic/core/quic_connection.h"
 #include "net/quic/core/quic_crypto_stream.h"
 #include "net/quic/core/quic_packet_creator.h"
 #include "net/quic/core/quic_protocol.h"
+#include "net/quic/core/quic_stream.h"
 #include "net/quic/core/quic_write_blocked_list.h"
-#include "net/quic/core/reliable_quic_stream.h"
 
 namespace net {
 
 class QuicCryptoStream;
 class QuicFlowController;
-class ReliableQuicStream;
+class QuicStream;
 
 namespace test {
 class QuicSessionPeer;
 }  // namespace test
 
 class NET_EXPORT_PRIVATE QuicSession : public QuicConnectionVisitorInterface {
  public:
   // An interface from the session to the entity owning the session.
   // This lets the session notify its owner (the Dispatcher) when the connection
   // is closed, blocked, or added/removed from the time-wait std::list.
@@ skipping 64 matching lines @@
                                 const QuicReceivedPacket& packet);
 
   // Called by streams when they want to write data to the peer.
   // Returns a pair with the number of bytes consumed from data, and a boolean
   // indicating if the fin bit was consumed.  This does not indicate the data
   // has been sent on the wire: it may have been turned into a packet and queued
   // if the socket was unexpectedly blocked.
   // If provided, |ack_notifier_delegate| will be registered to be notified when
   // we have seen ACKs for all packets resulting from this call.
   virtual QuicConsumedData WritevData(
-      ReliableQuicStream* stream,
+      QuicStream* stream,
       QuicStreamId id,
       QuicIOVector iov,
       QuicStreamOffset offset,
       bool fin,
       QuicAckListenerInterface* ack_notifier_delegate);
 
   // Called by streams when they want to close the stream in both directions.
   virtual void SendRstStream(QuicStreamId id,
                              QuicRstStreamErrorCode error,
                              QuicStreamOffset bytes_written);
@@ skipping 99 matching lines @@
   size_t max_open_outgoing_streams() const {
     return max_open_outgoing_streams_;
   }
 
   size_t MaxAvailableStreams() const;
 
   // Returns existing static or dynamic stream with id = |stream_id|. If no
   // such stream exists, and |stream_id| is a peer-created dynamic stream id,
   // then a new stream is created and returned. In all other cases, nullptr is
   // returned.
-  ReliableQuicStream* GetOrCreateStream(const QuicStreamId stream_id);
+  QuicStream* GetOrCreateStream(const QuicStreamId stream_id);
 
   // Mark a stream as draining.
   virtual void StreamDraining(QuicStreamId id);
 
   // Returns true if this stream should yield writes to another blocked stream.
   bool ShouldYield(QuicStreamId stream_id);
 
  protected:
   using StaticStreamMap =
-      base::SmallMap<std::unordered_map<QuicStreamId, ReliableQuicStream*>, 2>;
+      base::SmallMap<std::unordered_map<QuicStreamId, QuicStream*>, 2>;
 
   using DynamicStreamMap = base::SmallMap<
-      std::unordered_map<QuicStreamId, std::unique_ptr<ReliableQuicStream>>,
+      std::unordered_map<QuicStreamId, std::unique_ptr<QuicStream>>,
       10>;
 
-  using ClosedStreams = std::vector<std::unique_ptr<ReliableQuicStream>>;
+  using ClosedStreams = std::vector<std::unique_ptr<QuicStream>>;
 
   // Creates a new stream to handle a peer-initiated stream.
   // Caller does not own the returned stream.
   // Returns nullptr and does error handling if the stream can not be created.
-  virtual ReliableQuicStream* CreateIncomingDynamicStream(QuicStreamId id) = 0;
+  virtual QuicStream* CreateIncomingDynamicStream(QuicStreamId id) = 0;
 
   // Create a new stream to handle a locally-initiated stream.
   // Caller does not own the returned stream.
   // Returns nullptr if max streams have already been opened.
-  virtual ReliableQuicStream* CreateOutgoingDynamicStream(
-      SpdyPriority priority) = 0;
+  virtual QuicStream* CreateOutgoingDynamicStream(SpdyPriority priority) = 0;
 
   // Return the reserved crypto stream.
   virtual QuicCryptoStream* GetCryptoStream() = 0;
 
   // Adds |stream| to the dynamic stream map.
-  virtual void ActivateStream(std::unique_ptr<ReliableQuicStream> stream);
+  virtual void ActivateStream(std::unique_ptr<QuicStream> stream);
 
   // Returns the stream ID for a new outgoing stream, and increments the
   // underlying counter.
   QuicStreamId GetNextOutgoingStreamId();
 
   // Returns existing stream with id = |stream_id|. If no such stream exists,
   // and |stream_id| is a peer-created id, then a new stream is created and
   // returned. However if |stream_id| is a locally-created id and no such stream
   // exists, the connection is closed.
   // Caller does not own the returned stream.
-  ReliableQuicStream* GetOrCreateDynamicStream(QuicStreamId stream_id);
+  QuicStream* GetOrCreateDynamicStream(QuicStreamId stream_id);
 
   // Performs the work required to close |stream_id|.  If |locally_reset|
   // then the stream has been reset by this endpoint, not by the peer.
   virtual void CloseStreamInner(QuicStreamId stream_id, bool locally_reset);
 
   // When a stream is closed locally, it may not yet know how many bytes the
   // peer sent on that stream.
   // When this data arrives (via stream frame w. FIN, or RST) this method
   // is called, and correctly updates the connection level flow controller.
   void UpdateFlowControlOnFinalReceivedByteOffset(
@@ skipping 69 matching lines @@
   // Called in OnConfigNegotiated when we receive a new stream level flow
   // control window in a negotiated config. Closes the connection if invalid.
   void OnNewStreamFlowControlWindow(QuicStreamOffset new_window);
 
   // Called in OnConfigNegotiated when we receive a new connection level flow
   // control window in a negotiated config. Closes the connection if invalid.
   void OnNewSessionFlowControlWindow(QuicStreamOffset new_window);
 
   // Debug helper for |OnCanWrite()|, check that OnStreamWrite() makes
   // forward progress.  Returns false if busy loop detected.
-  bool CheckStreamNotBusyLooping(ReliableQuicStream* stream,
+  bool CheckStreamNotBusyLooping(QuicStream* stream,
                                  uint64_t previous_bytes_written,
                                  bool previous_fin_sent);
 
   // Keep track of highest received byte offset of locally closed streams, while
   // waiting for a definitive final highest offset from the peer.
   std::map<QuicStreamId, QuicStreamOffset>
       locally_closed_streams_highest_offset_;
 
   QuicConnection* connection_;
 
@@ skipping 53 matching lines @@
   // The stream id which was last popped in OnCanWrite, or 0, if not under the
   // call stack of OnCanWrite.
   QuicStreamId currently_writing_stream_id_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicSession);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_SESSION_H_