maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Add locking around the external function lookup table for the interpreter. 

llvm-svn: 73912
This commit is contained in:
Owen Anderson 2009-06-22 22:30:56 +00:00
parent e9454e8c25
commit da19a13a68
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp
View File

@ -27,6 +27,7 @@
#include "llvm/System/DynamicLibrary.h" #include "llvm/System/DynamicLibrary.h"
#include "llvm/Target/TargetData.h" #include "llvm/Target/TargetData.h"
#include "llvm/Support/ManagedStatic.h" #include "llvm/Support/ManagedStatic.h"
#include "llvm/System/Mutex.h"
#include <csignal> #include <csignal>
#include <cstdio> #include <cstdio>
#include <map> #include <map>
@ -45,6 +46,8 @@
using namespace llvm; using namespace llvm;
static ManagedStatic<sys::Mutex> FunctionsLock;
typedef GenericValue (*ExFunc)(const FunctionType *, typedef GenericValue (*ExFunc)(const FunctionType *,
const std::vector<GenericValue> &); const std::vector<GenericValue> &);
static ManagedStatic<std::map<const Function *, ExFunc> > ExportedFunctions; static ManagedStatic<std::map<const Function *, ExFunc> > ExportedFunctions;
@ -94,6 +97,7 @@ static ExFunc lookupFunction(const Function *F) {
ExtName += getTypeID(FT->getContainedType(i)); ExtName += getTypeID(FT->getContainedType(i));
ExtName += "_" + F->getName(); ExtName += "_" + F->getName();
sys::ScopedLock Writer(&*FunctionsLock);
ExFunc FnPtr = FuncNames[ExtName]; ExFunc FnPtr = FuncNames[ExtName];
if (FnPtr == 0) if (FnPtr == 0)
FnPtr = FuncNames["lle_X_"+F->getName()]; FnPtr = FuncNames["lle_X_"+F->getName()];
@ -246,12 +250,16 @@ GenericValue Interpreter::callExternalFunction(Function *F,
const std::vector<GenericValue> &ArgVals) { const std::vector<GenericValue> &ArgVals) {
TheInterpreter = this; TheInterpreter = this;
FunctionsLock->acquire();
// Do a lookup to see if the function is in our cache... this should just be a // Do a lookup to see if the function is in our cache... this should just be a
// deferred annotation! // deferred annotation!
std::map<const Function *, ExFunc>::iterator FI = ExportedFunctions->find(F); std::map<const Function *, ExFunc>::iterator FI = ExportedFunctions->find(F);
if (ExFunc Fn = (FI == ExportedFunctions->end()) ? lookupFunction(F) if (ExFunc Fn = (FI == ExportedFunctions->end()) ? lookupFunction(F)
: FI->second) : FI->second) {
FunctionsLock->release();
return Fn(F->getFunctionType(), ArgVals); return Fn(F->getFunctionType(), ArgVals);
}
#ifdef USE_LIBFFI #ifdef USE_LIBFFI
std::map<const Function *, RawFunc>::iterator RF = RawFunctions->find(F); std::map<const Function *, RawFunc>::iterator RF = RawFunctions->find(F);
@ -264,6 +272,8 @@ GenericValue Interpreter::callExternalFunction(Function *F,
} else { } else {
RawFn = RF->second; RawFn = RF->second;
} }
FunctionsLock->release();
GenericValue Result; GenericValue Result;
if (RawFn != 0 && ffiInvoke(RawFn, F, ArgVals, getTargetData(), Result)) if (RawFn != 0 && ffiInvoke(RawFn, F, ArgVals, getTargetData(), Result))
@ -529,6 +539,7 @@ GenericValue lle_X_fprintf(const FunctionType *FT,
void Interpreter::initializeExternalFunctions() { void Interpreter::initializeExternalFunctions() {
sys::ScopedLock Writer(&*FunctionsLock);
FuncNames["lle_X_atexit"] = lle_X_atexit; FuncNames["lle_X_atexit"] = lle_X_atexit;
FuncNames["lle_X_exit"] = lle_X_exit; FuncNames["lle_X_exit"] = lle_X_exit;
FuncNames["lle_X_abort"] = lle_X_abort; FuncNames["lle_X_abort"] = lle_X_abort;