SERVER-9959: Fix SSL in Tools

Fix SSL by deferring initializers, after CLI parameter parsing.
Condense tools by merging all identical main functions into tool.cpp.
Track memory used by Tool in an auto_ptr

Signed-off-by: Matt Kangas <matt.kangas@10gen.com>

1 files changed, 4 insertions, 0 deletions

diff --git a/src/mongo/client/examples/mongoperf.cpp b/src/mongo/client/examples/mongoperf.cpp
index e535f187d59..8acfc40c21e 100644
--- a/src/mongo/client/examples/mongoperf.cpp
+++ b/src/mongo/client/examples/mongoperf.cpp
@@ -33,6 +33,7 @@
 #include <boost/thread/thread.hpp>
 
 #include "mongo/bson/util/atomic_int.h"
+#include "mongo/db/cmdline.h"
 #include "mongo/db/jsobj.h"
 #include "mongo/db/json.h"
 #include "mongo/util/logfile.h"
@@ -55,6 +56,9 @@ bo options;
 unsigned long long len; // file len
 const unsigned PG = 4096;
 unsigned nThreadsRunning = 0;
+namespace mongo {
+    CmdLine cmdLine;
+}
 
 // as this is incremented A LOT, at some point this becomes a bottleneck if very high ops/second (in cache) things are happening.
 AtomicUInt iops;