Make keepAliveRelease consistent between EventBase and VirtualEventBase

Summary: [Folly] Make `keepAliveRelease` consistent between `EventBase` and `VirtualEventBase`.

Reviewed By: elsteveogrande

Differential Revision: D5982132

fbshipit-source-id: 536d48e5672567e78786691bfb283c34d1f31960

diff --git a/folly/io/async/EventBase.h b/folly/io/async/EventBase.h
index 9df035235a7d60946a28c014cf239c55728edbf5..fff75adb00527d7938c528a07b4894ff4d730ef5 100644 (file)
--- a/folly/io/async/EventBase.h
+++ b/folly/io/async/EventBase.h
@@ -654,11 +654,10 @@ class EventBase : private boost::noncopyable,
   }
 
   void keepAliveRelease() override {
-    if (inRunningEventBaseThread()) {
-      loopKeepAliveCount_--;
-    } else {
-      add([=] { loopKeepAliveCount_--; });
+    if (!inRunningEventBaseThread()) {
+      return add([=] { keepAliveRelease(); });
     }
+    loopKeepAliveCount_--;
   }
 
  private:

diff --git a/folly/io/async/VirtualEventBase.h b/folly/io/async/VirtualEventBase.h
index 426bd8a2ced9a78bf797fec402288ee5433772ac..ebf928aa6fc767401a616139e66df05595425042 100644 (file)
--- a/folly/io/async/VirtualEventBase.h
+++ b/folly/io/async/VirtualEventBase.h
@@ -140,8 +140,8 @@ class VirtualEventBase : public folly::Executor, public folly::TimeoutManager {
   }
 
   void keepAliveRelease() override {
-    if (!getEventBase().inRunningEventBaseThread()) {
-      return getEventBase().add([=] { keepAliveRelease(); });
+    if (!inRunningEventBaseThread()) {
+      return add([=] { keepAliveRelease(); });
     }
     if (loopKeepAliveCountAtomic_.load()) {
       loopKeepAliveCount_ += loopKeepAliveCountAtomic_.exchange(0);