[trafficserver] branch 6.2.x updated: TS-4614: avoid e->schedule_in for dummy event.

[so...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sorber pushed a commit to branch 6.2.x
in repository https://git-dual.apache.org/repos/asf/trafficserver.git

The following commit(s) were added to refs/heads/6.2.x by this push:
       new  3191103   TS-4614: avoid e->schedule_in for dummy event.
3191103 is described below

commit 319110364d83d053f90dd211dd6c576460dfed5d
Author: Oknet Xu <xu...@skyguard.com.cn>
AuthorDate: Wed Jun 29 16:25:38 2016 +0800

    TS-4614: avoid e->schedule_in for dummy event.
    
    (cherry picked from commit 002432344fdb6a0adedcc6fa696b49545800de39)
---
 iocore/net/UnixNet.cc            | 5 +++--
 iocore/net/UnixNetVConnection.cc | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/iocore/net/UnixNet.cc b/iocore/net/UnixNet.cc
index 46efbf1..180acc8 100644
--- a/iocore/net/UnixNet.cc
+++ b/iocore/net/UnixNet.cc
@@ -681,8 +681,9 @@ NetHandler::_close_vc(UnixNetVConnection *vc, ink_hrtime now, int &handle_event,
     // create a dummy event
     Event event;
     event.ethread = this_ethread();
-    vc->handleEvent(EVENT_IMMEDIATE, &event);
-    ++handle_event;
+    if (vc->handleEvent(EVENT_IMMEDIATE, &event) == EVENT_DONE) {
+      ++handle_event;
+    }
   }
 }
 
diff --git a/iocore/net/UnixNetVConnection.cc b/iocore/net/UnixNetVConnection.cc
index 9d290e2..2d1c698 100644
--- a/iocore/net/UnixNetVConnection.cc
+++ b/iocore/net/UnixNetVConnection.cc
@@ -1137,8 +1137,8 @@ UnixNetVConnection::mainEvent(int event, Event *e)
       (write.vio.mutex.m_ptr && wlock.get_mutex() != write.vio.mutex.m_ptr)) {
 #ifdef INACTIVITY_TIMEOUT
     if (e == active_timeout)
-#endif
       e->schedule_in(HRTIME_MSECONDS(net_retry_delay));
+#endif
     return EVENT_CONT;
   }
 

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