mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-12-13 04:30:23 +00:00
Replace Execution Engine's mutex with std::recursive_mutex.
This change has a bit of a trickle down effect due to the fact that there are a number of derived implementations of ExecutionEngine, and that the mutex is not tightly encapsulated so is used by other classes directly. Reviewed by: rnk Differential Revision: http://reviews.llvm.org/D4196 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@211214 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Zachary Turner
parent
b2791542c2
commit
1f502bd9d7
@ -22,10 +22,10 @@
|
||||
#include "llvm/IR/ValueMap.h"
|
||||
#include "llvm/MC/MCCodeGenInfo.h"
|
||||
#include "llvm/Support/ErrorHandling.h"
|
||||
#include "llvm/Support/Mutex.h"
|
||||
#include "llvm/Target/TargetMachine.h"
|
||||
#include "llvm/Target/TargetOptions.h"
|
||||
#include <map>
|
||||
#include <mutex>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
@ -42,7 +42,6 @@ class JITEventListener;
|
||||
class JITMemoryManager;
|
||||
class MachineCodeInfo;
|
||||
class Module;
|
||||
class MutexGuard;
|
||||
class ObjectCache;
|
||||
class RTDyldMemoryManager;
|
||||
class Triple;
|
||||
@ -59,7 +58,7 @@ class ExecutionEngineState {
|
||||
public:
|
||||
struct AddressMapConfig : public ValueMapConfig<const GlobalValue*> {
|
||||
typedef ExecutionEngineState *ExtraData;
|
||||
static sys::Mutex *getMutex(ExecutionEngineState *EES);
|
||||
static std::recursive_mutex *getMutex(ExecutionEngineState *EES);
|
||||
static void onDelete(ExecutionEngineState *EES, const GlobalValue *Old);
|
||||
static void onRAUW(ExecutionEngineState *, const GlobalValue *,
|
||||
const GlobalValue *);
|
||||
@ -164,7 +163,7 @@ public:
|
||||
/// lock - This lock protects the ExecutionEngine, MCJIT, JIT, JITResolver and
|
||||
/// JITEmitter classes. It must be held while changing the internal state of
|
||||
/// any of those classes.
|
||||
sys::Mutex lock;
|
||||
std::recursive_mutex lock;
|
||||
|
||||
//===--------------------------------------------------------------------===//
|
||||
// ExecutionEngine Startup
|
||||
|
||||
@ -28,9 +28,9 @@
|
||||
|
||||
#include "llvm/ADT/DenseMap.h"
|
||||
#include "llvm/IR/ValueHandle.h"
|
||||
#include "llvm/Support/Mutex.h"
|
||||
#include "llvm/Support/type_traits.h"
|
||||
#include <iterator>
|
||||
#include <mutex>
|
||||
|
||||
namespace llvm {
|
||||
|
||||
@ -45,7 +45,7 @@ class ValueMapConstIterator;
|
||||
/// This class defines the default behavior for configurable aspects of
|
||||
/// ValueMap<>. User Configs should inherit from this class to be as compatible
|
||||
/// as possible with future versions of ValueMap.
|
||||
template<typename KeyT, typename MutexT = sys::Mutex>
|
||||
template<typename KeyT, typename MutexT = std::recursive_mutex>
|
||||
struct ValueMapConfig {
|
||||
typedef MutexT mutex_type;
|
||||
|
||||
@ -216,11 +216,11 @@ public:
|
||||
ValueMapCallbackVH Copy(*this);
|
||||
typename Config::mutex_type *M = Config::getMutex(Copy.Map->Data);
|
||||
if (M)
|
||||
M->acquire();
|
||||
M->lock();
|
||||
Config::onDelete(Copy.Map->Data, Copy.Unwrap()); // May destroy *this.
|
||||
Copy.Map->Map.erase(Copy); // Definitely destroys *this.
|
||||
if (M)
|
||||
M->release();
|
||||
M->unlock();
|
||||
}
|
||||
void allUsesReplacedWith(Value *new_key) override {
|
||||
assert(isa<KeySansPointerT>(new_key) &&
|
||||
@ -229,7 +229,7 @@ public:
|
||||
ValueMapCallbackVH Copy(*this);
|
||||
typename Config::mutex_type *M = Config::getMutex(Copy.Map->Data);
|
||||
if (M)
|
||||
M->acquire();
|
||||
M->lock();
|
||||
|
||||
KeyT typed_new_key = cast<KeySansPointerT>(new_key);
|
||||
// Can destroy *this:
|
||||
@ -245,7 +245,7 @@ public:
|
||||
}
|
||||
}
|
||||
if (M)
|
||||
M->release();
|
||||
M->unlock();
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@ -166,7 +166,7 @@ void *ExecutionEngineState::RemoveMapping(const GlobalValue *ToUnmap) {
|
||||
}
|
||||
|
||||
void ExecutionEngine::addGlobalMapping(const GlobalValue *GV, void *Addr) {
|
||||
MutexGuard locked(lock);
|
||||
std::lock_guard<std::recursive_mutex> locked(lock);
|
||||
|
||||
DEBUG(dbgs() << "JIT: Map \'" << GV->getName()
|
||||
<< "\' to [" << Addr << "]\n";);
|
||||
@ -184,14 +184,14 @@ void ExecutionEngine::addGlobalMapping(const GlobalValue *GV, void *Addr) {
|
||||
}
|
||||
|
||||
void ExecutionEngine::clearAllGlobalMappings() {
|
||||
MutexGuard locked(lock);
|
||||
std::lock_guard<std::recursive_mutex> locked(lock);
|
||||
|
||||
EEState.getGlobalAddressMap().clear();
|
||||
EEState.getGlobalAddressReverseMap().clear();
|
||||
}
|
||||
|
||||
void ExecutionEngine::clearGlobalMappingsFromModule(Module *M) {
|
||||
MutexGuard locked(lock);
|
||||
std::lock_guard<std::recursive_mutex> locked(lock);
|
||||
|
||||
for (Module::iterator FI = M->begin(), FE = M->end(); FI != FE; ++FI)
|
||||
EEState.RemoveMapping(FI);
|
||||
@ -201,7 +201,7 @@ void ExecutionEngine::clearGlobalMappingsFromModule(Module *M) {
|
||||
}
|
||||
|
||||
void *ExecutionEngine::updateGlobalMapping(const GlobalValue *GV, void *Addr) {
|
||||
MutexGuard locked(lock);
|
||||
std::lock_guard<std::recursive_mutex> locked(lock);
|
||||
|
||||
ExecutionEngineState::GlobalAddressMapTy &Map =
|
||||
EEState.getGlobalAddressMap();
|
||||
@ -228,7 +228,7 @@ void *ExecutionEngine::updateGlobalMapping(const GlobalValue *GV, void *Addr) {
|
||||
}
|
||||
|
||||
void *ExecutionEngine::getPointerToGlobalIfAvailable(const GlobalValue *GV) {
|
||||
MutexGuard locked(lock);
|
||||
std::lock_guard<std::recursive_mutex> locked(lock);
|
||||
|
||||
ExecutionEngineState::GlobalAddressMapTy::iterator I =
|
||||
EEState.getGlobalAddressMap().find(GV);
|
||||
@ -236,7 +236,7 @@ void *ExecutionEngine::getPointerToGlobalIfAvailable(const GlobalValue *GV) {
|
||||
}
|
||||
|
||||
const GlobalValue *ExecutionEngine::getGlobalValueAtAddress(void *Addr) {
|
||||
MutexGuard locked(lock);
|
||||
std::lock_guard<std::recursive_mutex> locked(lock);
|
||||
|
||||
// If we haven't computed the reverse mapping yet, do so first.
|
||||
if (EEState.getGlobalAddressReverseMap().empty()) {
|
||||
@ -555,7 +555,7 @@ void *ExecutionEngine::getPointerToGlobal(const GlobalValue *GV) {
|
||||
if (Function *F = const_cast<Function*>(dyn_cast<Function>(GV)))
|
||||
return getPointerToFunction(F);
|
||||
|
||||
MutexGuard locked(lock);
|
||||
std::lock_guard<std::recursive_mutex> locked(lock);
|
||||
if (void *P = EEState.getGlobalAddressMap()[GV])
|
||||
return P;
|
||||
|
||||
@ -1346,7 +1346,7 @@ ExecutionEngineState::ExecutionEngineState(ExecutionEngine &EE)
|
||||
: EE(EE), GlobalAddressMap(this) {
|
||||
}
|
||||
|
||||
sys::Mutex *
|
||||
std::recursive_mutex *
|
||||
ExecutionEngineState::AddressMapConfig::getMutex(ExecutionEngineState *EES) {
|
||||
return &EES->EE.lock;
|
||||
}
|
||||
|
||||
@ -96,18 +96,18 @@ namespace {
|
||||
/// bugpoint or gdb users to search for a function by name without any context.
|
||||
class JitPool {
|
||||
SmallPtrSet<JIT*, 1> JITs; // Optimize for process containing just 1 JIT.
|
||||
mutable sys::Mutex Lock;
|
||||
mutable std::recursive_mutex Lock;
|
||||
public:
|
||||
void Add(JIT *jit) {
|
||||
MutexGuard guard(Lock);
|
||||
std::lock_guard<std::recursive_mutex> guard(Lock);
|
||||
JITs.insert(jit);
|
||||
}
|
||||
void Remove(JIT *jit) {
|
||||
MutexGuard guard(Lock);
|
||||
std::lock_guard<std::recursive_mutex> guard(Lock);
|
||||
JITs.erase(jit);
|
||||
}
|
||||
void *getPointerToNamedFunction(const char *Name) const {
|
||||
MutexGuard guard(Lock);
|
||||
std::lock_guard<std::recursive_mutex> guard(Lock);
|
||||
assert(JITs.size() != 0 && "No Jit registered");
|
||||
//search function in every instance of JIT
|
||||
for (SmallPtrSet<JIT*, 1>::const_iterator Jit = JITs.begin(),
|
||||
@ -150,7 +150,7 @@ JIT::JIT(Module *M, TargetMachine &tm, TargetJITInfo &tji,
|
||||
AllJits->Add(this);
|
||||
|
||||
// Add target data
|
||||
MutexGuard locked(lock);
|
||||
std::lock_guard<std::recursive_mutex> locked(lock);
|
||||
FunctionPassManager &PM = jitstate->getPM();
|
||||
M->setDataLayout(TM.getDataLayout());
|
||||
PM.add(new DataLayoutPass(M));
|
||||
@ -177,7 +177,7 @@ JIT::~JIT() {
|
||||
/// addModule - Add a new Module to the JIT. If we previously removed the last
|
||||
/// Module, we need re-initialize jitstate with a valid Module.
|
||||
void JIT::addModule(Module *M) {
|
||||
MutexGuard locked(lock);
|
||||
std::lock_guard<std::recursive_mutex> locked(lock);
|
||||
|
||||
if (Modules.empty()) {
|
||||
assert(!jitstate && "jitstate should be NULL if Modules vector is empty!");
|
||||
@ -206,7 +206,7 @@ void JIT::addModule(Module *M) {
|
||||
bool JIT::removeModule(Module *M) {
|
||||
bool result = ExecutionEngine::removeModule(M);
|
||||
|
||||
MutexGuard locked(lock);
|
||||
std::lock_guard<std::recursive_mutex> locked(lock);
|
||||
|
||||
if (jitstate && jitstate->getModule() == M) {
|
||||
delete jitstate;
|
||||
@ -408,13 +408,13 @@ GenericValue JIT::runFunction(Function *F,
|
||||
void JIT::RegisterJITEventListener(JITEventListener *L) {
|
||||
if (!L)
|
||||
return;
|
||||
MutexGuard locked(lock);
|
||||
std::lock_guard<std::recursive_mutex> locked(lock);
|
||||
EventListeners.push_back(L);
|
||||
}
|
||||
void JIT::UnregisterJITEventListener(JITEventListener *L) {
|
||||
if (!L)
|
||||
return;
|
||||
MutexGuard locked(lock);
|
||||
std::lock_guard<std::recursive_mutex> locked(lock);
|
||||
std::vector<JITEventListener*>::reverse_iterator I=
|
||||
std::find(EventListeners.rbegin(), EventListeners.rend(), L);
|
||||
if (I != EventListeners.rend()) {
|
||||
@ -426,14 +426,14 @@ void JIT::NotifyFunctionEmitted(
|
||||
const Function &F,
|
||||
void *Code, size_t Size,
|
||||
const JITEvent_EmittedFunctionDetails &Details) {
|
||||
MutexGuard locked(lock);
|
||||
std::lock_guard<std::recursive_mutex> locked(lock);
|
||||
for (unsigned I = 0, S = EventListeners.size(); I < S; ++I) {
|
||||
EventListeners[I]->NotifyFunctionEmitted(F, Code, Size, Details);
|
||||
}
|
||||
}
|
||||
|
||||
void JIT::NotifyFreeingMachineCode(void *OldPtr) {
|
||||
MutexGuard locked(lock);
|
||||
std::lock_guard<std::recursive_mutex> locked(lock);
|
||||
for (unsigned I = 0, S = EventListeners.size(); I < S; ++I) {
|
||||
EventListeners[I]->NotifyFreeingMachineCode(OldPtr);
|
||||
}
|
||||
@ -444,7 +444,7 @@ void JIT::NotifyFreeingMachineCode(void *OldPtr) {
|
||||
/// GlobalAddress[F] with the address of F's machine code.
|
||||
///
|
||||
void JIT::runJITOnFunction(Function *F, MachineCodeInfo *MCI) {
|
||||
MutexGuard locked(lock);
|
||||
std::lock_guard<std::recursive_mutex> locked(lock);
|
||||
|
||||
class MCIListener : public JITEventListener {
|
||||
MachineCodeInfo *const MCI;
|
||||
@ -505,7 +505,7 @@ void *JIT::getPointerToFunction(Function *F) {
|
||||
if (void *Addr = getPointerToGlobalIfAvailable(F))
|
||||
return Addr; // Check if function already code gen'd
|
||||
|
||||
MutexGuard locked(lock);
|
||||
std::lock_guard<std::recursive_mutex> locked(lock);
|
||||
|
||||
// Now that this thread owns the lock, make sure we read in the function if it
|
||||
// exists in this Module.
|
||||
@ -534,7 +534,7 @@ void *JIT::getPointerToFunction(Function *F) {
|
||||
}
|
||||
|
||||
void JIT::addPointerToBasicBlock(const BasicBlock *BB, void *Addr) {
|
||||
MutexGuard locked(lock);
|
||||
std::lock_guard<std::recursive_mutex> locked(lock);
|
||||
|
||||
BasicBlockAddressMapTy::iterator I =
|
||||
getBasicBlockAddressMap().find(BB);
|
||||
@ -546,7 +546,7 @@ void JIT::addPointerToBasicBlock(const BasicBlock *BB, void *Addr) {
|
||||
}
|
||||
|
||||
void JIT::clearPointerToBasicBlock(const BasicBlock *BB) {
|
||||
MutexGuard locked(lock);
|
||||
std::lock_guard<std::recursive_mutex> locked(lock);
|
||||
getBasicBlockAddressMap().erase(BB);
|
||||
}
|
||||
|
||||
@ -555,7 +555,7 @@ void *JIT::getPointerToBasicBlock(BasicBlock *BB) {
|
||||
(void)getPointerToFunction(BB->getParent());
|
||||
|
||||
// resolve basic block address
|
||||
MutexGuard locked(lock);
|
||||
std::lock_guard<std::recursive_mutex> locked(lock);
|
||||
|
||||
BasicBlockAddressMapTy::iterator I =
|
||||
getBasicBlockAddressMap().find(BB);
|
||||
@ -592,7 +592,7 @@ void *JIT::getPointerToNamedFunction(const std::string &Name,
|
||||
/// variable, possibly emitting it to memory if needed. This is used by the
|
||||
/// Emitter.
|
||||
void *JIT::getOrEmitGlobalVariable(const GlobalVariable *GV) {
|
||||
MutexGuard locked(lock);
|
||||
std::lock_guard<std::recursive_mutex> locked(lock);
|
||||
|
||||
void *Ptr = getPointerToGlobalIfAvailable(GV);
|
||||
if (Ptr) return Ptr;
|
||||
@ -666,7 +666,7 @@ char* JIT::getMemoryForGV(const GlobalVariable* GV) {
|
||||
size_t S = getDataLayout()->getTypeAllocSize(GlobalType);
|
||||
size_t A = getDataLayout()->getPreferredAlignment(GV);
|
||||
if (GV->isThreadLocal()) {
|
||||
MutexGuard locked(lock);
|
||||
std::lock_guard<std::recursive_mutex> locked(lock);
|
||||
Ptr = TJI.allocateThreadLocalMemory(S);
|
||||
} else if (TJI.allocateSeparateGVMemory()) {
|
||||
if (A <= 8) {
|
||||
@ -687,7 +687,7 @@ char* JIT::getMemoryForGV(const GlobalVariable* GV) {
|
||||
}
|
||||
|
||||
void JIT::addPendingFunction(Function *F) {
|
||||
MutexGuard locked(lock);
|
||||
std::lock_guard<std::recursive_mutex> locked(lock);
|
||||
jitstate->getPendingFunctions().push_back(F);
|
||||
}
|
||||
|
||||
|
||||
@ -40,7 +40,6 @@
|
||||
#include "llvm/Support/ErrorHandling.h"
|
||||
#include "llvm/Support/ManagedStatic.h"
|
||||
#include "llvm/Support/Memory.h"
|
||||
#include "llvm/Support/MutexGuard.h"
|
||||
#include "llvm/Support/raw_ostream.h"
|
||||
#include "llvm/Target/TargetInstrInfo.h"
|
||||
#include "llvm/Target/TargetJITInfo.h"
|
||||
@ -50,6 +49,7 @@
|
||||
#ifndef NDEBUG
|
||||
#include <iomanip>
|
||||
#endif
|
||||
#include <mutex>
|
||||
using namespace llvm;
|
||||
|
||||
#define DEBUG_TYPE "jit"
|
||||
@ -230,22 +230,22 @@ namespace {
|
||||
std::map<void*, JITResolver*> Map;
|
||||
|
||||
/// Guards Map from concurrent accesses.
|
||||
mutable sys::Mutex Lock;
|
||||
mutable std::recursive_mutex Lock;
|
||||
|
||||
public:
|
||||
/// Registers a Stub to be resolved by Resolver.
|
||||
void RegisterStubResolver(void *Stub, JITResolver *Resolver) {
|
||||
MutexGuard guard(Lock);
|
||||
std::lock_guard<std::recursive_mutex> guard(Lock);
|
||||
Map.insert(std::make_pair(Stub, Resolver));
|
||||
}
|
||||
/// Unregisters the Stub when it's invalidated.
|
||||
void UnregisterStubResolver(void *Stub) {
|
||||
MutexGuard guard(Lock);
|
||||
std::lock_guard<std::recursive_mutex> guard(Lock);
|
||||
Map.erase(Stub);
|
||||
}
|
||||
/// Returns the JITResolver instance that owns the Stub.
|
||||
JITResolver *getResolverFromStub(void *Stub) const {
|
||||
MutexGuard guard(Lock);
|
||||
std::lock_guard<std::recursive_mutex> guard(Lock);
|
||||
// The address given to us for the stub may not be exactly right, it might
|
||||
// be a little bit after the stub. As such, use upper_bound to find it.
|
||||
// This is the same trick as in LookupFunctionFromCallSite from
|
||||
@ -258,7 +258,7 @@ namespace {
|
||||
/// True if any stubs refer to the given resolver. Only used in an assert().
|
||||
/// O(N)
|
||||
bool ResolverHasStubs(JITResolver* Resolver) const {
|
||||
MutexGuard guard(Lock);
|
||||
std::lock_guard<std::recursive_mutex> guard(Lock);
|
||||
for (std::map<void*, JITResolver*>::const_iterator I = Map.begin(),
|
||||
E = Map.end(); I != E; ++I) {
|
||||
if (I->second == Resolver)
|
||||
@ -494,7 +494,7 @@ JITResolver::~JITResolver() {
|
||||
/// getLazyFunctionStubIfAvailable - This returns a pointer to a function stub
|
||||
/// if it has already been created.
|
||||
void *JITResolver::getLazyFunctionStubIfAvailable(Function *F) {
|
||||
MutexGuard locked(TheJIT->lock);
|
||||
std::lock_guard<std::recursive_mutex> guard(TheJIT->lock);
|
||||
|
||||
// If we already have a stub for this function, recycle it.
|
||||
return state.getFunctionToLazyStubMap().lookup(F);
|
||||
@ -503,7 +503,7 @@ void *JITResolver::getLazyFunctionStubIfAvailable(Function *F) {
|
||||
/// getFunctionStub - This returns a pointer to a function stub, creating
|
||||
/// one on demand as needed.
|
||||
void *JITResolver::getLazyFunctionStub(Function *F) {
|
||||
MutexGuard locked(TheJIT->lock);
|
||||
std::lock_guard<std::recursive_mutex> guard(TheJIT->lock);
|
||||
|
||||
// If we already have a lazy stub for this function, recycle it.
|
||||
void *&Stub = state.getFunctionToLazyStubMap()[F];
|
||||
@ -564,7 +564,7 @@ void *JITResolver::getLazyFunctionStub(Function *F) {
|
||||
/// getGlobalValueIndirectSym - Return a lazy pointer containing the specified
|
||||
/// GV address.
|
||||
void *JITResolver::getGlobalValueIndirectSym(GlobalValue *GV, void *GVAddress) {
|
||||
MutexGuard locked(TheJIT->lock);
|
||||
std::lock_guard<std::recursive_mutex> guard(TheJIT->lock);
|
||||
|
||||
// If we already have a stub for this global variable, recycle it.
|
||||
void *&IndirectSym = state.getGlobalToIndirectSymMap()[GV];
|
||||
@ -622,7 +622,7 @@ void *JITResolver::JITCompilerFn(void *Stub) {
|
||||
// Only lock for getting the Function. The call getPointerToFunction made
|
||||
// in this function might trigger function materializing, which requires
|
||||
// JIT lock to be unlocked.
|
||||
MutexGuard locked(JR->TheJIT->lock);
|
||||
std::lock_guard<std::recursive_mutex> guard(JR->TheJIT->lock);
|
||||
|
||||
// The address given to us for the stub may not be exactly right, it might
|
||||
// be a little bit after the stub. As such, use upper_bound to find it.
|
||||
@ -654,7 +654,7 @@ void *JITResolver::JITCompilerFn(void *Stub) {
|
||||
}
|
||||
|
||||
// Reacquire the lock to update the GOT map.
|
||||
MutexGuard locked(JR->TheJIT->lock);
|
||||
std::lock_guard<std::recursive_mutex> locked(JR->TheJIT->lock);
|
||||
|
||||
// We might like to remove the call site from the CallSiteToFunction map, but
|
||||
// we can't do that! Multiple threads could be stuck, waiting to acquire the
|
||||
|
||||
@ -26,7 +26,6 @@
|
||||
#include "llvm/Support/DynamicLibrary.h"
|
||||
#include "llvm/Support/ErrorHandling.h"
|
||||
#include "llvm/Support/MemoryBuffer.h"
|
||||
#include "llvm/Support/MutexGuard.h"
|
||||
#include "llvm/Target/TargetLowering.h"
|
||||
|
||||
using namespace llvm;
|
||||
@ -66,7 +65,7 @@ MCJIT::MCJIT(Module *m, TargetMachine *tm, RTDyldMemoryManager *MM,
|
||||
}
|
||||
|
||||
MCJIT::~MCJIT() {
|
||||
MutexGuard locked(lock);
|
||||
std::lock_guard<std::recursive_mutex> locked(lock);
|
||||
// FIXME: We are managing our modules, so we do not want the base class
|
||||
// ExecutionEngine to manage them as well. To avoid double destruction
|
||||
// of the first (and only) module added in ExecutionEngine constructor
|
||||
@ -102,12 +101,12 @@ MCJIT::~MCJIT() {
|
||||
}
|
||||
|
||||
void MCJIT::addModule(Module *M) {
|
||||
MutexGuard locked(lock);
|
||||
std::lock_guard<std::recursive_mutex> locked(lock);
|
||||
OwnedModules.addModule(M);
|
||||
}
|
||||
|
||||
bool MCJIT::removeModule(Module *M) {
|
||||
MutexGuard locked(lock);
|
||||
std::lock_guard<std::recursive_mutex> locked(lock);
|
||||
return OwnedModules.removeModule(M);
|
||||
}
|
||||
|
||||
@ -129,12 +128,12 @@ void MCJIT::addArchive(object::Archive *A) {
|
||||
|
||||
|
||||
void MCJIT::setObjectCache(ObjectCache* NewCache) {
|
||||
MutexGuard locked(lock);
|
||||
std::lock_guard<std::recursive_mutex> locked(lock);
|
||||
ObjCache = NewCache;
|
||||
}
|
||||
|
||||
ObjectBufferStream* MCJIT::emitObject(Module *M) {
|
||||
MutexGuard locked(lock);
|
||||
std::lock_guard<std::recursive_mutex> locked(lock);
|
||||
|
||||
// This must be a module which has already been added but not loaded to this
|
||||
// MCJIT instance, since these conditions are tested by our caller,
|
||||
@ -174,7 +173,7 @@ ObjectBufferStream* MCJIT::emitObject(Module *M) {
|
||||
|
||||
void MCJIT::generateCodeForModule(Module *M) {
|
||||
// Get a thread lock to make sure we aren't trying to load multiple times
|
||||
MutexGuard locked(lock);
|
||||
std::lock_guard<std::recursive_mutex> locked(lock);
|
||||
|
||||
// This must be a module which has already been added to this MCJIT instance.
|
||||
assert(OwnedModules.ownsModule(M) &&
|
||||
@ -214,7 +213,7 @@ void MCJIT::generateCodeForModule(Module *M) {
|
||||
}
|
||||
|
||||
void MCJIT::finalizeLoadedModules() {
|
||||
MutexGuard locked(lock);
|
||||
std::lock_guard<std::recursive_mutex> locked(lock);
|
||||
|
||||
// Resolve any outstanding relocations.
|
||||
Dyld.resolveRelocations();
|
||||
@ -230,7 +229,7 @@ void MCJIT::finalizeLoadedModules() {
|
||||
|
||||
// FIXME: Rename this.
|
||||
void MCJIT::finalizeObject() {
|
||||
MutexGuard locked(lock);
|
||||
std::lock_guard<std::recursive_mutex> locked(lock);
|
||||
|
||||
for (ModulePtrSet::iterator I = OwnedModules.begin_added(),
|
||||
E = OwnedModules.end_added();
|
||||
@ -243,7 +242,7 @@ void MCJIT::finalizeObject() {
|
||||
}
|
||||
|
||||
void MCJIT::finalizeModule(Module *M) {
|
||||
MutexGuard locked(lock);
|
||||
std::lock_guard<std::recursive_mutex> locked(lock);
|
||||
|
||||
// This must be a module which has already been added to this MCJIT instance.
|
||||
assert(OwnedModules.ownsModule(M) && "MCJIT::finalizeModule: Unknown module.");
|
||||
@ -268,7 +267,7 @@ uint64_t MCJIT::getExistingSymbolAddress(const std::string &Name) {
|
||||
|
||||
Module *MCJIT::findModuleForSymbol(const std::string &Name,
|
||||
bool CheckFunctionsOnly) {
|
||||
MutexGuard locked(lock);
|
||||
std::lock_guard<std::recursive_mutex> locked(lock);
|
||||
|
||||
// If it hasn't already been generated, see if it's in one of our modules.
|
||||
for (ModulePtrSet::iterator I = OwnedModules.begin_added(),
|
||||
@ -292,7 +291,7 @@ Module *MCJIT::findModuleForSymbol(const std::string &Name,
|
||||
uint64_t MCJIT::getSymbolAddress(const std::string &Name,
|
||||
bool CheckFunctionsOnly)
|
||||
{
|
||||
MutexGuard locked(lock);
|
||||
std::lock_guard<std::recursive_mutex> locked(lock);
|
||||
|
||||
// First, check to see if we already have this symbol.
|
||||
uint64_t Addr = getExistingSymbolAddress(Name);
|
||||
@ -336,7 +335,7 @@ uint64_t MCJIT::getSymbolAddress(const std::string &Name,
|
||||
}
|
||||
|
||||
uint64_t MCJIT::getGlobalValueAddress(const std::string &Name) {
|
||||
MutexGuard locked(lock);
|
||||
std::lock_guard<std::recursive_mutex> locked(lock);
|
||||
uint64_t Result = getSymbolAddress(Name, false);
|
||||
if (Result != 0)
|
||||
finalizeLoadedModules();
|
||||
@ -344,7 +343,7 @@ uint64_t MCJIT::getGlobalValueAddress(const std::string &Name) {
|
||||
}
|
||||
|
||||
uint64_t MCJIT::getFunctionAddress(const std::string &Name) {
|
||||
MutexGuard locked(lock);
|
||||
std::lock_guard<std::recursive_mutex> locked(lock);
|
||||
uint64_t Result = getSymbolAddress(Name, true);
|
||||
if (Result != 0)
|
||||
finalizeLoadedModules();
|
||||
@ -353,7 +352,7 @@ uint64_t MCJIT::getFunctionAddress(const std::string &Name) {
|
||||
|
||||
// Deprecated. Use getFunctionAddress instead.
|
||||
void *MCJIT::getPointerToFunction(Function *F) {
|
||||
MutexGuard locked(lock);
|
||||
std::lock_guard<std::recursive_mutex> locked(lock);
|
||||
|
||||
if (F->isDeclaration() || F->hasAvailableExternallyLinkage()) {
|
||||
bool AbortOnFailure = !F->hasExternalWeakLinkage();
|
||||
@ -552,13 +551,13 @@ void *MCJIT::getPointerToNamedFunction(const std::string &Name,
|
||||
void MCJIT::RegisterJITEventListener(JITEventListener *L) {
|
||||
if (!L)
|
||||
return;
|
||||
MutexGuard locked(lock);
|
||||
std::lock_guard<std::recursive_mutex> locked(lock);
|
||||
EventListeners.push_back(L);
|
||||
}
|
||||
void MCJIT::UnregisterJITEventListener(JITEventListener *L) {
|
||||
if (!L)
|
||||
return;
|
||||
MutexGuard locked(lock);
|
||||
std::lock_guard<std::recursive_mutex> locked(lock);
|
||||
SmallVector<JITEventListener*, 2>::reverse_iterator I=
|
||||
std::find(EventListeners.rbegin(), EventListeners.rend(), L);
|
||||
if (I != EventListeners.rend()) {
|
||||
@ -567,14 +566,14 @@ void MCJIT::UnregisterJITEventListener(JITEventListener *L) {
|
||||
}
|
||||
}
|
||||
void MCJIT::NotifyObjectEmitted(const ObjectImage& Obj) {
|
||||
MutexGuard locked(lock);
|
||||
std::lock_guard<std::recursive_mutex> locked(lock);
|
||||
MemMgr.notifyObjectLoaded(this, &Obj);
|
||||
for (unsigned I = 0, S = EventListeners.size(); I < S; ++I) {
|
||||
EventListeners[I]->NotifyObjectEmitted(Obj);
|
||||
}
|
||||
}
|
||||
void MCJIT::NotifyFreeingObject(const ObjectImage& Obj) {
|
||||
MutexGuard locked(lock);
|
||||
std::lock_guard<std::recursive_mutex> locked(lock);
|
||||
for (unsigned I = 0, S = EventListeners.size(); I < S; ++I) {
|
||||
EventListeners[I]->NotifyFreeingObject(Obj);
|
||||
}
|
||||
|
||||
@ -186,19 +186,19 @@ struct LockMutex : ValueMapConfig<KeyT, MutexT> {
|
||||
};
|
||||
static void onRAUW(const ExtraData &Data, KeyT Old, KeyT New) {
|
||||
*Data.CalledRAUW = true;
|
||||
EXPECT_FALSE(Data.M->tryacquire()) << "Mutex should already be locked.";
|
||||
EXPECT_FALSE(Data.M->try_lock()) << "Mutex should already be locked.";
|
||||
}
|
||||
static void onDelete(const ExtraData &Data, KeyT Old) {
|
||||
*Data.CalledDeleted = true;
|
||||
EXPECT_FALSE(Data.M->tryacquire()) << "Mutex should already be locked.";
|
||||
EXPECT_FALSE(Data.M->try_lock()) << "Mutex should already be locked.";
|
||||
}
|
||||
static MutexT *getMutex(const ExtraData &Data) { return Data.M; }
|
||||
};
|
||||
#if LLVM_ENABLE_THREADS
|
||||
TYPED_TEST(ValueMapTest, LocksMutex) {
|
||||
sys::Mutex M(false); // Not recursive.
|
||||
std::mutex M; // Not recursive.
|
||||
bool CalledRAUW = false, CalledDeleted = false;
|
||||
typedef LockMutex<TypeParam*, sys::Mutex> ConfigType;
|
||||
typedef LockMutex<TypeParam*, std::mutex> ConfigType;
|
||||
typename ConfigType::ExtraData Data = {&M, &CalledRAUW, &CalledDeleted};
|
||||
ValueMap<TypeParam*, int, ConfigType> VM(Data);
|
||||
VM[this->BitcastV.get()] = 7;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user