mirrors/mongodb
mirrors/mongodb
0
0
Fork 0
mirror of https://github.com/mongodb/mongo.git synced 2024-11-30 09:06:21 +01:00
Code Issues Releases Activity

rename function and call with lock still held

Browse Source
This commit is contained in:
Mathias Stearn 2010-12-16 16:34:05 -05:00
parent dce63e952c
commit 7740e42328
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/dur.cpp
View File

@ -514,7 +514,7 @@ namespace mongo {
void unlinkThread();
void recover();
void _debugCheckLastDeclaredWrite() {
void releasingWriteLock() {
#if defined(_DEBUG)
getDur().debugCheckLastDeclaredWrite();
#endif

12
db/mongomutex.h
View File

@ -88,6 +88,7 @@ namespace mongo {
// un write lock
void unlock() {
_releasingWriteLock();
int s = _state.get();
if( s > 1 ) {
_state.set(s-1); // recursive lock case
@ -103,7 +104,6 @@ namespace mongo {
MongoFile::unmarkAllWritable(); // _DEBUG validation
_state.set(0);
_minfo.leaving();
_releasedWriteLock();
_m.unlock();
}
@ -177,7 +177,7 @@ namespace mongo {
private:
void _acquiredWriteLock();
void _releasedWriteLock();
void _releasingWriteLock();
/* @return true if was already write locked. increments recursive lock count. */
bool _writeLockedAlready();
@ -211,14 +211,12 @@ namespace mongo {
namespace dur {
void REMAPPRIVATEVIEW();
void _debugCheckLastDeclaredWrite(); // because it's hard to include dur.h here
void releasingWriteLock(); // because it's hard to include dur.h here
}
inline void MongoMutex::_releasedWriteLock() {
#if defined(_DEBUG)
inline void MongoMutex::_releasingWriteLock() {
if (this == &dbMutex)
dur::_debugCheckLastDeclaredWrite();
#endif
dur::releasingWriteLock();
}
inline void MongoMutex::_acquiredWriteLock() {