Incorproate comments

Author: shinrich

proxy/PoolableSession.h

@@ -97,7 +97,7 @@ class PoolableSession : public ProxySession
   // singleton that keeps track of the connection counts.
   OutboundConnTrack::Group *conn_track_group = nullptr;
 
-  virtual IOBufferReader *get_reader() = 0;
+  virtual IOBufferReader *get_remote_reader() = 0;
 
 private:
   // Sessions become if authentication headers

proxy/ProxyTransaction.cc

@@ -221,12 +221,6 @@ ProxyTransaction::has_request_body(int64_t request_content_length, bool is_chunk
   return request_content_length > 0 || is_chunked;
 }
 
-bool
-ProxyTransaction::is_read_closed() const
-{
-  return false;
-}
-
 void
 ProxyTransaction::attach_transaction(HttpSM *attach_sm)
 {

proxy/ProxyTransaction.h

@@ -49,7 +49,6 @@ class ProxyTransaction : public VConnection
   virtual void set_inactivity_timeout(ink_hrtime timeout_in);
   virtual void cancel_inactivity_timeout();
   virtual void cancel_active_timeout();
-  virtual bool is_read_closed() const;
 
   // Implement VConnection interface.
   VIO *do_io_read(Continuation *c, int64_t nbytes = INT64_MAX, MIOBuffer *buf = nullptr) override;
@@ -130,7 +129,7 @@ class ProxyTransaction : public VConnection
   //
   HttpSessionAccept::Options upstream_outbound_options; // overwritable copy of options
 
-  IOBufferReader *get_reader();
+  IOBufferReader *get_remote_reader();
 
 protected:
   ProxySession *_proxy_ssn = nullptr;
@@ -285,7 +284,7 @@ ProxyTransaction::adjust_thread(Continuation *cont, int event, void *data)
 }
 
 inline IOBufferReader *
-ProxyTransaction::get_reader()
+ProxyTransaction::get_remote_reader()
 {
   return _reader;
 }

proxy/http/Http1ClientSession.cc

@@ -485,7 +485,7 @@ Http1ClientSession::attach_server_session(PoolableSession *ssession, bool transa
     //  have it call the client session back.  This IO also prevent
     //  the server net conneciton from calling back a dead sm
     SET_HANDLER(&Http1ClientSession::state_keep_alive);
-    slave_ka_vio = ssession->do_io_read(this, INT64_MAX, ssession->get_reader()->mbuf);
+    slave_ka_vio = ssession->do_io_read(this, INT64_MAX, ssession->get_remote_reader()->mbuf);
     ink_assert(slave_ka_vio != ka_vio);
 
     // Transfer control of the write side as well

proxy/http/Http1ServerSession.cc

@@ -100,40 +100,37 @@ Http1ServerSession::new_connection(NetVConnection *new_vc, MIOBuffer *iobuf, IOB
 void
 Http1ServerSession::do_io_close(int alerrno)
 {
-  if (state == SSN_CLOSED) { // Already been closed
-    if (transact_count == released_transactions) {
-      this->destroy();
-    }
-    return;
-  }
+  // Only do the close bookkeeping 1 time
+  if (state != SSN_CLOSED) {
+    ts::LocalBufferWriter<256> w;
+    bool debug_p = is_debug_tag_set("http_ss");
 
-  ts::LocalBufferWriter<256> w;
-  bool debug_p = is_debug_tag_set("http_ss");
+    state = SSN_CLOSED;
 
-  state = SSN_CLOSED;
+    if (debug_p) {
+      w.print("[{}] session close: nevtc {:x}", con_id, _vc);
+    }
 
-  if (debug_p) {
-    w.print("[{}] session close: nevtc {:x}", con_id, _vc);
-  }
+    HTTP_SUM_GLOBAL_DYN_STAT(http_current_server_connections_stat, -1); // Make sure to work on the global stat
+    HTTP_SUM_DYN_STAT(http_transactions_per_server_con, transact_count);
 
-  HTTP_SUM_GLOBAL_DYN_STAT(http_current_server_connections_stat, -1); // Make sure to work on the global stat
-  HTTP_SUM_DYN_STAT(http_transactions_per_server_con, transact_count);
+    // Update upstream connection tracking data if present.
+    this->release_outbound_connection_tracking();
 
-  // Update upstream connection tracking data if present.
-  this->release_outbound_connection_tracking();
+    if (debug_p) {
+      Debug("http_ss", "%.*s", static_cast<int>(w.size()), w.data());
+    }
 
-  if (debug_p) {
-    Debug("http_ss", "%.*s", static_cast<int>(w.size()), w.data());
-  }
+    if (_vc) {
+      _vc->do_io_close(alerrno);
+    }
+    _vc = nullptr;
 
-  if (_vc) {
-    _vc->do_io_close(alerrno);
+    if (to_parent_proxy) {
+      HTTP_DECREMENT_DYN_STAT(http_current_parent_proxy_connections_stat);
+    }
   }
-  _vc = nullptr;
 
-  if (to_parent_proxy) {
-    HTTP_DECREMENT_DYN_STAT(http_current_parent_proxy_connections_stat);
-  }
   if (transact_count == released_transactions) {
     this->destroy();
   }
@@ -254,6 +251,6 @@ Http1ServerSession::new_transaction()
   state = SSN_IN_USE;
   transact_count++;
   ink_release_assert(transact_count == (released_transactions + 1));
-  trans.set_reader(this->get_reader());
+  trans.set_reader(this->get_remote_reader());
   return &trans;
 }

proxy/http/Http1ServerSession.h

@@ -78,7 +78,7 @@ class Http1ServerSession : public PoolableSession
   void free() override;
   bool is_chunked_encoding_supported() const override;
 
-  IOBufferReader *get_reader() override;
+  IOBufferReader *get_remote_reader() override;
   IpEndpoint const &get_server_ip() const;
 
   ProxyTransaction *new_transaction() override;
@@ -113,7 +113,7 @@ extern ClassAllocator<Http1ServerSession, true> httpServerSessionAllocator;
 // INLINE
 
 inline IOBufferReader *
-Http1ServerSession::get_reader()
+Http1ServerSession::get_remote_reader()
 {
   return _reader;
 };