TS-4614: avoid e->schedule_in for dummy event. This closes #766.

oknet · shinrich · commit 002432344fdb · 2016-07-25T15:42:08.000-05:00
diff --git a/iocore/net/UnixNet.cc b/iocore/net/UnixNet.cc
@@ -682,8 +682,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
@@ -1144,8 +1144,8 @@ UnixNetVConnection::mainEvent(int event, Event *e)
       (write.vio.mutex && wlock.get_mutex() != write.vio.mutex.get())) {
 #ifdef INACTIVITY_TIMEOUT
     if (e == active_timeout)
-#endif
       e->schedule_in(HRTIME_MSECONDS(net_retry_delay));
+#endif
     return EVENT_CONT;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -682,8 +682,9 @@ NetHandler::_close_vc(UnixNetVConnection *vc, ink_hrtime now, int &handle_event,`
`682`	`682`	`// create a dummy event`
`683`	`683`	`Event event;`
`684`	`684`	`event.ethread = this_ethread();`
`685`		`- vc->handleEvent(EVENT_IMMEDIATE, &event);`
`686`		`- ++handle_event;`
	`685`	`+ if (vc->handleEvent(EVENT_IMMEDIATE, &event) == EVENT_DONE) {`
	`686`	`+ ++handle_event;`
	`687`	`+ }`
`687`	`688`	`}`
`688`	`689`	`}`
`689`	`690`
Original file line number	Diff line number	Diff line change
`@@ -1144,8 +1144,8 @@ UnixNetVConnection::mainEvent(int event, Event *e)`
`1144`	`1144`	`(write.vio.mutex && wlock.get_mutex() != write.vio.mutex.get())) {`
`1145`	`1145`	`#ifdef INACTIVITY_TIMEOUT`
`1146`	`1146`	`if (e == active_timeout)`
`1147`		`-#endif`
`1148`	`1147`	`e->schedule_in(HRTIME_MSECONDS(net_retry_delay));`
	`1148`	`+#endif`
`1149`	`1149`	`return EVENT_CONT;`
`1150`	`1150`	`}`
`1151`	`1151`