[llvm] r269577 - Revert "Revert 220932.": "Removing the static initializer in ManagedStatic.cpp by using llvm_call_once to initialize the ManagedStatic mutex"
Mehdi Amini via llvm-commits
llvm-commits at lists.llvm.org
Sat May 14 13:55:52 PDT 2016
Author: mehdi_amini
Date: Sat May 14 15:55:52 2016
New Revision: 269577
URL: http://llvm.org/viewvc/llvm-project?rev=269577&view=rev
Log:
Revert "Revert 220932.": "Removing the static initializer in ManagedStatic.cpp by using llvm_call_once to initialize the ManagedStatic mutex"
This reverts commit r221331 and reinstate r220932 as discussed in D19271.
Original commit message was:
This patch adds an llvm_call_once which is a wrapper around
std::call_once on platforms where it is available and devoid
of bugs. The patch also migrates the ManagedStatic mutex to
be allocated using llvm_call_once.
These changes are philosophically equivalent to the changes
added in r219638, which were reverted due to a hang on Win32
which was the result of a bug in the Windows implementation
of std::call_once.
Differential Revision: http://reviews.llvm.org/D5922
From: Mehdi Amini <mehdi.amini at apple.com>
Added:
llvm/trunk/lib/Support/Unix/Threading.inc
llvm/trunk/lib/Support/Windows/Threading.inc
Modified:
llvm/trunk/include/llvm/Support/Threading.h
llvm/trunk/lib/Support/ManagedStatic.cpp
llvm/trunk/lib/Support/Threading.cpp
Modified: llvm/trunk/include/llvm/Support/Threading.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/Threading.h?rev=269577&r1=269576&r2=269577&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/Threading.h (original)
+++ llvm/trunk/include/llvm/Support/Threading.h Sat May 14 15:55:52 2016
@@ -15,6 +15,14 @@
#ifndef LLVM_SUPPORT_THREADING_H
#define LLVM_SUPPORT_THREADING_H
+#include "llvm/Config/llvm-config.h" // for LLVM_ON_UNIX
+
+#if defined(LLVM_ON_UNIX)
+#include <mutex>
+#else
+#include "llvm/Support/Atomic.h"
+#endif
+
namespace llvm {
/// Returns true if LLVM is compiled with support for multi-threading, and
/// false otherwise.
@@ -34,6 +42,34 @@ namespace llvm {
/// the thread stack.
void llvm_execute_on_thread(void (*UserFn)(void*), void *UserData,
unsigned RequestedStackSize = 0);
+
+#if defined(LLVM_ON_UNIX)
+typedef std::once_flag once_flag;
+#define LLVM_DEFINE_ONCE_FLAG(flag) static once_flag flag
+#else
+enum InitStatus {
+ Done = -1,
+ Uninitialized = 0,
+ Wait = 1
+};
+typedef volatile sys::cas_flag once_flag;
+
+#define LLVM_DEFINE_ONCE_FLAG(flag) static once_flag flag = Uninitialized
+#endif
+
+/// \brief Execute the function specified as a parameter once.
+///
+/// Typical usage:
+/// \code
+/// void foo() {...};
+/// ...
+/// LLVM_DEFINE_ONCE_FLAG(flag);
+/// call_once(flag, foo);
+/// \endcode
+///
+/// \param flag Flag used for tracking whether or not this has run.
+/// \param UserFn Function to call once.
+void call_once(once_flag &flag, void (*UserFn)(void));
}
#endif
Modified: llvm/trunk/lib/Support/ManagedStatic.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/ManagedStatic.cpp?rev=269577&r1=269576&r2=269577&view=diff
==============================================================================
--- llvm/trunk/lib/Support/ManagedStatic.cpp (original)
+++ llvm/trunk/lib/Support/ManagedStatic.cpp Sat May 14 15:55:52 2016
@@ -16,16 +16,23 @@
#include "llvm/Support/Atomic.h"
#include "llvm/Support/Mutex.h"
#include "llvm/Support/MutexGuard.h"
+#include "llvm/Support/Threading.h"
#include <cassert>
using namespace llvm;
static const ManagedStaticBase *StaticList = nullptr;
+static sys::Mutex *ManagedStaticMutex = nullptr;
+LLVM_DEFINE_ONCE_FLAG(mutex_init_flag);
-static sys::Mutex& getManagedStaticMutex() {
+static void initializeMutex() {
+ ManagedStaticMutex = new sys::Mutex();
+}
+
+static sys::Mutex* getManagedStaticMutex() {
// We need to use a function local static here, since this can get called
// during a static constructor and we need to guarantee that it's initialized
// correctly.
- static sys::Mutex ManagedStaticMutex;
+ call_once(mutex_init_flag, initializeMutex);
return ManagedStaticMutex;
}
@@ -33,7 +40,7 @@ void ManagedStaticBase::RegisterManagedS
void (*Deleter)(void*)) const {
assert(Creator);
if (llvm_is_multithreaded()) {
- MutexGuard Lock(getManagedStaticMutex());
+ MutexGuard Lock(*getManagedStaticMutex());
if (!Ptr) {
void* tmp = Creator();
@@ -83,7 +90,7 @@ void ManagedStaticBase::destroy() const
/// llvm_shutdown - Deallocate and destroy all ManagedStatic variables.
void llvm::llvm_shutdown() {
- MutexGuard Lock(getManagedStaticMutex());
+ MutexGuard Lock(*getManagedStaticMutex());
while (StaticList)
StaticList->destroy();
Modified: llvm/trunk/lib/Support/Threading.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Threading.cpp?rev=269577&r1=269576&r2=269577&view=diff
==============================================================================
--- llvm/trunk/lib/Support/Threading.cpp (original)
+++ llvm/trunk/lib/Support/Threading.cpp Sat May 14 15:55:52 2016
@@ -110,3 +110,10 @@ void llvm::llvm_execute_on_thread(void (
}
#endif
+
+#if defined(LLVM_ON_UNIX)
+#include "Unix/Threading.inc"
+#else
+#include "Windows/Threading.inc"
+#endif
+
Added: llvm/trunk/lib/Support/Unix/Threading.inc
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Unix/Threading.inc?rev=269577&view=auto
==============================================================================
--- llvm/trunk/lib/Support/Unix/Threading.inc (added)
+++ llvm/trunk/lib/Support/Unix/Threading.inc Sat May 14 15:55:52 2016
@@ -0,0 +1,5 @@
+#include <thread>
+
+void llvm::call_once(once_flag& flag, void (*fptr)(void)) {
+ std::call_once(flag, fptr);
+}
Added: llvm/trunk/lib/Support/Windows/Threading.inc
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Windows/Threading.inc?rev=269577&view=auto
==============================================================================
--- llvm/trunk/lib/Support/Windows/Threading.inc (added)
+++ llvm/trunk/lib/Support/Windows/Threading.inc Sat May 14 15:55:52 2016
@@ -0,0 +1,24 @@
+ #include <windows.h>
+
+#ifdef MemoryFence
+// WinNT.h seems to define a MemoryFence macro.
+#undef MemoryFence
+#endif
+
+void llvm::call_once(once_flag &flag, void (*fptr)(void)) {
+ while (flag != Done) {
+ if (flag == Wait) {
+ ::Sleep(1);
+ continue;
+ }
+
+ sys::cas_flag old_val = sys::CompareAndSwap(&flag, Wait, Uninitialized);
+ if (old_val == Uninitialized) {
+ fptr();
+ sys::MemoryFence();
+ flag = Done;
+ return;
+ }
+ }
+ sys::MemoryFence();
+}
More information about the llvm-commits
mailing list