From 86af56ebd898d3ebcea90ea43a9be21d99aa294c Mon Sep 17 00:00:00 2001
From: dwight <dwight@10gen.com>
Date: Tue, 4 Jan 2011 23:03:19 -0500
Subject: using more threads the test fails on widnows

---
 dbtests/threadedtests.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'dbtests')

diff --git a/dbtests/threadedtests.cpp b/dbtests/threadedtests.cpp
index 7f78dc90122..8eeec6b7f45 100644
--- a/dbtests/threadedtests.cpp
+++ b/dbtests/threadedtests.cpp
@@ -57,7 +57,7 @@ namespace ThreadedTests {
         }
     };
 
-    class MongoMutexTest : public ThreadedTest<> { 
+    class MongoMutexTest : public ThreadedTest<135> { 
         enum { N = 100000 };
         MongoMutex *mm;
         virtual void setup() { 
-- 
cgit v1.2.1


From 19f1a2c184c16c950de48489d3ada5f5675bd3c3 Mon Sep 17 00:00:00 2001
From: Eliot Horowitz <eliot@10gen.com>
Date: Wed, 5 Jan 2011 00:32:30 -0500
Subject: astyle

---
 dbtests/threadedtests.cpp | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'dbtests')

diff --git a/dbtests/threadedtests.cpp b/dbtests/threadedtests.cpp
index 8eeec6b7f45..bf0c96f199a 100644
--- a/dbtests/threadedtests.cpp
+++ b/dbtests/threadedtests.cpp
@@ -57,64 +57,64 @@ namespace ThreadedTests {
         }
     };
 
-    class MongoMutexTest : public ThreadedTest<135> { 
+    class MongoMutexTest : public ThreadedTest<135> {
         enum { N = 100000 };
         MongoMutex *mm;
-        virtual void setup() { 
+        virtual void setup() {
             mm = new MongoMutex("MongoMutexTest");
         }
-        virtual void subthread() { 
+        virtual void subthread() {
             Client::initThread("mongomutextest");
             sleepmillis(0);
-            for( int i = 0; i < N; i++ ) { 
-                if( i % 20000 == 0 ) 
+            for( int i = 0; i < N; i++ ) {
+                if( i % 20000 == 0 )
                     log() << i << endl;
-                if( i % 7 == 0 ) { 
+                if( i % 7 == 0 ) {
                     mm->lock_shared();
                     mm->lock_shared();
                     mm->unlock_shared();
                     mm->unlock_shared();
                 }
-                else if( i % 7 == 1 ) { 
+                else if( i % 7 == 1 ) {
                     mm->lock_shared();
                     ASSERT( mm->atLeastReadLocked() );
                     mm->unlock_shared();
                 }
-                else if( i % 7 == 2 ) { 
+                else if( i % 7 == 2 ) {
                     mm->lock();
                     ASSERT( mm->isWriteLocked() );
                     mm->unlock();
                 }
-                else if( i % 7 == 3 ) { 
+                else if( i % 7 == 3 ) {
                     mm->lock();
                     mm->lock_shared();
                     ASSERT( mm->isWriteLocked() );
                     mm->unlock_shared();
                     mm->unlock();
                 }
-                else if( i % 7 == 4 ) { 
+                else if( i % 7 == 4 ) {
                     mm->lock();
                     mm->releaseEarly();
                     mm->unlock();
                 }
-                else if( i % 7 == 5 ) { 
-                    if( mm->lock_try(1) ) { 
+                else if( i % 7 == 5 ) {
+                    if( mm->lock_try(1) ) {
                         mm->unlock();
                     }
                 }
-                else if( i % 7 == 6 ) { 
-                    if( mm->lock_shared_try(0) ) { 
+                else if( i % 7 == 6 ) {
+                    if( mm->lock_shared_try(0) ) {
                         mm->unlock_shared();
                     }
                 }
-                else { 
+                else {
                     mm->lock_shared();
                     mm->unlock_shared();
                 }
             }
             cc().shutdown();
         }
-        virtual void validate() { 
+        virtual void validate() {
             ASSERT( !mm->atLeastReadLocked() );
             mm->lock();
             mm->unlock();
-- 
cgit v1.2.1


From fa7f1a3ca99de67a0f094be3418af91ff8a270d2 Mon Sep 17 00:00:00 2001
From: dwight <dwight@10gen.com>
Date: Wed, 5 Jan 2011 00:43:04 -0500
Subject: merge

---
 dbtests/threadedtests.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'dbtests')

diff --git a/dbtests/threadedtests.cpp b/dbtests/threadedtests.cpp
index bf0c96f199a..0cffe2a2afa 100644
--- a/dbtests/threadedtests.cpp
+++ b/dbtests/threadedtests.cpp
@@ -57,8 +57,8 @@ namespace ThreadedTests {
         }
     };
 
-    class MongoMutexTest : public ThreadedTest<135> {
-        enum { N = 100000 };
+    class MongoMutexTest : public ThreadedTest<135> { 
+        enum { N = 80000 };
         MongoMutex *mm;
         virtual void setup() {
             mm = new MongoMutex("MongoMutexTest");
-- 
cgit v1.2.1