This is an automated email from the ASF dual-hosted git repository. jpeach pushed a commit to branch master in repository https://git-dual.apache.org/repos/asf/trafficserver.git
commit 15ed8284d275688be60e56686aa3023e2163ed37 Author: James Peach <[email protected]> AuthorDate: Thu May 5 21:37:57 2016 -0700 TS-4425: Pass Ptr<ProxyMutex> down through the Continuation constructor. --- iocore/eventsystem/I_VConnection.h | 1 + iocore/eventsystem/P_VConnection.h | 6 ++++++ iocore/net/P_UnixNetVConnection.h | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/iocore/eventsystem/I_VConnection.h b/iocore/eventsystem/I_VConnection.h index effdc5a..e7fb12a 100644 --- a/iocore/eventsystem/I_VConnection.h +++ b/iocore/eventsystem/I_VConnection.h @@ -311,6 +311,7 @@ public: virtual void do_io_shutdown(ShutdownHowTo_t howto) = 0; VConnection(ProxyMutex *aMutex); + VConnection(Ptr<ProxyMutex> &aMutex); /** @deprecated */ VIO *do_io(int op, Continuation *c = NULL, int64_t nbytes = INT64_MAX, MIOBuffer *buf = 0, int data = 0); diff --git a/iocore/eventsystem/P_VConnection.h b/iocore/eventsystem/P_VConnection.h index 4c75c42..f390a2a 100644 --- a/iocore/eventsystem/P_VConnection.h +++ b/iocore/eventsystem/P_VConnection.h @@ -61,6 +61,12 @@ VConnection::VConnection(ProxyMutex *aMutex) : Continuation(aMutex), lerrno(0) } TS_INLINE +VConnection::VConnection(Ptr<ProxyMutex> &aMutex) : Continuation(aMutex), lerrno(0) +{ + SET_HANDLER(0); +} + +TS_INLINE VConnection::~VConnection() { } diff --git a/iocore/net/P_UnixNetVConnection.h b/iocore/net/P_UnixNetVConnection.h index 9b10cbf..2443d7b 100644 --- a/iocore/net/P_UnixNetVConnection.h +++ b/iocore/net/P_UnixNetVConnection.h @@ -88,7 +88,7 @@ struct OOB_callback : public Continuation { Continuation *server_cont; int retry_OOB_send(int, Event *); - OOB_callback(ProxyMutex *m, NetVConnection *vc, Continuation *cont, char *buf, int len) + OOB_callback(Ptr<ProxyMutex> &m, NetVConnection *vc, Continuation *cont, char *buf, int len) : Continuation(m), data(buf), length(len), trigger(0) { server_vc = (UnixNetVConnection *)vc; -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
