From: Owen Anderson Date: Thu, 14 May 2009 21:26:50 +0000 (+0000) Subject: Make ManagedStatic threadsafe by using atomic operations. X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=87ba22dc672a117d6ec99fa0b4d5ad82d0019508;p=oota-llvm.git Make ManagedStatic threadsafe by using atomic operations. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@71796 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/llvm/Support/ManagedStatic.h b/include/llvm/Support/ManagedStatic.h index d0298e495d3..4c1271cec74 100644 --- a/include/llvm/Support/ManagedStatic.h +++ b/include/llvm/Support/ManagedStatic.h @@ -14,6 +14,8 @@ #ifndef LLVM_SUPPORT_MANAGED_STATIC_H #define LLVM_SUPPORT_MANAGED_STATIC_H +#include "llvm/System/Atomic.h" + namespace llvm { /// object_deleter - Helper method for ManagedStatic. @@ -26,6 +28,8 @@ void object_deleter(void *Ptr) { /// ManagedStaticBase - Common base class for ManagedStatic instances. class ManagedStaticBase { protected: + sys::cas_flag InitFlag; + // This should only be used as a static variable, which guarantees that this // will be zero initialized. mutable void *Ptr; @@ -51,19 +55,47 @@ public: // Accessors. C &operator*() { - if (!Ptr) LazyInit(); + sys::cas_flag OldFlag = sys::CompareAndSwap(&InitFlag, 1, 0); + if (OldFlag == 0) { + LazyInit(); + sys::MemoryFence(); + InitFlag = 2; + } else if (OldFlag == 1) + while (OldFlag == 1) ; + return *static_cast(Ptr); } C *operator->() { - if (!Ptr) LazyInit(); + sys::cas_flag OldFlag = sys::CompareAndSwap(&InitFlag, 1, 0); + if (OldFlag == 0) { + LazyInit(); + sys::MemoryFence(); + InitFlag = 2; + } else if (OldFlag == 1) + while (OldFlag == 1) ; + return static_cast(Ptr); } const C &operator*() const { - if (!Ptr) LazyInit(); + sys::cas_flag OldFlag = sys::CompareAndSwap(&InitFlag, 1, 0); + if (OldFlag == 0) { + LazyInit(); + sys::MemoryFence(); + InitFlag = 2; + } else if (OldFlag == 1) + while (OldFlag == 1) ; + return *static_cast(Ptr); } const C *operator->() const { - if (!Ptr) LazyInit(); + sys::cas_flag OldFlag = sys::CompareAndSwap(&InitFlag, 1, 0); + if (OldFlag == 0) { + LazyInit(); + sys::MemoryFence(); + InitFlag = 2; + } else if (OldFlag == 1) + while (OldFlag == 1) ; + return static_cast(Ptr); }