SERVER-14668 Move top-level locks (Global and Commit) to the Lock Manager

o Adds the global and flush lock resources and begin/end transaction calls
to delimit where lock acquisition would start and end.

o Gets rid of the QLock and changes durability to use a single flush
thread, which is activated when commit is requested.

1 files changed, 0 insertions, 39 deletions

diff --git a/src/mongo/dbtests/perftests.cpp b/src/mongo/dbtests/perftests.cpp
index 345505e5ffa..86deebe8ca7 100644
--- a/src/mongo/dbtests/perftests.cpp
+++ b/src/mongo/dbtests/perftests.cpp
@@ -54,7 +54,6 @@
 #include "mongo/util/allocator.h"
 #include "mongo/util/checksum.h"
 #include "mongo/util/compress.h"
-#include "mongo/util/concurrency/qlock.h"
 #include "mongo/util/fail_point.h"
 #include "mongo/util/log.h"
 #include "mongo/util/mmap.h"
@@ -630,42 +629,6 @@ namespace PerfTests {
         }
     };
 
-    QLock _qlock;
-
-    class qlock : public B {
-    public:
-        string name() { return "qlockr"; }
-        //virtual int howLongMillis() { return 500; }
-        virtual bool showDurStats() { return false; }
-        void timed() {
-            _qlock.lock_r();
-            _qlock.unlock_r();
-        }
-    };
-    class qlockw : public B {
-    public:
-        string name() { return "qlockw"; }
-        //virtual int howLongMillis() { return 500; }
-        virtual bool showDurStats() { return false; }
-        void timed() {
-            _qlock.lock_w();
-            _qlock.unlock_w();
-        }
-    };
-
-#if 0
-    class ulock : public B {
-    public:
-        string name() { return "ulock"; }
-        virtual int howLongMillis() { return 500; }
-        virtual bool showDurStats() { return false; }
-        void timed() {
-            lk.lockAsUpgradable();
-            lk.unlockFromUpgradable();
-        }
-    };
-#endif
-
     class CTM : public B {
     public:
         CTM() : last(0), delts(0), n(0) { }
@@ -1376,8 +1339,6 @@ namespace PerfTests {
 #endif
                 add< rlock >();
                 add< wlock >();
-                add< qlock >();
-                add< qlockw >();
                 add< NotifyOne >();
                 add< mutexspeed >();
                 add< simplemutexspeed >();