tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-04-07 20:25:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7124 from Icinga/bugfix/namespace-thread-safe

Browse Source 
Namespace: place ObjectLock in all methods
This commit is contained in:
Michael Friedrich 2019-04-26 08:26:59 +02:00 committed by GitHub
commit 3dc9927284
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/base/namespace.cpp
View File

@ -20,6 +20,8 @@ Namespace::Namespace(NamespaceBehavior *behavior)
Value Namespace::Get(const String& field) const
{
ObjectLock olock(this);
Value value;
if (!GetOwnField(field, &value))
BOOST_THROW_EXCEPTION(ScriptError("Namespace does not contain field '" + field + "'"));
@ -28,6 +30,8 @@ Value Namespace::Get(const String& field) const
bool Namespace::Get(const String& field, Value *value) const
{
ObjectLock olock(this);
auto nsVal = GetAttribute(field);
if (!nsVal)
@ -39,16 +43,22 @@ bool Namespace::Get(const String& field, Value *value) const
void Namespace::Set(const String& field, const Value& value, bool overrideFrozen)
{
ObjectLock olock(this);
return SetFieldByName(field, value, overrideFrozen, DebugInfo());
}
bool Namespace::Contains(const String& field) const
{
ObjectLock olock(this);
return HasOwnField(field);
}
void Namespace::Remove(const String& field, bool overrideFrozen)
{
ObjectLock olock(this);
m_Behavior->Remove(this, field, overrideFrozen);
}
@ -86,6 +96,8 @@ void Namespace::SetAttribute(const String& key, const std::shared_ptr<NamespaceV
Value Namespace::GetFieldByName(const String& field, bool, const DebugInfo& debugInfo) const
{
ObjectLock olock(this);
auto nsVal = GetAttribute(field);
if (nsVal)
@ -96,6 +108,8 @@ Value Namespace::GetFieldByName(const String& field, bool, const DebugInfo& debu
void Namespace::SetFieldByName(const String& field, const Value& value, bool overrideFrozen, const DebugInfo& debugInfo)
{
ObjectLock olock(this);
auto nsVal = GetAttribute(field);
if (!nsVal)
@ -106,11 +120,15 @@ void Namespace::SetFieldByName(const String& field, const Value& value, bool ove
bool Namespace::HasOwnField(const String& field) const
{
ObjectLock olock(this);
return GetAttribute(field) != nullptr;
}
bool Namespace::GetOwnField(const String& field, Value *result) const
{
ObjectLock olock(this);
auto nsVal = GetAttribute(field);
if (!nsVal)