diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-10-08 08:13:01 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2020-10-08 08:15:49 +0000 |
commit | 089e0ecd9d91930dbe7d000b57763f5a77e9af9d (patch) | |
tree | f8960a04093407193a702cdfd312dd1b9db9da87 /streamingvisitors | |
parent | 4291a9ec03e9b5b7c23473725678b3c0785cbf91 (diff) |
Use vespalib::Lock -> std::mutex
Diffstat (limited to 'streamingvisitors')
-rw-r--r-- | streamingvisitors/src/vespa/searchvisitor/searchenvironment.cpp | 6 | ||||
-rw-r--r-- | streamingvisitors/src/vespa/searchvisitor/searchenvironment.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/streamingvisitors/src/vespa/searchvisitor/searchenvironment.cpp b/streamingvisitors/src/vespa/searchvisitor/searchenvironment.cpp index 107a1b44208..614d11aabfa 100644 --- a/streamingvisitors/src/vespa/searchvisitor/searchenvironment.cpp +++ b/streamingvisitors/src/vespa/searchvisitor/searchenvironment.cpp @@ -57,7 +57,7 @@ SearchEnvironment::SearchEnvironment(const config::ConfigUri & configUri) : SearchEnvironment::~SearchEnvironment() { - vespalib::LockGuard guard(_lock); + std::lock_guard guard(_lock); _threadLocals.clear(); } @@ -68,12 +68,12 @@ SearchEnvironment::getEnv(const vespalib::string & searchCluster) if (_localEnvMap == nullptr) { EnvMapUP envMap = std::make_unique<EnvMap>(); _localEnvMap = envMap.get(); - vespalib::LockGuard guard(_lock); + std::lock_guard guard(_lock); _threadLocals.emplace_back(std::move(envMap)); } EnvMap::iterator localFound = _localEnvMap->find(searchCluster); if (localFound == _localEnvMap->end()) { - vespalib::LockGuard guard(_lock); + std::lock_guard guard(_lock); EnvMap::iterator found = _envMap.find(searchCluster); if (found == _envMap.end()) { LOG(debug, "Init VSMAdapter with config id = '%s'", searchCluster.c_str()); diff --git a/streamingvisitors/src/vespa/searchvisitor/searchenvironment.h b/streamingvisitors/src/vespa/searchvisitor/searchenvironment.h index 126b8370105..3dce03e9402 100644 --- a/streamingvisitors/src/vespa/searchvisitor/searchenvironment.h +++ b/streamingvisitors/src/vespa/searchvisitor/searchenvironment.h @@ -19,7 +19,7 @@ private: public: typedef std::shared_ptr<Env> SP; Env(const vespalib::string & muffens, const config::ConfigUri & configUri, Fast_NormalizeWordFolder & wf); - ~Env(); + ~Env() override; const vsm::VSMAdapter * getVSMAdapter() const { return _vsmAdapter.get(); } const RankManager * getRankManager() const { return _rankManager.get(); } void configure(const config::ConfigSnapshot & snapshot) override; @@ -38,7 +38,7 @@ private: static __thread EnvMap * _localEnvMap; EnvMap _envMap; ThreadLocals _threadLocals; - vespalib::Lock _lock; + std::mutex _lock; Fast_NormalizeWordFolder _wordFolder; config::ConfigUri _configUri; |