changed plugins::loader to be initialized after main #527

Because Loader's constructor calls functions in boost::filesystem, and those functions aren't safe to call before main(), we need to create the global Loader instance in a MONGO_INITIALIZER.
Tokutek · Sep 23, 2013 · a0117ac · a0117ac
1 parent e24e47c
commit a0117ac
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 12 deletions.
diff --git a/src/mongo/db/db.cpp b/src/mongo/db/db.cpp
@@ -367,9 +367,9 @@ namespace mongo {
  srand((unsigned) (curTimeMicros() ^ startupSrandTimer.micros()));
 
  if (!cmdLine.pluginsDir.empty()) {
- plugins::loader.setPluginsDir(cmdLine.pluginsDir);
+ plugins::loader->setPluginsDir(cmdLine.pluginsDir);
  }
- plugins::loader.autoload(cmdLine.plugins);
+ plugins::loader->autoload(cmdLine.plugins);
 
  snapshotThread.go();
  d.clientCursorMonitor.go();

diff --git a/src/mongo/db/instance.cpp b/src/mongo/db/instance.cpp
@@ -1087,7 +1087,7 @@ namespace mongo {
  log() << "shutdown: going to close databases..." << endl;
  dbHolderW().closeDatabases(dbpath);
  log() << "shutdown: going to unload all plugins..." << endl;
- plugins::loader.shutdown();
+ plugins::loader->shutdown();
  log() << "shutdown: going to shutdown TokuMX..." << endl;
  storage::shutdown();
  }

diff --git a/src/mongo/plugins/commands.cpp b/src/mongo/plugins/commands.cpp
@@ -77,7 +77,7 @@ namespace mongo {
  }
  checksum = cksumElt.Stringdata();
  }
- return plugins::loader.load(filename, checksum, errmsg, result);
+ return plugins::loader->load(filename, checksum, errmsg, result);
  }
  } loadPluginCommand;
 
@@ -105,7 +105,7 @@ namespace mongo {
  ListPluginsCommand() : InformationCommand("listPlugins") {}
 
  virtual bool run(const string &db, BSONObj &cmdObj, int options, string &errmsg, BSONObjBuilder &result, bool fromRepl) {
- return plugins::loader.list(errmsg, result);
+ return plugins::loader->list(errmsg, result);
  }
  } listPluginsCommand;
 
@@ -143,7 +143,7 @@ namespace mongo {
  errmsg = "unloadPlugin argument must not be empty";
  return false;
  }
- return plugins::loader.unload(name, errmsg, result);
+ return plugins::loader->unload(name, errmsg, result);
  }
  } unloadPluginCommand;
 

diff --git a/src/mongo/plugins/loader.cpp b/src/mongo/plugins/loader.cpp
@@ -29,6 +29,8 @@
 
 #include <boost/filesystem.hpp>
 
+#include "mongo/base/init.h"
+#include "mongo/base/status.h"
 #include "mongo/base/string_data.h"
 #include "mongo/db/jsobj.h"
 #include "mongo/plugins/dl.h"
@@ -347,11 +349,19 @@ namespace mongo {
 
  fs::path Loader::defaultPluginsDir() {
  ProcessInfo p;
- fs::path exePath(p.getExePath());
+ fs::path exePath = p.getExePath();
  return exePath.parent_path().parent_path() / "lib64" / "plugins";
  }
 
- Loader loader;
+ Loader *loader;
+
+ namespace {
+ MONGO_INITIALIZER(CreatePluginLoader)(InitializerContext* context) {
+ // intentionally leaked
+ loader = new Loader;
+ return Status::OK();
+ }
+ } // namespace
 
  } // namespace plugins
 

diff --git a/src/mongo/plugins/loader.h b/src/mongo/plugins/loader.h
@@ -72,7 +72,7 @@ namespace mongo {
  void shutdown();
  };
 
- extern Loader loader;
+ extern Loader *loader;
 
  } // namespace plugins
 

diff --git a/src/mongo/s/server.cpp b/src/mongo/s/server.cpp
@@ -311,9 +311,9 @@ static bool runMongosServer( bool doUpgrade ) {
  init();
 
  if (!cmdLine.pluginsDir.empty()) {
- plugins::loader.setPluginsDir(cmdLine.pluginsDir);
+ plugins::loader->setPluginsDir(cmdLine.pluginsDir);
  }
- plugins::loader.autoload(cmdLine.plugins);
+ plugins::loader->autoload(cmdLine.plugins);
 
 #if !defined(_WIN32)
  CmdLine::launchOk();
@@ -567,7 +567,7 @@ int main(int argc, char* argv[], char** envp) {
 
 void mongo::exitCleanly( ExitCode code ) {
  // TODO: do we need to add anything?
- plugins::loader.shutdown();
+ plugins::loader->shutdown();
  mongo::dbexit( code );
 }