tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use a shared_mutex for read `Dictionary` operations 

This allows multiple parallel read operations resulting
in a overall speedup on systems with many cores.
This commit is contained in:
Alexander A. Klimov 2023-02-10 11:31:51 +01:00
parent 24b57f0d3a
commit ca547d0292
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/base/dictionary.cpp
View File

@ -37,7 +37,7 @@ Dictionary::Dictionary(std::initializer_list<Dictionary::Pair> init)
*/ */
Value Dictionary::Get(const String& key) const Value Dictionary::Get(const String& key) const
{ {
ObjectLock olock(this); std::shared_lock<std::shared_timed_mutex> lock (m_DataMutex);
auto it = m_Data.find(key); auto it = m_Data.find(key);
@ -56,7 +56,7 @@ Value Dictionary::Get(const String& key) const
*/ */
bool Dictionary::Get(const String& key, Value *result) const bool Dictionary::Get(const String& key, Value *result) const
{ {
ObjectLock olock(this); std::shared_lock<std::shared_timed_mutex> lock (m_DataMutex);
auto it = m_Data.find(key); auto it = m_Data.find(key);
@ -77,6 +77,7 @@ bool Dictionary::Get(const String& key, Value *result) const
void Dictionary::Set(const String& key, Value value, bool overrideFrozen) void Dictionary::Set(const String& key, Value value, bool overrideFrozen)
{ {
ObjectLock olock(this); ObjectLock olock(this);
std::unique_lock<std::shared_timed_mutex> lock (m_DataMutex);
if (m_Frozen && !overrideFrozen) if (m_Frozen && !overrideFrozen)
BOOST_THROW_EXCEPTION(std::invalid_argument("Value in dictionary must not be modified.")); BOOST_THROW_EXCEPTION(std::invalid_argument("Value in dictionary must not be modified."));
@ -91,7 +92,7 @@ void Dictionary::Set(const String& key, Value value, bool overrideFrozen)
*/ */
size_t Dictionary::GetLength() const size_t Dictionary::GetLength() const
{ {
ObjectLock olock(this); std::shared_lock<std::shared_timed_mutex> lock (m_DataMutex);
return m_Data.size(); return m_Data.size();
} }
@ -104,7 +105,7 @@ size_t Dictionary::GetLength() const
*/ */
bool Dictionary::Contains(const String& key) const bool Dictionary::Contains(const String& key) const
{ {
ObjectLock olock(this); std::shared_lock<std::shared_timed_mutex> lock (m_DataMutex);
return (m_Data.find(key) != m_Data.end()); return (m_Data.find(key) != m_Data.end());
} }
@ -146,6 +147,7 @@ Dictionary::Iterator Dictionary::End()
void Dictionary::Remove(Dictionary::Iterator it, bool overrideFrozen) void Dictionary::Remove(Dictionary::Iterator it, bool overrideFrozen)
{ {
ASSERT(OwnsLock()); ASSERT(OwnsLock());
std::unique_lock<std::shared_timed_mutex> lock (m_DataMutex);
if (m_Frozen && !overrideFrozen) if (m_Frozen && !overrideFrozen)
BOOST_THROW_EXCEPTION(std::invalid_argument("Dictionary must not be modified.")); BOOST_THROW_EXCEPTION(std::invalid_argument("Dictionary must not be modified."));
@ -162,6 +164,7 @@ void Dictionary::Remove(Dictionary::Iterator it, bool overrideFrozen)
void Dictionary::Remove(const String& key, bool overrideFrozen) void Dictionary::Remove(const String& key, bool overrideFrozen)
{ {
ObjectLock olock(this); ObjectLock olock(this);
std::unique_lock<std::shared_timed_mutex> lock (m_DataMutex);
if (m_Frozen && !overrideFrozen) if (m_Frozen && !overrideFrozen)
BOOST_THROW_EXCEPTION(std::invalid_argument("Dictionary must not be modified.")); BOOST_THROW_EXCEPTION(std::invalid_argument("Dictionary must not be modified."));
@ -183,6 +186,7 @@ void Dictionary::Remove(const String& key, bool overrideFrozen)
void Dictionary::Clear(bool overrideFrozen) void Dictionary::Clear(bool overrideFrozen)
{ {
ObjectLock olock(this); ObjectLock olock(this);
std::unique_lock<std::shared_timed_mutex> lock (m_DataMutex);
if (m_Frozen && !overrideFrozen) if (m_Frozen && !overrideFrozen)
BOOST_THROW_EXCEPTION(std::invalid_argument("Dictionary must not be modified.")); BOOST_THROW_EXCEPTION(std::invalid_argument("Dictionary must not be modified."));
@ -192,7 +196,7 @@ void Dictionary::Clear(bool overrideFrozen)
void Dictionary::CopyTo(const Dictionary::Ptr& dest) const void Dictionary::CopyTo(const Dictionary::Ptr& dest) const
{ {
ObjectLock olock(this); std::shared_lock<std::shared_timed_mutex> lock (m_DataMutex);
for (const Dictionary::Pair& kv : m_Data) { for (const Dictionary::Pair& kv : m_Data) {
dest->Set(kv.first, kv.second); dest->Set(kv.first, kv.second);
@ -222,7 +226,7 @@ Object::Ptr Dictionary::Clone() const
DictionaryData dict; DictionaryData dict;
{ {
ObjectLock olock(this); std::shared_lock<std::shared_timed_mutex> lock (m_DataMutex);
dict.reserve(GetLength()); dict.reserve(GetLength());
@ -242,7 +246,7 @@ Object::Ptr Dictionary::Clone() const
*/ */
std::vector<String> Dictionary::GetKeys() const std::vector<String> Dictionary::GetKeys() const
{ {
ObjectLock olock(this); std::shared_lock<std::shared_timed_mutex> lock (m_DataMutex);
std::vector<String> keys; std::vector<String> keys;

2
lib/base/dictionary.hpp
View File

@ -8,6 +8,7 @@
#include "base/value.hpp" #include "base/value.hpp"
#include <boost/range/iterator.hpp> #include <boost/range/iterator.hpp>
#include <map> #include <map>
#include <shared_mutex>
#include <vector> #include <vector>
namespace icinga namespace icinga
@ -75,6 +76,7 @@ public:
private: private:
std::map<String, Value> m_Data; /**< The data for the dictionary. */ std::map<String, Value> m_Data; /**< The data for the dictionary. */
mutable std::shared_timed_mutex m_DataMutex;
bool m_Frozen{false}; bool m_Frozen{false};
}; };