diff options
| -rw-r--r-- | db/clientcursor.cpp | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/db/clientcursor.cpp b/db/clientcursor.cpp index e803afd459c..52f37cdd47d 100644 --- a/db/clientcursor.cpp +++ b/db/clientcursor.cpp @@ -457,7 +457,9 @@ namespace mongo { if ( yielded ) { *yielded = true; } - return yield( yieldSuggest() , rec ); + bool res = yield( yieldSuggest() , rec ); + _yieldSometimesTracker.resetLastTime(); + return res; } return true; } @@ -467,12 +469,16 @@ namespace mongo { if ( yielded ) { *yielded = true; } - return yield( micros , _recordForYield( need ) ); + bool res = yield( micros , _recordForYield( need ) ); + _yieldSometimesTracker.resetLastTime(); + return res; } return true; } void ClientCursor::staticYield( int micros , const StringData& ns , Record * rec ) { + bool haveReadLock = dbMutex.atLeastReadLocked() && ! dbMutex.isWriteLocked(); + killCurrentOp.checkForInterrupt( false ); { auto_ptr<RWLockRecursive::Shared> lk; @@ -481,10 +487,16 @@ namespace mongo { dbtempreleasecond unlock; if ( unlock.unlocked() ) { - if ( micros == -1 ) - micros = Client::recommendedYieldMicros(); - if ( micros > 0 ) - sleepmicros( micros ); + if ( haveReadLock ) { + // don't sleep with a read lock + } + else { + if ( micros == -1 ) + micros = Client::recommendedYieldMicros(); + if ( micros > 0 ) + sleepmicros( micros ); + } + } else { CurOp * c = cc().curop(); |