diff options
Diffstat (limited to 'slobrok/src/tests/oldapi')
-rw-r--r-- | slobrok/src/tests/oldapi/mirror.cpp | 12 | ||||
-rw-r--r-- | slobrok/src/tests/oldapi/mirror.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/slobrok/src/tests/oldapi/mirror.cpp b/slobrok/src/tests/oldapi/mirror.cpp index e0904fe3a00..2004620d57b 100644 --- a/slobrok/src/tests/oldapi/mirror.cpp +++ b/slobrok/src/tests/oldapi/mirror.cpp @@ -54,14 +54,13 @@ MirrorOld::SpecList MirrorOld::lookup(const std::string & pattern) const { SpecList ret; - _lock.Lock(); + std::lock_guard<std::mutex> guard(_lock); SpecList::const_iterator end = _specs.end(); for (SpecList::const_iterator it = _specs.begin(); it != end; ++it) { if (match(it->first.c_str(), pattern.c_str())) { ret.push_back(*it); } } - _lock.Unlock(); return ret; } @@ -119,10 +118,11 @@ MirrorOld::PerformTask() std::string(s[idx]._str))); } - _lock.Lock(); - std::swap(specs, _specs); - _updates.add(); - _lock.Unlock(); + { + std::lock_guard<std::mutex> guard(_lock); + std::swap(specs, _specs); + _updates.add(); + } _specsGen.setFromInt(answer[2]._intval32); } _backOff.reset(); diff --git a/slobrok/src/tests/oldapi/mirror.h b/slobrok/src/tests/oldapi/mirror.h index de680641c89..fb150b5d64f 100644 --- a/slobrok/src/tests/oldapi/mirror.h +++ b/slobrok/src/tests/oldapi/mirror.h @@ -111,7 +111,7 @@ private: void RequestDone(FRT_RPCRequest *req) override; FRT_Supervisor &_orb; - mutable FastOS_Mutex _lock; + mutable std::mutex _lock; bool _reqDone; SpecList _specs; vespalib::GenCnt _specsGen; |