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

The following commit(s) were added to refs/heads/master by this push:
       new  5432056   Move UnixNetVConnection members into the correct source 
file.
5432056 is described below

commit 5432056bd6983fd90a1b3ae0c2ec2c3eae5d5bdf
Author: James Peach <jpe...@apache.org>
AuthorDate: Fri Sep 16 12:47:07 2016 -0700

    Move UnixNetVConnection members into the correct source file.
---
 iocore/net/UnixConnection.cc     | 24 ------------------------
 iocore/net/UnixNetVConnection.cc | 27 +++++++++++++++++++++++++--
 2 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/iocore/net/UnixConnection.cc b/iocore/net/UnixConnection.cc
index ab03283..0b0bcef 100644
--- a/iocore/net/UnixConnection.cc
+++ b/iocore/net/UnixConnection.cc
@@ -388,27 +388,3 @@ Connection::apply_options(NetVCOptions const &opt)
   }
 #endif
 }
-
-void
-UnixNetVConnection::add_to_keep_alive_queue()
-{
-  nh->add_to_keep_alive_queue(this);
-}
-
-void
-UnixNetVConnection::remove_from_keep_alive_queue()
-{
-  nh->remove_from_keep_alive_queue(this);
-}
-
-bool
-UnixNetVConnection::add_to_active_queue()
-{
-  return nh->add_to_active_queue(this);
-}
-
-void
-UnixNetVConnection::remove_from_active_queue()
-{
-  nh->remove_from_active_queue(this);
-}
diff --git a/iocore/net/UnixNetVConnection.cc b/iocore/net/UnixNetVConnection.cc
index 8058f3e..fb274f8 100644
--- a/iocore/net/UnixNetVConnection.cc
+++ b/iocore/net/UnixNetVConnection.cc
@@ -1143,12 +1143,11 @@ UnixNetVConnection::mainEvent(int event, Event *e)
   }
 
   int signal_event;
-  Event **signal_timeout;
   Continuation *reader_cont     = NULL;
   Continuation *writer_cont     = NULL;
   ink_hrtime *signal_timeout_at = NULL;
   Event *t                      = NULL;
-  signal_timeout                = &t;
+  Event **signal_timeout        = &t;
 
 #ifdef INACTIVITY_TIMEOUT
   if (e == inactivity_timeout) {
@@ -1409,3 +1408,27 @@ UnixNetVConnection::migrateToCurrentThread(Continuation 
*cont, EThread *t)
     return netvc;
   }
 }
+
+void
+UnixNetVConnection::add_to_keep_alive_queue()
+{
+  nh->add_to_keep_alive_queue(this);
+}
+
+void
+UnixNetVConnection::remove_from_keep_alive_queue()
+{
+  nh->remove_from_keep_alive_queue(this);
+}
+
+bool
+UnixNetVConnection::add_to_active_queue()
+{
+  return nh->add_to_active_queue(this);
+}
+
+void
+UnixNetVConnection::remove_from_active_queue()
+{
+  nh->remove_from_active_queue(this);
+}

-- 
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <commits@trafficserver.apache.org>'].

Reply via email to