6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-28 06:24:57 +00:00
Code Issues Projects Releases Wiki Activity

Guard the global annotation tables.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@73913 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Owen Anderson
2009-06-22 22:44:15 +00:00
parent c226570bde
commit 521db56182
1 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lib/Support/Annotation.cpp
View File

@ -13,6 +13,7 @@
#include "llvm/Support/Annotation.h" #include "llvm/Support/Annotation.h"
#include "llvm/Support/ManagedStatic.h" #include "llvm/Support/ManagedStatic.h"
#include "llvm/System/RWMutex.h"
#include <map> #include <map>
#include <cstring> #include <cstring>
using namespace llvm; using namespace llvm;
@ -42,30 +43,32 @@ static unsigned IDCounter = 0; // Unique ID counter
// Static member to ensure initialiation on demand. // Static member to ensure initialiation on demand.
static ManagedStatic<IDMapType> IDMap; static ManagedStatic<IDMapType> IDMap;
static ManagedStatic<sys::SmartRWMutex<true> > AnnotationsLock;
// On demand annotation creation support... // On demand annotation creation support...
typedef Annotation *(*AnnFactory)(AnnotationID, const Annotable *, void *); typedef Annotation *(*AnnFactory)(AnnotationID, const Annotable *, void *);
typedef std::map<unsigned, std::pair<AnnFactory,void*> > FactMapType; typedef std::map<unsigned, std::pair<AnnFactory,void*> > FactMapType;
static FactMapType *TheFactMap = 0; static ManagedStatic<FactMapType> TheFactMap;
static FactMapType &getFactMap() { static FactMapType &getFactMap() {
if (TheFactMap == 0)
TheFactMap = new FactMapType();
return *TheFactMap; return *TheFactMap;
} }
static void eraseFromFactMap(unsigned ID) { static void eraseFromFactMap(unsigned ID) {
assert(TheFactMap && "No entries found!"); sys::SmartScopedWriter<true> Writer(&*AnnotationsLock);
TheFactMap->erase(ID); TheFactMap->erase(ID);
if (TheFactMap->empty()) { // Delete when empty
delete TheFactMap;
TheFactMap = 0;
}
} }
AnnotationID AnnotationManager::getID(const char *Name) { // Name -> ID AnnotationID AnnotationManager::getID(const char *Name) { // Name -> ID
AnnotationsLock->reader_acquire();
IDMapType::iterator I = IDMap->find(Name); IDMapType::iterator I = IDMap->find(Name);
if (I == IDMap->end()) { IDMapType::iterator E = IDMap->end();
AnnotationsLock->reader_release();
if (I == E) {
sys::SmartScopedWriter<true> Writer(&*AnnotationsLock);
I = IDMap->find(Name);
if (I == IDMap->end())
(*IDMap)[Name] = IDCounter++; // Add a new element (*IDMap)[Name] = IDCounter++; // Add a new element
return AnnotationID(IDCounter-1); return AnnotationID(IDCounter-1);
} }
@ -85,6 +88,7 @@ AnnotationID AnnotationManager::getID(const char *Name, Factory Fact,
// only be used for debugging. // only be used for debugging.
// //
const char *AnnotationManager::getName(AnnotationID ID) { // ID -> Name const char *AnnotationManager::getName(AnnotationID ID) { // ID -> Name
sys::SmartScopedReader<true> Reader(&*AnnotationsLock);
IDMapType &TheMap = *IDMap; IDMapType &TheMap = *IDMap;
for (IDMapType::iterator I = TheMap.begin(); ; ++I) { for (IDMapType::iterator I = TheMap.begin(); ; ++I) {
assert(I != TheMap.end() && "Annotation ID is unknown!"); assert(I != TheMap.end() && "Annotation ID is unknown!");
@ -98,18 +102,26 @@ const char *AnnotationManager::getName(AnnotationID ID) { // ID -> Name
// //
void AnnotationManager::registerAnnotationFactory(AnnotationID ID, AnnFactory F, void AnnotationManager::registerAnnotationFactory(AnnotationID ID, AnnFactory F,
void *ExtraData) { void *ExtraData) {
if (F) if (F) {
sys::SmartScopedWriter<true> Writer(&*AnnotationsLock);
getFactMap()[ID.ID] = std::make_pair(F, ExtraData); getFactMap()[ID.ID] = std::make_pair(F, ExtraData);
else } else {
eraseFromFactMap(ID.ID); eraseFromFactMap(ID.ID);
} }
}
// createAnnotation - Create an annotation of the specified ID for the // createAnnotation - Create an annotation of the specified ID for the
// specified object, using a register annotation creation function. // specified object, using a register annotation creation function.
// //
Annotation *AnnotationManager::createAnnotation(AnnotationID ID, Annotation *AnnotationManager::createAnnotation(AnnotationID ID,
const Annotable *Obj) { const Annotable *Obj) {
AnnotationsLock->reader_acquire();
FactMapType::iterator I = getFactMap().find(ID.ID); FactMapType::iterator I = getFactMap().find(ID.ID);
if (I == getFactMap().end()) return 0; if (I == getFactMap().end()) {
AnnotationsLock->reader_release();
return 0;
}
AnnotationsLock->reader_release();
return I->second.first(ID, Obj, I->second.second); return I->second.first(ID, Obj, I->second.second);
} }