projects
/
folly.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Switch uses of networking headers to <folly/portability/Sockets.h>
[folly.git]
/
folly
/
Singleton-inl.h
diff --git
a/folly/Singleton-inl.h
b/folly/Singleton-inl.h
index 0071ddf5fe752e1fe9edc9366756d97bc4b444d3..a643e0374d413614d78ac627ac303eec5474b198 100644
(file)
--- a/
folly/Singleton-inl.h
+++ b/
folly/Singleton-inl.h
@@
-140,6
+140,7
@@
void SingletonHolder<T>::destroyInstance() {
state_ = SingletonHolderState::Dead;
instance_.reset();
if (destroy_baton_) {
state_ = SingletonHolderState::Dead;
instance_.reset();
if (destroy_baton_) {
+ constexpr std::chrono::seconds kDestroyWaitTime{5};
auto wait_result = destroy_baton_->timed_wait(
std::chrono::steady_clock::now() + kDestroyWaitTime);
if (!wait_result) {
auto wait_result = destroy_baton_->timed_wait(
std::chrono::steady_clock::now() + kDestroyWaitTime);
if (!wait_result) {