diff options
author | Andy Schwerin <schwerin@mongodb.com> | 2015-03-04 10:30:44 -0500 |
---|---|---|
committer | Andy Schwerin <schwerin@mongodb.com> | 2015-03-05 17:35:14 -0500 |
commit | 59a9a04651486763b49ddb706a195bebccf76642 (patch) | |
tree | 335fa6d0cbc04f2c3577d2e4594e9a573f2b4594 /src/mongo/db/background.cpp | |
parent | ac525a4566a46b6b79a8465903b2ab0391eab506 (diff) | |
download | mongo-59a9a04651486763b49ddb706a195bebccf76642.tar.gz |
SERVER-17310 Replace boost::*_mutex::scoped_lock with boost::lock_guard.
Achieved via grep, sed and bash:
grep -Irl mutex::scoped_lock src/mongo | xargs sed -i.orig -E 's/(boost::(recursive_|timed_)?)mutex::scoped_lock/boost::lock_guard<\1mutex>/'
Then, by converting boost::lock_guard to boost::unique_lock as appropriate.
Finally, by removing unused mongo::mutex::try_lock.
Diffstat (limited to 'src/mongo/db/background.cpp')
-rw-r--r-- | src/mongo/db/background.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mongo/db/background.cpp b/src/mongo/db/background.cpp index 56336acd4ae..6c859d5d700 100644 --- a/src/mongo/db/background.cpp +++ b/src/mongo/db/background.cpp @@ -119,12 +119,12 @@ namespace { } // namespace bool BackgroundOperation::inProgForDb(StringData db) { - boost::mutex::scoped_lock lk(m); + boost::lock_guard<boost::mutex> lk(m); return dbsInProg.find(db) != dbsInProg.end(); } bool BackgroundOperation::inProgForNs(StringData ns) { - boost::mutex::scoped_lock lk(m); + boost::lock_guard<boost::mutex> lk(m); return nsInProg.find(ns) != nsInProg.end(); } @@ -153,19 +153,19 @@ namespace { } BackgroundOperation::BackgroundOperation(StringData ns) : _ns(ns) { - boost::mutex::scoped_lock lk(m); + boost::lock_guard<boost::mutex> lk(m); recordBeginAndInsert(&dbsInProg, _ns.db()); recordBeginAndInsert(&nsInProg, _ns.ns()); } BackgroundOperation::~BackgroundOperation() { - boost::mutex::scoped_lock lk(m); + boost::lock_guard<boost::mutex> lk(m); recordEndAndRemove(&dbsInProg, _ns.db()); recordEndAndRemove(&nsInProg, _ns.ns()); } void BackgroundOperation::dump(std::ostream& ss) { - boost::mutex::scoped_lock lk(m); + boost::lock_guard<boost::mutex> lk(m); if( nsInProg.size() ) { ss << "\n<b>Background Jobs in Progress</b>\n"; for( BgInfoMapIterator i = nsInProg.begin(); i != nsInProg.end(); ++i ) |