Commit d296443d authored by Sara Golemon's avatar Sara Golemon

Revert "use thread_local instead of ThreadLocal for some statics in Random"

This reverts commit 6caa3d95.
parent a7c6fe3a
...@@ -108,13 +108,18 @@ void BufferedRandomDevice::getSlow(unsigned char* data, size_t size) { ...@@ -108,13 +108,18 @@ void BufferedRandomDevice::getSlow(unsigned char* data, size_t size) {
ptr_ += size; ptr_ += size;
} }
} // namespace } // namespace
void Random::secureRandom(void* data, size_t size) { void Random::secureRandom(void* data, size_t size) {
static thread_local BufferedRandomDevice bufferedRandomDevice; static ThreadLocal<BufferedRandomDevice> bufferedRandomDevice;
bufferedRandomDevice.get(data, size); bufferedRandomDevice->get(data, size);
} }
ThreadLocalPRNG::ThreadLocalPRNG() {
static folly::ThreadLocal<ThreadLocalPRNG::LocalInstancePRNG> localInstance;
local_ = localInstance.get();
}
class ThreadLocalPRNG::LocalInstancePRNG { class ThreadLocalPRNG::LocalInstancePRNG {
public: public:
...@@ -123,11 +128,6 @@ class ThreadLocalPRNG::LocalInstancePRNG { ...@@ -123,11 +128,6 @@ class ThreadLocalPRNG::LocalInstancePRNG {
Random::DefaultGenerator rng; Random::DefaultGenerator rng;
}; };
ThreadLocalPRNG::ThreadLocalPRNG() {
static thread_local ThreadLocalPRNG::LocalInstancePRNG localInstance;
local_ = &localInstance;
}
uint32_t ThreadLocalPRNG::getImpl(LocalInstancePRNG* local) { uint32_t ThreadLocalPRNG::getImpl(LocalInstancePRNG* local) {
return local->rng(); return local->rng();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment