Let keep-alive tokens from VirtualEventBase be destroyed from any thread

[folly.git] / folly / io / async / VirtualEventBase.h

diff --git a/folly/io/async/VirtualEventBase.h b/folly/io/async/VirtualEventBase.h
index 4e62fb121ba649cef20ca990a06c2909d0c7746b..068e649fe666a1f9645e67a6af9de378f64a225e 100644 (file)
--- a/folly/io/async/VirtualEventBase.h
+++ b/folly/io/async/VirtualEventBase.h
@@ -118,7 +118,6 @@ class VirtualEventBase : public folly::Executor, public folly::TimeoutManager {
 
   /**
    * Returns you a handle which prevents VirtualEventBase from being destroyed.
-   * KeepAlive handle can be released from EventBase loop only.
    */
   KeepAlive getKeepAliveToken() override {
     DCHECK(loopKeepAliveCount_ + loopKeepAliveCountAtomic_.load() > 0);
@@ -137,7 +136,9 @@ class VirtualEventBase : public folly::Executor, public folly::TimeoutManager {
 
  protected:
   void keepAliveRelease() override {
-    getEventBase().dcheckIsInEventBaseThread();
+    if (!getEventBase().inRunningEventBaseThread()) {
+      return getEventBase().add([=] { keepAliveRelease(); });
+    }
     if (loopKeepAliveCountAtomic_.load()) {
       loopKeepAliveCount_ += loopKeepAliveCountAtomic_.exchange(0);
     }