[llvm] r221331 - Revert 220932.
Jiangning Liu
jiangning.liu at arm.com
Tue Nov 4 20:44:31 PST 2014
Author: jiangning
Date: Tue Nov 4 22:44:31 2014
New Revision: 221331
URL: http://llvm.org/viewvc/llvm-project?rev=221331&view=rev
Log:
Revert 220932.
Commit 220932 caused crash when building clang-tblgen on aarch64 debian target,
so it's blocking all daily tests.
The std::call_once implementation in pthread has bug for aarch64 debian.
Removed:
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/CMakeLists.txt
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=221331&r1=221330&r2=221331&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/Threading.h (original)
+++ llvm/trunk/include/llvm/Support/Threading.h Tue Nov 4 22:44:31 2014
@@ -15,14 +15,6 @@
#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.
@@ -41,34 +33,6 @@ 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/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/CMakeLists.txt?rev=221331&r1=221330&r2=221331&view=diff
==============================================================================
--- llvm/trunk/lib/Support/CMakeLists.txt (original)
+++ llvm/trunk/lib/Support/CMakeLists.txt Tue Nov 4 22:44:31 2014
@@ -102,7 +102,6 @@ add_llvm_library(LLVMSupport
Unix/Program.inc
Unix/RWMutex.inc
Unix/Signals.inc
- Unix/Threading.inc
Unix/ThreadLocal.inc
Unix/TimeValue.inc
Unix/Watchdog.inc
@@ -115,7 +114,6 @@ add_llvm_library(LLVMSupport
Windows/Program.inc
Windows/RWMutex.inc
Windows/Signals.inc
- Windows/Threading.inc
Windows/ThreadLocal.inc
Windows/TimeValue.inc
Windows/Watchdog.inc
Modified: llvm/trunk/lib/Support/ManagedStatic.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/ManagedStatic.cpp?rev=221331&r1=221330&r2=221331&view=diff
==============================================================================
--- llvm/trunk/lib/Support/ManagedStatic.cpp (original)
+++ llvm/trunk/lib/Support/ManagedStatic.cpp Tue Nov 4 22:44:31 2014
@@ -16,23 +16,16 @@
#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 void initializeMutex() {
- ManagedStaticMutex = new sys::Mutex();
-}
-
-static sys::Mutex* getManagedStaticMutex() {
+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.
- call_once(mutex_init_flag, initializeMutex);
+ static sys::Mutex ManagedStaticMutex;
return ManagedStaticMutex;
}
@@ -40,7 +33,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();
@@ -90,7 +83,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=221331&r1=221330&r2=221331&view=diff
==============================================================================
--- llvm/trunk/lib/Support/Threading.cpp (original)
+++ llvm/trunk/lib/Support/Threading.cpp Tue Nov 4 22:44:31 2014
@@ -110,10 +110,3 @@ void llvm::llvm_execute_on_thread(void (
}
#endif
-
-#if defined(LLVM_ON_UNIX)
-#include "Unix/Threading.inc"
-#else
-#include "Windows/Threading.inc"
-#endif
-
Removed: llvm/trunk/lib/Support/Unix/Threading.inc
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Unix/Threading.inc?rev=221330&view=auto
==============================================================================
--- llvm/trunk/lib/Support/Unix/Threading.inc (original)
+++ llvm/trunk/lib/Support/Unix/Threading.inc (removed)
@@ -1,5 +0,0 @@
-#include <thread>
-
-void llvm::call_once(once_flag& flag, void (*fptr)(void)) {
- std::call_once(flag, fptr);
-}
Removed: llvm/trunk/lib/Support/Windows/Threading.inc
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Windows/Threading.inc?rev=221330&view=auto
==============================================================================
--- llvm/trunk/lib/Support/Windows/Threading.inc (original)
+++ llvm/trunk/lib/Support/Windows/Threading.inc (removed)
@@ -1,24 +0,0 @@
- #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