Merge pull request apache#39 from Edge/es_5.3.x_rollback

Es 5.3.x rollback

Author: shinrich

proxy/FetchSM.cc

@@ -65,7 +65,6 @@ FetchSM::httpConnect()
 
   Debug(DEBUG_TAG, "[%s] calling httpconnect write", __FUNCTION__);
   http_vc = reinterpret_cast<PluginVC *>(TSHttpConnectWithPluginId(&_addr.sa, tag, id));
-  http_vc->setOwnerCont(contp);
 
   /*
    * TS-2906: We need a way to unset internal request when using FetchSM, the use case for this
@@ -428,8 +427,8 @@ FetchSM::process_fetch_read(int event)
   Debug(DEBUG_TAG, "[%s] I am here read", __FUNCTION__);
   int64_t bytes;
   int bytes_used;
-  int64_t total_bytes_copied = 0;    
- 
+  int64_t total_bytes_copied = 0;
+
   switch (event) {
   case TS_EVENT_VCONN_READ_READY:
     // duplicate the bytes for backward compatibility with TSFetchUrl()
@@ -489,7 +488,6 @@ void
 FetchSM::process_fetch_write(int event)
 {
   Debug(DEBUG_TAG, "[%s] calling process write", __FUNCTION__);
-
   switch (event) {
   case TS_EVENT_VCONN_WRITE_COMPLETE:
     req_finished = true;

proxy/PluginVC.cc

@@ -75,7 +75,6 @@
 #include "P_EventSystem.h"
 #include "P_Net.h"
 #include "Regression.h"
-#include "HttpClientSession.h"
 
 #define PVC_LOCK_RETRY_TIME HRTIME_MSECONDS(10)
 #define PVC_DEFAULT_MAX_BYTES 32768
@@ -87,8 +86,8 @@
 #define PVC_TYPE ((vc_type == PLUGIN_VC_ACTIVE) ? "Active" : "Passive")
 
 PluginVC::PluginVC(PluginVCCore *core_obj)
-  : NetVConnection(), magic(PLUGIN_VC_MAGIC_ALIVE), vc_type(PLUGIN_VC_UNKNOWN), core_obj(core_obj), other_side(NULL),
-    owner_cont(NULL), read_state(), write_state(), need_read_process(false), need_write_process(false), closed(false), sm_lock_retry_event(NULL),
+  : NetVConnection(), magic(PLUGIN_VC_MAGIC_ALIVE), vc_type(PLUGIN_VC_UNKNOWN), core_obj(core_obj), other_side(NULL), read_state(),
+    write_state(), need_read_process(false), need_write_process(false), closed(false), sm_lock_retry_event(NULL),
     core_lock_retry_event(NULL), deletable(false), reentrancy_count(0), active_timeout(0), active_event(NULL), inactive_timeout(0),
     inactive_timeout_at(0), inactive_event(NULL), plugin_tag(NULL), plugin_id(0)
 {
@@ -248,18 +247,6 @@ PluginVC::do_io_read(Continuation *c, int64_t nbytes, MIOBuffer *buf)
   read_state.vio.op = VIO::READ;
 
   Debug("pvc", "[%u] %s: do_io_read for %" PRId64 " bytes", core_obj->id, PVC_TYPE, nbytes);
-  
-  HttpClientSession *client_session = NULL;
-  Continuation *cont = NULL;
-  if ((cont = read_state.vio._cont)) {
-    client_session = dynamic_cast<HttpClientSession *>(cont);
-  }
-  // added to give the child HttpClientSession access to its SpdyClientSession parent for logging purposes
-  // kind of hacky, not my favorite impl
-  if (client_session && core_obj && core_obj->active_vc.owner_cont) {
-    client_session->set_parent_cont(core_obj->active_vc.owner_cont);
-    Debug("pvc", "[%u] %s: Setting HttpClientSession parent cont=%p", core_obj->id, PVC_TYPE, core_obj->active_vc.owner_cont); 
-  }
 
   // Since reentrant callbacks are not allowed on from do_io
   //   functions schedule ourselves get on a different stack

proxy/PluginVC.h

@@ -113,24 +113,7 @@ class PluginVC : public NetVConnection, public PluginIdentity
   {
     return other_side;
   }
-  
-  virtual PluginVCState *
-  get_read_state()
-  {
-    return &read_state;
-  } 
-  
-  virtual PluginVCState *
-  get_write_state()
-  {
-    return &write_state;
-  }
-  
-  virtual PluginVCCore *
-  get_core_obj()
-  {
-    return core_obj;
-  }
+
   //@{ @name Plugin identity.
   /// Override for @c PluginIdentity.
   virtual char const *
@@ -158,12 +141,6 @@ class PluginVC : public NetVConnection, public PluginIdentity
     plugin_id = id;
   }
   //@}
-  /// Setter for PluginVC owner continuation
-  virtual void
-  setOwnerCont(Continuation *c)
-  {
-    owner_cont = c;
-  }
 
   int main_handler(int event, void *data);
 
@@ -183,7 +160,6 @@ class PluginVC : public NetVConnection, public PluginIdentity
   PluginVCCore *core_obj;
 
   PluginVC *other_side;
-  Continuation *owner_cont;
 
   PluginVCState read_state;
   PluginVCState write_state;

proxy/ProxyClientSession.h

@@ -27,7 +27,6 @@
 #include "libts.h"
 #include "P_Net.h"
 #include "InkAPIInternal.h"
-#include "I_Continuation.h"
 
 // Emit a debug message conditional on whether this particular client session
 // has debugging enabled. This should only be called from within a client session
@@ -95,19 +94,6 @@ class ProxyClientSession : public VConnection
     return this->api_hooks.has_hooks() || http_global_hooks->has_hooks();
   }
 
-  // pointer to parent session. as cont for now
-  Continuation *
-  get_parent_cont()
-  {
-    return parent_cont;
-  }
-
-  void
-  set_parent_cont(Continuation *c)
-  {
-    parent_cont = c;
-  }
-
   // Initiate an API hook invocation.
   void do_api_callout(TSHttpHookID id);
 
@@ -129,8 +115,6 @@ class ProxyClientSession : public VConnection
   APIHook *api_current;
   HttpAPIHooks api_hooks;
   void *user_args[HTTP_SSN_TXN_MAX_USER_ARG];
-  // TODO continuation for now pending susan's change making SpdyClientSession a child of ProxyClientSession
-  Continuation *parent_cont;
 
   ProxyClientSession(ProxyClientSession &);                  // noncopyable
   ProxyClientSession &operator=(const ProxyClientSession &); // noncopyable

proxy/http/HttpSessionAccept.h

@@ -21,8 +21,8 @@
   limitations under the License.
  */
 
-#ifndef _HTTP_SESSION_ACCEPT_H_
-#define _HTTP_SESSION_ACCEPT_H_
+#if !defined(_HttpSessionAccept_h_)
+#define _HttpSessionAccept_h_
 
 #include "libts.h"
 #include "records/I_RecHttp.h"