diff options
| -rw-r--r-- | clang/tools/libclang/CIndex.cpp | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/clang/tools/libclang/CIndex.cpp b/clang/tools/libclang/CIndex.cpp index 45e57860959..787c28b21e2 100644 --- a/clang/tools/libclang/CIndex.cpp +++ b/clang/tools/libclang/CIndex.cpp @@ -51,7 +51,6 @@ #include "llvm/Support/Threading.h" #include "llvm/Support/Timer.h" #include "llvm/Support/raw_ostream.h" -#include <mutex> #ifdef __APPLE__ #include <pthread.h> @@ -2573,8 +2572,8 @@ buildPieces(unsigned NameFlags, bool IsMemberRefExpr, // Misc. API hooks. //===----------------------------------------------------------------------===// -static llvm::sys::Mutex LoggingMutex; -static std::once_flag LibclangGlobalInitFlag; +static llvm::sys::Mutex EnableMultithreadingMutex; +static bool EnabledMultithreading; static void fatal_error_handler(void *user_data, const std::string& reason, bool gen_crash_diag) { @@ -2584,10 +2583,6 @@ static void fatal_error_handler(void *user_data, const std::string& reason, ::abort(); } -static void initializeLibClang() { - llvm::install_fatal_error_handler(fatal_error_handler, nullptr); -} - extern "C" { CXIndex clang_createIndex(int excludeDeclarationsFromPCH, int displayDiagnostics) { @@ -2596,7 +2591,15 @@ CXIndex clang_createIndex(int excludeDeclarationsFromPCH, if (!getenv("LIBCLANG_DISABLE_CRASH_RECOVERY")) llvm::CrashRecoveryContext::Enable(); - std::call_once(LibclangGlobalInitFlag, initializeLibClang); + // Enable support for multithreading in LLVM. + { + llvm::sys::ScopedLock L(EnableMultithreadingMutex); + if (!EnabledMultithreading) { + llvm::install_fatal_error_handler(fatal_error_handler, nullptr); + llvm::llvm_start_multithreaded(); + EnabledMultithreading = true; + } + } CIndexer *CIdxr = new CIndexer(); if (excludeDeclarationsFromPCH) @@ -6974,7 +6977,7 @@ Logger &cxindex::Logger::operator<<(const llvm::format_object_base &Fmt) { cxindex::Logger::~Logger() { LogOS.flush(); - llvm::sys::ScopedLock L(LoggingMutex); + llvm::sys::ScopedLock L(EnableMultithreadingMutex); static llvm::TimeRecord sBeginTR = llvm::TimeRecord::getCurrentTime(); |
