SERVER-14668 Remove d_globals.h/.cpp

They were only used for ClientCursorMonitor startup, so I moved this to be
a singleton task.

1 files changed, 27 insertions, 14 deletions

diff --git a/src/mongo/db/clientcursor.cpp b/src/mongo/db/clientcursor.cpp
index df7d55f419b..c005376730f 100644
--- a/src/mongo/db/clientcursor.cpp
+++ b/src/mongo/db/clientcursor.cpp
@@ -222,23 +222,32 @@ namespace mongo {
     // ClientCursorMonitor
     //
 
-    void ClientCursorMonitor::run() {
-        Client::initThread("clientcursormon");
-        Client& client = cc();
-        Timer t;
-        const int Secs = 4;
-        while (!inShutdown()) {
-            OperationContextImpl txn;
-            cursorStatsTimedOut.increment(
-                        CollectionCursorCache::timeoutCursorsGlobal(&txn, t.millisReset()));
-            sleepsecs(Secs);
+    /**
+     * Thread for timing out old cursors
+     */
+    class ClientCursorMonitor : public BackgroundJob {
+    public:
+        std::string name() const { return "ClientCursorMonitor"; }
+
+        void run() {
+            Client::initThread("clientcursormon");
+            Client& client = cc();
+            Timer t;
+            const int Secs = 4;
+            while (!inShutdown()) {
+                OperationContextImpl txn;
+                cursorStatsTimedOut.increment(
+                    CollectionCursorCache::timeoutCursorsGlobal(&txn, t.millisReset()));
+                sleepsecs(Secs);
+            }
+            client.shutdown();
         }
-        client.shutdown();
-    }
+    };
 
     namespace {
-        ClientCursorMonitor clientCursorMonitor;
-        
+        // Only one instance of the ClientCursorMonitor exists
+        ClientCursorMonitor clientCursorMonitor = ClientCursorMonitor();
+
         void _appendCursorStats( BSONObjBuilder& b ) {
             b.append( "note" , "deprecated, use server status metrics" );
             b.appendNumber("clientCursors_size", cursorStatsOpen.get() );
@@ -249,6 +258,10 @@ namespace mongo {
         }
     }
 
+    void startClientCursorMonitor() {
+        clientCursorMonitor.go();
+    }
+
     // QUESTION: Restrict to the namespace from which this command was issued?
     // Alternatively, make this command admin-only?
     // TODO: remove this for 2.8