llvm/module.modulemap: AVR.def should be textual header.

[oota-llvm.git] / lib / Support / PluginLoader.cpp

diff --git a/lib/Support/PluginLoader.cpp b/lib/Support/PluginLoader.cpp
index 94cbec3a933327095047cc365a6d0c4f351fcbe1..358137f08f5f86fbb1eecc9adf2ecfff905b1927 100644 (file)
--- a/lib/Support/PluginLoader.cpp
+++ b/lib/Support/PluginLoader.cpp
@@ -2,8 +2,8 @@
 //
 //                     The LLVM Compiler Infrastructure
 //
-// This file was developed by the LLVM research group and is distributed under
-// the University of Illinois Open Source License. See LICENSE.TXT for details.
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
@@ -13,45 +13,35 @@
 
 #define DONT_GET_PLUGIN_LOADER_OPTION
 #include "llvm/Support/PluginLoader.h"
-#include "llvm/System/DynamicLibrary.h"
-#include <iostream>
+#include "llvm/Support/DynamicLibrary.h"
+#include "llvm/Support/ManagedStatic.h"
+#include "llvm/Support/Mutex.h"
+#include "llvm/Support/raw_ostream.h"
 #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) {
-  std::string ErrorMessage;
-
-  if (!plugins)
-    plugins = new std::vector<std::string>();
-
-  try {
-    sys::DynamicLibrary::LoadLibraryPermanently(Filename.c_str());
-    plugins->push_back(Filename);
-  } catch (const std::string& errmsg) {
-    if (errmsg.empty()) {
-      ErrorMessage = "Unknown";
-    } else {
-      ErrorMessage = errmsg;
-    }
+  sys::SmartScopedLock<true> Lock(*PluginsLock);
+  std::string Error;
+  if (sys::DynamicLibrary::LoadLibraryPermanently(Filename.c_str(), &Error)) {
+    errs() << "Error opening '" << Filename << "': " << Error
+           << "\n  -load request ignored.\n";
+  } else {
+    Plugins->push_back(Filename);
   }
-  if (!ErrorMessage.empty())
-    std::cerr << "Error opening '" << Filename << "': " << ErrorMessage
-              << "\n  -load request ignored.\n";
 }
 
-unsigned PluginLoader::getNumPlugins()
-{
-  if(plugins)
-    return plugins->size();
-  else 
-    return 0;
+unsigned PluginLoader::getNumPlugins() {
+  sys::SmartScopedLock<true> Lock(*PluginsLock);
+  return Plugins.isConstructed() ? Plugins->size() : 0;
 }
 
-std::string& PluginLoader::getPlugin(unsigned num)
-{
-  assert(plugins && num < plugins->size() && "Asking for an out of bounds plugin");
-  return (*plugins)[num];
+std::string &PluginLoader::getPlugin(unsigned num) {
+  sys::SmartScopedLock<true> Lock(*PluginsLock);
+  assert(Plugins.isConstructed() && num < Plugins->size() &&
+         "Asking for an out of bounds plugin");
+  return (*Plugins)[num];
 }