Cache actual Logger#object_filter objects in Logger#m_ObjectFilterCache

Icinga · Aug 15, 2023 · 27413d5 · 27413d5
1 parent 9693663
commit 27413d5
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 15 deletions.
diff --git a/lib/base/logger.cpp b/lib/base/logger.cpp
@@ -65,14 +65,14 @@ void Logger::Start(bool runtimeCreated)
 void Logger::SetObjectFilter(const Dictionary::Ptr& value, bool suppress_events, const Value& cookie)
 {
 	ObjectImpl<Logger>::SetObjectFilter(value, suppress_events, cookie);
-	CheckObjectFilter();
+	UpdateCheckObjectFilterCache();
 }
 
 void Logger::OnAllConfigLoaded()
 {
 	ObjectImpl<Logger>::OnAllConfigLoaded();
 	m_CalledOnAllConfigLoaded.store(true);
-	CheckObjectFilter();
+	UpdateCheckObjectFilterCache();
 }
 
 void Logger::Stop(bool runtimeRemoved)
@@ -297,7 +297,7 @@ void Logger::UpdateMinLogSeverity()
 	m_MinLogSeverity.store(result);
 }
 
-void Logger::CheckObjectFilter()
+void Logger::UpdateCheckObjectFilterCache()
 {
 	if (!m_CalledOnAllConfigLoaded.load()) {
 		return;
@@ -306,27 +306,43 @@ void Logger::CheckObjectFilter()
 	auto filter (GetObjectFilter());
 
 	if (!filter) {
+		ObjectLock lock (this);
+		m_ObjectFilterCache.clear();
 		return;
 	}
 
-	ObjectLock lock (filter);
+	std::vector<ConfigObject*> allObjects;
 
-	for (auto& kv : filter) {
-		auto type (Type::GetByName(kv.first));
-		auto ctype (dynamic_cast<ConfigType*>(type.get()));
-		Array::Ptr objects = kv.second;
+	{
+		ObjectLock lock (filter);
+
+		for (auto& kv : filter) {
+			auto type (Type::GetByName(kv.first));
+			auto ctype (dynamic_cast<ConfigType*>(type.get()));
+			Array::Ptr objects = kv.second;
 
-		if (ctype && objects) {
-			ObjectLock lock (objects);
+			if (ctype && objects) {
+				ObjectLock lock (objects);
+
+				for (String name : objects) {
+					auto object (ctype->GetObject(name));
 
-			for (String object : objects) {
-				if (!ctype->GetObject(object)) {
-					Log(LogWarning, GetReflectionType()->GetName())
-						<< "Missing " << kv.first << " '" << object << "' in object filter of '" << GetName() << "'.";
+					if (object) {
+						allObjects.emplace_back(object.get());
+					} else {
+						Log(LogWarning, GetReflectionType()->GetName())
+							<< "Missing " << kv.first << " '" << name << "' in name filter of '" << GetName() << "'.";
+					}
 				}
 			}
 		}
 	}
+
+	std::sort(allObjects.begin(), allObjects.end());
+
+	ObjectLock lock (this);
+
+	m_ObjectFilterCache.swap(allObjects);
 }
 
 Log::Log(LogSeverity severity, String facility, const String& message)

diff --git a/lib/base/logger.hpp b/lib/base/logger.hpp
@@ -8,6 +8,7 @@
 #include "base/logger-ti.hpp"
 #include <set>
 #include <sstream>
+#include <vector>
 
 namespace icinga
 {
@@ -99,7 +100,7 @@ class Logger : public ObjectImpl<Logger>
 private:
 	static void UpdateMinLogSeverity();
 
-	void CheckObjectFilter();
+	void UpdateCheckObjectFilterCache();
 
 	static std::mutex m_Mutex;
 	static std::set<Logger::Ptr> m_Loggers;
@@ -111,6 +112,7 @@ class Logger : public ObjectImpl<Logger>
 	static Atomic<LogSeverity> m_MinLogSeverity;
 
 	Atomic<bool> m_CalledOnAllConfigLoaded {false};
+	std::vector<ConfigObject*> m_ObjectFilterCache;
 };
 
 class Log