projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Minor cleanup related to my latest scheduler changes.
[oota-llvm.git]
/
lib
/
Support
/
PluginLoader.cpp
diff --git
a/lib/Support/PluginLoader.cpp
b/lib/Support/PluginLoader.cpp
index 0635a9d52ca375eae3174ad84e43f19d5504db51..2924cfa38897225d257100c1763de32822c42d5b 100644
(file)
--- a/
lib/Support/PluginLoader.cpp
+++ b/
lib/Support/PluginLoader.cpp
@@
-12,33
+12,36
@@
//===----------------------------------------------------------------------===//
#define DONT_GET_PLUGIN_LOADER_OPTION
//===----------------------------------------------------------------------===//
#define DONT_GET_PLUGIN_LOADER_OPTION
+#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/PluginLoader.h"
#include "llvm/Support/PluginLoader.h"
-#include "llvm/Support/
Streams
.h"
-#include "llvm/S
ystem
/DynamicLibrary.h"
-#include
<ostream>
+#include "llvm/Support/
raw_ostream
.h"
+#include "llvm/S
upport
/DynamicLibrary.h"
+#include
"llvm/Support/Mutex.h"
#include <vector>
using namespace llvm;
#include <vector>
using namespace llvm;
-static std::vector<std::string> *Plugins;
+static ManagedStatic<std::vector<std::string> > Plugins;
+static ManagedStatic<sys::SmartMutex<true> > PluginsLock;
void PluginLoader::operator=(const std::string &Filename) {
void PluginLoader::operator=(const std::string &Filename) {
- if (!Plugins)
- Plugins = new std::vector<std::string>();
-
+ sys::SmartScopedLock<true> Lock(*PluginsLock);
std::string Error;
if (sys::DynamicLibrary::LoadLibraryPermanently(Filename.c_str(), &Error)) {
std::string Error;
if (sys::DynamicLibrary::LoadLibraryPermanently(Filename.c_str(), &Error)) {
-
cerr
<< "Error opening '" << Filename << "': " << Error
- << "\n -load request ignored.\n";
+
errs()
<< "Error opening '" << Filename << "': " << Error
+
<< "\n -load request ignored.\n";
} else {
Plugins->push_back(Filename);
}
}
unsigned PluginLoader::getNumPlugins() {
} else {
Plugins->push_back(Filename);
}
}
unsigned PluginLoader::getNumPlugins() {
- return Plugins ? Plugins->size() : 0;
+ sys::SmartScopedLock<true> Lock(*PluginsLock);
+ return Plugins.isConstructed() ? Plugins->size() : 0;
}
std::string &PluginLoader::getPlugin(unsigned num) {
}
std::string &PluginLoader::getPlugin(unsigned num) {
- assert(Plugins && num < Plugins->size() && "Asking for an out of bounds plugin");
+ sys::SmartScopedLock<true> Lock(*PluginsLock);
+ assert(Plugins.isConstructed() && num < Plugins->size() &&
+ "Asking for an out of bounds plugin");
return (*Plugins)[num];
}
return (*Plugins)[num];
}