From d296443d0b2b40d97b1c4792abc1d74c9f702bdd Mon Sep 17 00:00:00 2001 From: Sara Golemon Date: Fri, 11 Sep 2015 08:18:59 -0700 Subject: [PATCH] Revert "use thread_local instead of ThreadLocal for some statics in Random" This reverts commit 6caa3d95ee837703f8f094ffbff5592627417711. --- folly/Random.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/folly/Random.cpp b/folly/Random.cpp index 9b960de0..62eb8f9f 100644 --- a/folly/Random.cpp +++ b/folly/Random.cpp @@ -108,13 +108,18 @@ void BufferedRandomDevice::getSlow(unsigned char* data, size_t size) { ptr_ += size; } + } // namespace void Random::secureRandom(void* data, size_t size) { - static thread_local BufferedRandomDevice bufferedRandomDevice; - bufferedRandomDevice.get(data, size); + static ThreadLocal bufferedRandomDevice; + bufferedRandomDevice->get(data, size); } +ThreadLocalPRNG::ThreadLocalPRNG() { + static folly::ThreadLocal localInstance; + local_ = localInstance.get(); +} class ThreadLocalPRNG::LocalInstancePRNG { public: @@ -123,11 +128,6 @@ class ThreadLocalPRNG::LocalInstancePRNG { Random::DefaultGenerator rng; }; -ThreadLocalPRNG::ThreadLocalPRNG() { - static thread_local ThreadLocalPRNG::LocalInstancePRNG localInstance; - local_ = &localInstance; -} - uint32_t ThreadLocalPRNG::getImpl(LocalInstancePRNG* local) { return local->rng(); } -- 2.34.1