projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set REQUIRES shell on the test cases for r186044
[oota-llvm.git]
/
lib
/
Support
/
ManagedStatic.cpp
diff --git
a/lib/Support/ManagedStatic.cpp
b/lib/Support/ManagedStatic.cpp
index a3b2bcc66a9c6dc390c7239b34ede162499386b7..098cccb68df51880522f63ff520fccf57e4ba0b9 100644
(file)
--- a/
lib/Support/ManagedStatic.cpp
+++ b/
lib/Support/ManagedStatic.cpp
@@
-13,25
+13,29
@@
#include "llvm/Support/ManagedStatic.h"
#include "llvm/Config/config.h"
#include "llvm/Support/ManagedStatic.h"
#include "llvm/Config/config.h"
-#include "llvm/System/Atomic.h"
-#include "llvm/System/Mutex.h"
+#include "llvm/Support/Atomic.h"
#include <cassert>
using namespace llvm;
static const ManagedStaticBase *StaticList = 0;
#include <cassert>
using namespace llvm;
static const ManagedStaticBase *StaticList = 0;
-static sys::Mutex* ManagedStaticMutex = 0;
-
void ManagedStaticBase::RegisterManagedStatic(void *(*Creator)(),
void (*Deleter)(void*)) const {
void ManagedStaticBase::RegisterManagedStatic(void *(*Creator)(),
void (*Deleter)(void*)) const {
- if (
ManagedStaticMutex
) {
-
ManagedStaticMutex->acquire
();
+ if (
llvm_is_multithreaded()
) {
+
llvm_acquire_global_lock
();
if (Ptr == 0) {
void* tmp = Creator ? Creator() : 0;
if (Ptr == 0) {
void* tmp = Creator ? Creator() : 0;
+ TsanHappensBefore(this);
sys::MemoryFence();
sys::MemoryFence();
+
+ // This write is racy against the first read in the ManagedStatic
+ // accessors. The race is benign because it does a second read after a
+ // memory fence, at which point it isn't possible to get a partial value.
+ TsanIgnoreWritesBegin();
Ptr = tmp;
Ptr = tmp;
+ TsanIgnoreWritesEnd();
DeleterFn = Deleter;
// Add to list of managed statics.
DeleterFn = Deleter;
// Add to list of managed statics.
@@
-39,10
+43,10
@@
void ManagedStaticBase::RegisterManagedStatic(void *(*Creator)(),
StaticList = this;
}
StaticList = this;
}
-
ManagedStaticMutex->release
();
+
llvm_release_global_lock
();
} else {
assert(Ptr == 0 && DeleterFn == 0 && Next == 0 &&
} else {
assert(Ptr == 0 && DeleterFn == 0 && Next == 0 &&
- "Partially initialized ManagedStatic!?");
+
"Partially initialized ManagedStatic!?");
Ptr = Creator ? Creator() : 0;
DeleterFn = Deleter;
Ptr = Creator ? Creator() : 0;
DeleterFn = Deleter;
@@
-68,24
+72,10
@@
void ManagedStaticBase::destroy() const {
DeleterFn = 0;
}
DeleterFn = 0;
}
-bool llvm::llvm_start_multithreaded() {
-#if LLVM_MULTITHREADED
- assert(ManagedStaticMutex == 0 && "Multithreaded LLVM already initialized!");
- ManagedStaticMutex = new sys::Mutex(true);
- return true;
-#else
- return false;
-#endif
-}
-
/// llvm_shutdown - Deallocate and destroy all ManagedStatic variables.
void llvm::llvm_shutdown() {
while (StaticList)
StaticList->destroy();
/// llvm_shutdown - Deallocate and destroy all ManagedStatic variables.
void llvm::llvm_shutdown() {
while (StaticList)
StaticList->destroy();
- if (ManagedStaticMutex) {
- delete ManagedStaticMutex;
- ManagedStaticMutex = 0;
- }
+ if (llvm_is_multithreaded()) llvm_stop_multithreaded();
}
}
-