Don't allow getting singleton after shutdown in strict mode

Summary: Make strict mode stricter, by not allowing singleton to be fetched after shutdown (even with try_get).

Reviewed By: yfeldblum

Differential Revision: D3737925

fbshipit-source-id: 8d5536c4f27e13feee722b5abeb15db6fe3d77bf

diff --git a/folly/Singleton-inl.h b/folly/Singleton-inl.h
index 83dbd2f6eb07bec7ae88271f28363a6e8b1bcddb..dad943be7184b09011326bf20cbc6fdade669873 100644 (file)
--- a/folly/Singleton-inl.h
+++ b/folly/Singleton-inl.h
@@ -226,6 +226,9 @@ void SingletonHolder<T>::createInstance() {
 
   RWSpinLock::ReadHolder rh(&vault_.stateMutex_);
   if (vault_.state_ == SingletonVault::SingletonVaultState::Quiescing) {
+    if (vault_.type_ != SingletonVault::Type::Relaxed) {
+      LOG(FATAL) << "Requesting singleton after vault was destroyed.";
+    }
     return;
   }
 

diff --git a/folly/Singleton.h b/folly/Singleton.h
index 297cb8b938b4070ef129d449feaf9712c5e5b559..0539e28055e294a05bbd18d167a69cbe071e5dc3 100644 (file)
--- a/folly/Singleton.h
+++ b/folly/Singleton.h
@@ -448,6 +448,10 @@ class SingletonVault {
     return *stackTraceGetterPtr;
   }
 
+  void setType(Type type) {
+    type_ = type;
+  }
+
  private:
   template <typename T>
   friend struct detail::SingletonHolder;