Refactor the cache code... again.

diff --git a/components/delegation/delegationcomponent.cpp b/components/delegation/delegationcomponent.cpp
index fa928cb9b8675b9397c1c113b836c1d6ec579e11..b62c0896d0185aaa56150e7138bc96106849b580 100644 (file)
--- a/components/delegation/delegationcomponent.cpp
+++ b/components/delegation/delegationcomponent.cpp
@@ -106,11 +106,11 @@ void DelegationComponent::DelegationTimerHandler(void)
                if (checker.IsEmpty())
                        continue;
 
-               if (!Endpoint::Exists(checker))
-                       continue;
-
                Endpoint::Ptr endpoint = Endpoint::GetByName(checker);
 
+               if (!endpoint)
+                       continue;
+
                histogram[endpoint]++;
        }
 
@@ -124,9 +124,7 @@ void DelegationComponent::DelegationTimerHandler(void)
 
                String checker = service->GetCurrentChecker();
 
-               Endpoint::Ptr oldEndpoint;
-               if (Endpoint::Exists(checker))
-                       oldEndpoint = Endpoint::GetByName(checker);
+               Endpoint::Ptr oldEndpoint = Endpoint::GetByName(checker);
 
                set<Endpoint::Ptr> candidates = GetCheckerCandidates(service);
 

diff --git a/components/notification/notificationcomponent.cpp b/components/notification/notificationcomponent.cpp
index 1384b44d11102c002b2e117084fe655566818b85..60793cfd35054117a3869b8126118769b60f8493 100644 (file)
--- a/components/notification/notificationcomponent.cpp
+++ b/components/notification/notificationcomponent.cpp
@@ -70,7 +70,8 @@ void NotificationComponent::NotificationTimerHandler(void)
                if (service->GetLastNotification() > now - service->GetNotificationInterval())
                        continue;
 
-               service->RequestNotifications(NotificationProblem);
+               if (Service::IsReachable(service) && !service->IsInDowntime() && !service->IsAcknowledged())
+                       service->RequestNotifications(NotificationProblem);
        }
 }
 

diff --git a/lib/icinga/host.cpp b/lib/icinga/host.cpp
index 4008ae0abe9dd4957f1fc9c1bbb8c47368584558..f3dd049b515660a6b04157bb6e517be2b91de023 100644 (file)
--- a/lib/icinga/host.cpp
+++ b/lib/icinga/host.cpp
@@ -23,6 +23,7 @@ using namespace icinga;
 
 boost::mutex Host::m_ServiceMutex;
 map<String, map<String, weak_ptr<Service> > > Host::m_ServicesCache;
+bool Host::m_ServicesCacheValid = false;
 
 REGISTER_SCRIPTFUNCTION("ValidateServiceDictionary", &Host::ValidateServiceDictionary);
 
@@ -42,7 +43,7 @@ Host::Host(const Dictionary::Ptr& properties)
 
 Host::~Host(void)
 {
-       HostGroup::RefreshMembersCache();
+       HostGroup::InvalidateMembersCache();
 
        if (m_SlaveServices) {
                ConfigItem::Ptr service;
@@ -56,7 +57,6 @@ void Host::OnRegistrationCompleted(void)
 {
        DynamicObject::OnRegistrationCompleted();
 
-       HostGroup::RefreshMembersCache();
        Host::UpdateSlaveServices(GetSelf());
 }
 
@@ -68,14 +68,6 @@ String Host::GetDisplayName(void) const
                return GetName();
 }
 
-/**
- * @threadsafety Always.
- */
-bool Host::Exists(const String& name)
-{
-       return (DynamicObject::GetObject("Host", name));
-}
-
 /**
  * @threadsafety Always.
  */
@@ -292,7 +284,7 @@ void Host::UpdateSlaveServices(const Host::Ptr& self)
 void Host::OnAttributeChanged(const String& name, const Value&)
 {
        if (name == "hostgroups")
-               HostGroup::RefreshMembersCache();
+               HostGroup::InvalidateMembersCache();
        else if (name == "services") {
                UpdateSlaveServices(GetSelf());
        } else if (name == "notifications") {
@@ -328,8 +320,27 @@ set<Service::Ptr> Host::GetServices(void) const
        return services;
 }
 
+void Host::InvalidateServicesCache(void)
+{
+       {
+               boost::mutex::scoped_lock lock(m_ServiceMutex);
+               m_ServicesCacheValid = false;
+       }
+
+       Utility::QueueAsyncCallback(boost::bind(&Host::RefreshServicesCache));
+}
+
 void Host::RefreshServicesCache(void)
 {
+       {
+               boost::mutex::scoped_lock lock(m_ServiceMutex);
+
+               if (m_ServicesCacheValid)
+                       return;
+
+               m_ServicesCacheValid = true;
+       }
+
        map<String, map<String, weak_ptr<Service> > > newServicesCache;
 
        BOOST_FOREACH(const DynamicObject::Ptr& object, DynamicType::GetObjects("Service")) {
@@ -433,10 +444,18 @@ Service::Ptr Host::GetServiceByShortName(const Host::Ptr& self, const Value& nam
                        }
                }
 
-               return Service::GetByName(name);
+               return Service::Ptr();
        } else if (name.IsObjectType<Dictionary>()) {
                Dictionary::Ptr dict = name;
-               return GetServiceByShortName(GetByName(dict->Get("host")), dict->Get("service"));
+               String short_name;
+
+               {
+                       ObjectLock olock(dict);
+                       host_name = dict->Get("host");
+                       short_name = dict->Get("service");
+               }
+
+               return Service::GetByNamePair(host_name, short_name);
        } else {
                BOOST_THROW_EXCEPTION(invalid_argument("Host/Service name pair is invalid."));
        }
@@ -461,7 +480,12 @@ set<Host::Ptr> Host::GetParentHosts(const Host::Ptr& self)
                        if (value == host_name)
                                continue;
 
-                       parents.insert(Host::GetByName(value));
+                       Host::Ptr host = GetByName(value);
+
+                       if (!host)
+                               continue;
+
+                       parents.insert(host);
                }
        }
 
@@ -477,6 +501,9 @@ Service::Ptr Host::GetHostCheckService(const Host::Ptr& self)
                host_check = self->GetHostCheck();
        }
 
+       if (host_check.IsEmpty())
+               return Service::Ptr();
+
        return GetServiceByShortName(self, host_check);
 }
 

diff --git a/lib/icinga/host.h b/lib/icinga/host.h
index d0314f2b10752f136d963ad513f7bd81bf2fb34d..d45f0b0e33f6ac8da2c22b954bebaa6863d063cf 100644 (file)
--- a/lib/icinga/host.h
+++ b/lib/icinga/host.h
@@ -39,7 +39,6 @@ public:
        Host(const Dictionary::Ptr& properties);
        ~Host(void);
 
-       static bool Exists(const String& name);
        static Host::Ptr GetByName(const String& name);
 
        String GetDisplayName(void) const;
@@ -61,7 +60,7 @@ public:
        static shared_ptr<Service> GetServiceByShortName(const Host::Ptr& self, const Value& name);
 
        set<shared_ptr<Service> > GetServices(void) const;
-       static void RefreshServicesCache(void);
+       static void InvalidateServicesCache(void);
 
        static void ValidateServiceDictionary(const ScriptTask::Ptr& task,
            const std::vector<icinga::Value>& arguments);
@@ -81,10 +80,11 @@ private:
 
        static boost::mutex m_ServiceMutex;
        static map<String, map<String, weak_ptr<Service> > > m_ServicesCache;
+       static bool m_ServicesCacheValid;
 
        static void UpdateSlaveServices(const Host::Ptr& self);
 
-       static void ValidateServicesCache(void);
+       static void RefreshServicesCache(void);
 };
 
 }

diff --git a/lib/icinga/hostgroup.cpp b/lib/icinga/hostgroup.cpp
index 694e1b0f313d35d15e0728430768d231f1466335..1ed671a05ee4203a56a574d41531e1c1e0747c0c 100644 (file)
--- a/lib/icinga/hostgroup.cpp
+++ b/lib/icinga/hostgroup.cpp
@@ -23,6 +23,7 @@ using namespace icinga;
 
 boost::mutex HostGroup::m_Mutex;
 map<String, vector<Host::WeakPtr> > HostGroup::m_MembersCache;
+bool HostGroup::m_MembersCacheValid = true;
 
 REGISTER_TYPE(HostGroup, NULL);
 
@@ -36,12 +37,12 @@ HostGroup::HostGroup(const Dictionary::Ptr& properties)
 
 HostGroup::~HostGroup(void)
 {
-       RefreshMembersCache();
+       InvalidateMembersCache();
 }
 
 void HostGroup::OnRegistrationCompleted(void)
 {
-       RefreshMembersCache();
+       InvalidateMembersCache();
 }
 
 String HostGroup::GetDisplayName(void) const
@@ -62,14 +63,6 @@ String HostGroup::GetActionUrl(void) const
        return m_ActionUrl;
 }
 
-/**
- * @threadsafety Always.
- */
-bool HostGroup::Exists(const String& name)
-{
-       return (DynamicObject::GetObject("HostGroup", name));
-}
-
 /**
  * @threadsafety Always.
  */
@@ -110,8 +103,27 @@ set<Host::Ptr> HostGroup::GetMembers(const HostGroup::Ptr& self)
        return hosts;
 }
 
+void HostGroup::InvalidateMembersCache(void)
+{
+       {
+               boost::mutex::scoped_lock lock(m_Mutex);
+               m_MembersCacheValid = false;
+       }
+
+       Utility::QueueAsyncCallback(boost::bind(&HostGroup::RefreshMembersCache));
+}
+
 void HostGroup::RefreshMembersCache(void)
 {
+       {
+               boost::mutex::scoped_lock lock(m_Mutex);
+
+               if (m_MembersCacheValid)
+                       return;
+
+               m_MembersCacheValid = true;
+       }
+
        map<String, vector<weak_ptr<Host> > > newMembersCache;
 
        BOOST_FOREACH(const DynamicObject::Ptr& object, DynamicType::GetObjects("Host")) {
@@ -125,9 +137,6 @@ void HostGroup::RefreshMembersCache(void)
                        ObjectLock mlock(dict);
                        Value hostgroup;
                        BOOST_FOREACH(tie(tuples::ignore, hostgroup), dict) {
-                               if (!HostGroup::Exists(hostgroup))
-                                       continue;
-
                                newMembersCache[hostgroup].push_back(host);
                        }
                }

diff --git a/lib/icinga/hostgroup.h b/lib/icinga/hostgroup.h
index 35d39cae9f3e73ab38a96a7c374884b651ef06a9..97b802df406309d5ed3398b94993b420358254a7 100644 (file)
--- a/lib/icinga/hostgroup.h
+++ b/lib/icinga/hostgroup.h
@@ -37,7 +37,6 @@ public:
        HostGroup(const Dictionary::Ptr& properties);
        ~HostGroup(void);
 
-       static bool Exists(const String& name);
        static HostGroup::Ptr GetByName(const String& name);
 
        String GetDisplayName(void) const;
@@ -46,7 +45,7 @@ public:
 
        static set<Host::Ptr> GetMembers(const HostGroup::Ptr& self);
 
-       static void RefreshMembersCache(void);
+       static void InvalidateMembersCache(void);
 
 protected:
        virtual void OnRegistrationCompleted(void);
@@ -58,6 +57,9 @@ private:
 
        static boost::mutex m_Mutex;
        static map<String, vector<weak_ptr<Host> > > m_MembersCache;
+       static bool m_MembersCacheValid;
+
+       static void RefreshMembersCache(void);
 };
 
 }

diff --git a/lib/icinga/notification.cpp b/lib/icinga/notification.cpp
index e7810d971325fa1f1d3f49a23c88c87c00f110d9..be07a1f25c4026d3639998434ede42c089d70b86 100644 (file)
--- a/lib/icinga/notification.cpp
+++ b/lib/icinga/notification.cpp
@@ -31,18 +31,11 @@ Notification::Notification(const Dictionary::Ptr& properties)
        RegisterAttribute("users", Attribute_Config, &m_Users);
        RegisterAttribute("host_name", Attribute_Config, &m_HostName);
        RegisterAttribute("service", Attribute_Config, &m_Service);
-
-       Service::RefreshNotificationsCache();
 }
 
 Notification::~Notification(void)
 {
-       Service::RefreshNotificationsCache();
-}
-
-bool Notification::Exists(const String& name)
-{
-       return (DynamicObject::GetObject("Notification", name));
+       Service::InvalidateNotificationsCache();
 }
 
 Notification::Ptr Notification::GetByName(const String& name)
@@ -59,6 +52,9 @@ Service::Ptr Notification::GetService(void) const
 {
        Host::Ptr host = Host::GetByName(m_HostName);
 
+       if (!host)
+               return Service::Ptr();
+
        if (m_Service.IsEmpty())
                return Host::GetHostCheckService(host);
        else
@@ -239,5 +235,5 @@ void Notification::NotificationCompletedHandler(const ScriptTask::Ptr& task)
 void Notification::OnAttributeChanged(const String& name, const Value& oldValue)
 {
        if (name == "host_name" || name == "service")
-               Service::RefreshNotificationsCache();
+               Service::InvalidateNotificationsCache();
 }

diff --git a/lib/icinga/notification.h b/lib/icinga/notification.h
index 0443927bef4faca9c12f739fc2d297e92463c2b5..3b3c77e1221aa906d7c5868e85423f486754119e 100644 (file)
--- a/lib/icinga/notification.h
+++ b/lib/icinga/notification.h
@@ -55,7 +55,6 @@ public:
        Notification(const Dictionary::Ptr& properties);
        ~Notification(void);
 
-       static bool Exists(const String& name);
        static Notification::Ptr GetByName(const String& name);
 
        shared_ptr<Service> GetService(void) const;

diff --git a/lib/icinga/service-comment.cpp b/lib/icinga/service-comment.cpp
index ad82c22a11ba5bf4e2cab3210f01a4c82d6c5166..371d9ad90f71759a7ce687f344a5105486ed2a1e 100644 (file)
--- a/lib/icinga/service-comment.cpp
+++ b/lib/icinga/service-comment.cpp
@@ -25,6 +25,7 @@ int Service::m_NextCommentID = 1;
 boost::mutex Service::m_CommentMutex;
 map<int, String> Service::m_LegacyCommentsCache;
 map<String, Service::WeakPtr> Service::m_CommentsCache;
+bool Service::m_CommentsCacheValid = true;
 Timer::Ptr Service::m_CommentsExpireTimer;
 
 int Service::GetNextCommentID(void)
@@ -135,8 +136,27 @@ bool Service::IsCommentExpired(const Dictionary::Ptr& comment)
        return (expire_time != 0 && expire_time < Utility::GetTime());
 }
 
+void Service::InvalidateCommentsCache(void)
+{
+       {
+               boost::mutex::scoped_lock lock(m_CommentMutex);
+               m_CommentsCacheValid = false;
+       }
+
+       Utility::QueueAsyncCallback(boost::bind(&Service::RefreshCommentsCache));
+}
+
 void Service::RefreshCommentsCache(void)
 {
+       {
+               boost::mutex::scoped_lock lock(m_CommentMutex);
+
+               if (m_CommentsCacheValid)
+                       return;
+
+               m_CommentsCacheValid = true;
+       }
+
        map<int, String> newLegacyCommentsCache;
        map<String, Service::WeakPtr> newCommentsCache;
 

diff --git a/lib/icinga/service-downtime.cpp b/lib/icinga/service-downtime.cpp
index a24d7abab4cceaa7ed1842f3bcc4f9011cd4c828..499bc1231c67e13e18567dd0d726d060b39fabc0 100644 (file)
--- a/lib/icinga/service-downtime.cpp
+++ b/lib/icinga/service-downtime.cpp
@@ -25,6 +25,7 @@ int Service::m_NextDowntimeID = 1;
 boost::mutex Service::m_DowntimeMutex;
 map<int, String> Service::m_LegacyDowntimesCache;
 map<String, Service::WeakPtr> Service::m_DowntimesCache;
+bool Service::m_DowntimesCacheValid = true;
 Timer::Ptr Service::m_DowntimesExpireTimer;
 
 int Service::GetNextDowntimeID(void)
@@ -212,8 +213,27 @@ bool Service::IsDowntimeExpired(const Dictionary::Ptr& downtime)
        return (downtime->Get("end_time") < Utility::GetTime());
 }
 
+void Service::InvalidateDowntimesCache(void)
+{
+       {
+               boost::mutex::scoped_lock lock(m_DowntimeMutex);
+               m_DowntimesCacheValid = false;
+       }
+
+       Utility::QueueAsyncCallback(boost::bind(&Service::RefreshDowntimesCache));
+}
+
 void Service::RefreshDowntimesCache(void)
 {
+       {
+               boost::mutex::scoped_lock lock(m_DowntimeMutex);
+
+               if (m_DowntimesCacheValid)
+                       return;
+
+               m_DowntimesCacheValid = true;
+       }
+
        map<int, String> newLegacyDowntimesCache;
        map<String, Service::WeakPtr> newDowntimesCache;
 

diff --git a/lib/icinga/service-notification.cpp b/lib/icinga/service-notification.cpp
index dcf08d3701c36e14350057daa655e282a2be83b3..5381ad1736932fc5fbf6d7a8d15c757bc4607a52 100644 (file)
--- a/lib/icinga/service-notification.cpp
+++ b/lib/icinga/service-notification.cpp
@@ -23,6 +23,7 @@ using namespace icinga;
 
 boost::mutex Service::m_NotificationMutex;
 map<String, set<Notification::WeakPtr> > Service::m_NotificationsCache;
+bool Service::m_NotificationsCacheValid = true;
 
 void Service::RequestNotifications(NotificationType type)
 {
@@ -78,8 +79,27 @@ void Service::SendNotifications(const Service::Ptr& self, NotificationType type)
        }
 }
 
+void Service::InvalidateNotificationsCache(void)
+{
+       {
+               boost::mutex::scoped_lock lock(m_NotificationMutex);
+               m_NotificationsCacheValid = false;
+       }
+
+       Utility::QueueAsyncCallback(boost::bind(&Service::RefreshNotificationsCache));
+}
+
 void Service::RefreshNotificationsCache(void)
 {
+       {
+               boost::mutex::scoped_lock lock(m_NotificationMutex);
+
+               if (m_NotificationsCacheValid)
+                       return;
+
+               m_NotificationsCacheValid = true;
+       }
+
        map<String, set<Notification::WeakPtr> > newNotificationsCache;
 
        BOOST_FOREACH(const DynamicObject::Ptr& object, DynamicType::GetObjects("Notification")) {
@@ -157,7 +177,7 @@ void Service::UpdateSlaveNotifications(const Service::Ptr& self)
        Dictionary::Ptr oldNotifications;
        Host::Ptr host;
        vector<Dictionary::Ptr> notificationDescsList;
-       String service_name;
+       String service_name, short_name;
        ConfigItem::Ptr item;
 
        {
@@ -171,6 +191,7 @@ void Service::UpdateSlaveNotifications(const Service::Ptr& self)
                        return;
 
                service_name = self->GetName();
+               short_name = self->GetShortName();
                oldNotifications = self->m_SlaveNotifications;
                host = self->GetHost();
 
@@ -216,7 +237,7 @@ void Service::UpdateSlaveNotifications(const Service::Ptr& self)
                        builder->SetType("Notification");
                        builder->SetName(name);
                        builder->AddExpression("host_name", OperatorSet, host_name);
-                       builder->AddExpression("service", OperatorSet, service_name);
+                       builder->AddExpression("service", OperatorSet, short_name);
 
                        CopyNotificationAttributes(self, builder);
 

diff --git a/lib/icinga/service.cpp b/lib/icinga/service.cpp
index 8f003a4cdc95239a3d61b834748f6bb37d2a6752..248cce1395bc83c72f6c50499e885c2e7e7d53d2 100644 (file)
--- a/lib/icinga/service.cpp
+++ b/lib/icinga/service.cpp
@@ -70,18 +70,17 @@ Service::Service(const Dictionary::Ptr& serializedObject)
 
 Service::~Service(void)
 {
-       ServiceGroup::RefreshMembersCache();
-       Host::RefreshServicesCache();
-       Service::RefreshDowntimesCache();
-       Service::RefreshCommentsCache();
+       ServiceGroup::InvalidateMembersCache();
+       Host::InvalidateServicesCache();
+       Service::InvalidateDowntimesCache();
+       Service::InvalidateCommentsCache();
 }
 
 void Service::OnRegistrationCompleted(void)
 {
        DynamicObject::OnRegistrationCompleted();
 
-       ServiceGroup::RefreshMembersCache();
-       Host::RefreshServicesCache();
+       Host::InvalidateServicesCache();
 }
 
 String Service::GetDisplayName(void) const
@@ -92,14 +91,6 @@ String Service::GetDisplayName(void) const
                return m_DisplayName;
 }
 
-/**
- * @threadsafety Always.
- */
-bool Service::Exists(const String& name)
-{
-       return (DynamicObject::GetObject("Service", name));
-}
-
 /**
  * @threadsafety Always.
  */
@@ -120,6 +111,10 @@ Service::Ptr Service::GetByNamePair(const String& hostName, const String& servic
 {
        if (!hostName.IsEmpty()) {
                Host::Ptr host = Host::GetByName(hostName);
+
+               if (!host)
+                       return Service::Ptr();
+
                return Host::GetServiceByShortName(host, serviceName);
        } else {
                return Service::GetByName(serviceName);
@@ -266,15 +261,15 @@ void Service::OnAttributeChanged(const String& name, const Value& oldValue)
        else if (name == "next_check")
                OnNextCheckChanged(GetSelf(), oldValue);
        else if (name == "servicegroups")
-               ServiceGroup::RefreshMembersCache();
+               ServiceGroup::InvalidateMembersCache();
        else if (name == "host_name" || name == "short_name") {
-               Host::RefreshServicesCache();
+               Host::InvalidateServicesCache();
 
                UpdateSlaveNotifications(GetSelf());
        } else if (name == "downtimes")
-               Service::RefreshDowntimesCache();
+               Service::InvalidateDowntimesCache();
        else if (name == "comments")
-               Service::RefreshCommentsCache();
+               Service::InvalidateCommentsCache();
        else if (name == "notifications")
                UpdateSlaveNotifications(GetSelf());
        else if (name == "check_interval") {
@@ -306,7 +301,12 @@ set<Host::Ptr> Service::GetParentHosts(const Service::Ptr& self)
        if (dependencies) {
                String key;
                BOOST_FOREACH(tie(key, tuples::ignore), dependencies) {
-                       parents.insert(Host::GetByName(key));
+                       Host::Ptr host = Host::GetByName(key);
+
+                       if (!host)
+                               continue;
+
+                       parents.insert(host);
                }
        }
 

diff --git a/lib/icinga/service.h b/lib/icinga/service.h
index 0f050d00a937f0f16517ed5f3c1d4e4e5709f5d8..9bac7289cd9751200f387a1c919b13bd59237b2b 100644 (file)
--- a/lib/icinga/service.h
+++ b/lib/icinga/service.h
@@ -89,7 +89,6 @@ public:
        Service(const Dictionary::Ptr& properties);
        ~Service(void);
 
-       static bool Exists(const String& name);
        static Service::Ptr GetByName(const String& name);
 
        static Service::Ptr GetByNamePair(const String& hostName, const String& serviceName);
@@ -112,7 +111,7 @@ public:
        static set<Host::Ptr> GetParentHosts(const Service::Ptr& self);
        static set<Service::Ptr> GetParentServices(const Service::Ptr& self);
 
-       bool IsReachable(const Service::Ptr& self);
+       static bool IsReachable(const Service::Ptr& self);
 
        AcknowledgementType GetAcknowledgement(void);
        void SetAcknowledgement(AcknowledgementType acknowledgement);
@@ -208,7 +207,7 @@ public:
        static bool IsDowntimeActive(const Dictionary::Ptr& downtime);
        static bool IsDowntimeExpired(const Dictionary::Ptr& downtime);
 
-       static void RefreshDowntimesCache(void);
+       static void InvalidateDowntimesCache(void);
 
        bool IsInDowntime(void) const;
        bool IsAcknowledged(void);
@@ -230,7 +229,7 @@ public:
 
        static bool IsCommentExpired(const Dictionary::Ptr& comment);
 
-       static void RefreshCommentsCache(void);
+       static void InvalidateCommentsCache(void);
 
        /* Notifications */
        bool GetEnableNotifications(void) const;
@@ -243,7 +242,7 @@ public:
 
        static set<Notification::Ptr> GetNotifications(const Service::Ptr& self);
 
-       static void RefreshNotificationsCache(void);
+       static void InvalidateNotificationsCache(void);
 
        static void UpdateSlaveNotifications(const Service::Ptr& self);
 
@@ -299,12 +298,15 @@ private:
        static boost::mutex m_DowntimeMutex;
        static map<int, String> m_LegacyDowntimesCache;
        static map<String, Service::WeakPtr> m_DowntimesCache;
+       static bool m_DowntimesCacheValid;
        static Timer::Ptr m_DowntimesExpireTimer;
 
        static void DowntimesExpireTimerHandler(void);
 
        void RemoveExpiredDowntimes(void);
 
+       static void RefreshDowntimesCache(void);
+
        /* Comments */
        Attribute<Dictionary::Ptr> m_Comments;
 
@@ -313,6 +315,7 @@ private:
        static boost::mutex m_CommentMutex;
        static map<int, String> m_LegacyCommentsCache;
        static map<String, Service::WeakPtr> m_CommentsCache;
+       static bool m_CommentsCacheValid;
        static Timer::Ptr m_CommentsExpireTimer;
 
        static void CommentsExpireTimerHandler(void);
@@ -320,6 +323,8 @@ private:
        void AddCommentsToCache(void);
        void RemoveExpiredComments(void);
 
+       static void RefreshCommentsCache(void);
+
        /* Notifications */
        Attribute<bool> m_EnableNotifications;
        Attribute<double> m_LastNotification;
@@ -327,6 +332,9 @@ private:
 
        static boost::mutex m_NotificationMutex;
        static map<String, set<Notification::WeakPtr> > m_NotificationsCache;
+       static bool m_NotificationsCacheValid;
+
+       static void RefreshNotificationsCache(void);
 };
 
 }

diff --git a/lib/icinga/servicegroup.cpp b/lib/icinga/servicegroup.cpp
index 34790672a5265c33ddfe44b26d56a52c2a485bb9..42e98411242f71aca1085f1329ed3b404d7bf6ab 100644 (file)
--- a/lib/icinga/servicegroup.cpp
+++ b/lib/icinga/servicegroup.cpp
@@ -23,6 +23,7 @@ using namespace icinga;
 
 boost::mutex ServiceGroup::m_Mutex;
 map<String, vector<Service::WeakPtr> > ServiceGroup::m_MembersCache;
+bool ServiceGroup::m_MembersCacheValid = true;
 
 REGISTER_TYPE(ServiceGroup, NULL);
 
@@ -62,14 +63,6 @@ String ServiceGroup::GetActionUrl(void) const
        return m_ActionUrl;
 }
 
-/**
- * @threadsafety Always.
- */
-bool ServiceGroup::Exists(const String& name)
-{
-       return (DynamicObject::GetObject("ServiceGroup", name));
-}
-
 /**
  * @threadsafety Always.
  */
@@ -110,8 +103,27 @@ set<Service::Ptr> ServiceGroup::GetMembers(const ServiceGroup::Ptr& self)
        return services;
 }
 
+void ServiceGroup::InvalidateMembersCache(void)
+{
+       {
+               boost::mutex::scoped_lock lock(m_Mutex);
+               m_MembersCacheValid = false;
+       }
+
+       Utility::QueueAsyncCallback(boost::bind(&ServiceGroup::RefreshMembersCache));
+}
+
 void ServiceGroup::RefreshMembersCache(void)
 {
+       {
+               boost::mutex::scoped_lock lock(m_Mutex);
+
+               if (m_MembersCacheValid)
+                       return;
+
+               m_MembersCacheValid = true;
+       }
+
        map<String, vector<weak_ptr<Service> > > newMembersCache;
 
        BOOST_FOREACH(const DynamicObject::Ptr& object, DynamicType::GetObjects("Service")) {
@@ -125,9 +137,6 @@ void ServiceGroup::RefreshMembersCache(void)
                        ObjectLock mlock(dict);
                        Value servicegroup;
                        BOOST_FOREACH(tie(tuples::ignore, servicegroup), dict) {
-                               if (!ServiceGroup::Exists(servicegroup))
-                                       continue;
-
                                newMembersCache[servicegroup].push_back(service);
                        }
                }
@@ -135,5 +144,4 @@ void ServiceGroup::RefreshMembersCache(void)
 
        boost::mutex::scoped_lock lock(m_Mutex);
        m_MembersCache.swap(newMembersCache);
-
 }

diff --git a/lib/icinga/servicegroup.h b/lib/icinga/servicegroup.h
index 5ea5a6fc558e1fae1218d40e1815c6b33b829fe5..9c041153b7a33d9c1e8031042bc27cbdb5a02b61 100644 (file)
--- a/lib/icinga/servicegroup.h
+++ b/lib/icinga/servicegroup.h
@@ -37,7 +37,6 @@ public:
        ServiceGroup(const Dictionary::Ptr& properties);
        ~ServiceGroup(void);
 
-       static bool Exists(const String& name);
        static ServiceGroup::Ptr GetByName(const String& name);
 
        String GetDisplayName(void) const;
@@ -46,7 +45,7 @@ public:
 
        static set<Service::Ptr> GetMembers(const ServiceGroup::Ptr& self);
 
-       static void RefreshMembersCache(void);
+       static void InvalidateMembersCache(void);
 
 protected:
        virtual void OnRegistrationCompleted(void);
@@ -58,6 +57,9 @@ private:
 
        static boost::mutex m_Mutex;
        static map<String, vector<weak_ptr<Service> > > m_MembersCache;
+       static bool m_MembersCacheValid;
+
+       static void RefreshMembersCache(void);
 };
 
 }

diff --git a/lib/icinga/user.cpp b/lib/icinga/user.cpp
index 177aaf6bb8a6dabb625731f3699caeb50af4114f..c2c4a40e44092da6899fbad862f3698b62d03047 100644 (file)
--- a/lib/icinga/user.cpp
+++ b/lib/icinga/user.cpp
@@ -29,11 +29,6 @@ User::User(const Dictionary::Ptr& properties)
        RegisterAttribute("macros", Attribute_Config, &m_Macros);
 }
 
-bool User::Exists(const String& name)
-{
-       return (DynamicObject::GetObject("User", name));
-}
-
 User::Ptr User::GetByName(const String& name)
 {
        DynamicObject::Ptr configObject = DynamicObject::GetObject("User", name);

diff --git a/lib/icinga/user.h b/lib/icinga/user.h
index 857d702abab315ba8b6ab09b94dfd9e79493e790..0c7e5f6a3048c49ba4e8aa0f60efceebf0501099 100644 (file)
--- a/lib/icinga/user.h
+++ b/lib/icinga/user.h
@@ -36,7 +36,6 @@ public:
 
        User(const Dictionary::Ptr& properties);
 
-       static bool Exists(const String& name);
        static User::Ptr GetByName(const String& name);
 
        Dictionary::Ptr GetMacros(void) const;

diff --git a/lib/remoting/endpoint.cpp b/lib/remoting/endpoint.cpp
index 702e9862e1403403847e4366a61beb6fdd3d041f..9ec040375c06cabd11747cddf74f7aad67ce0a95 100644 (file)
--- a/lib/remoting/endpoint.cpp
+++ b/lib/remoting/endpoint.cpp
@@ -43,17 +43,6 @@ Endpoint::Endpoint(const Dictionary::Ptr& serializedUpdate)
        RegisterAttribute("subscriptions", Attribute_Replicated, &m_Subscriptions);
 }
 
-/**
- * Checks whether an endpoint with the specified name exists.
- *
- * @param name The name of the endpoint.
- * @returns true if the endpoint exists, false otherwise.
- */
-bool Endpoint::Exists(const String& name)
-{
-       return (DynamicObject::GetObject("Endpoint", name));
-}
-
 /**
  * Retrieves an endpoint by name.
  *
@@ -64,9 +53,6 @@ Endpoint::Ptr Endpoint::GetByName(const String& name)
 {
         DynamicObject::Ptr configObject = DynamicObject::GetObject("Endpoint", name);
 
-        if (!configObject)
-                BOOST_THROW_EXCEPTION(invalid_argument("Endpoint '" + name + "' does not exist."));
-
         return dynamic_pointer_cast<Endpoint>(configObject);
 }
 

diff --git a/lib/remoting/endpoint.h b/lib/remoting/endpoint.h
index 25e8db2d83c61ad55da2e51ddaf664ae76ca5168..15658227adc2c4fe2204e0a66cc6507f6d41c4c1 100644 (file)
--- a/lib/remoting/endpoint.h
+++ b/lib/remoting/endpoint.h
@@ -40,7 +40,6 @@ public:
 
        Endpoint(const Dictionary::Ptr& serializedUpdate);
 
-       static bool Exists(const String& name);
        static Endpoint::Ptr GetByName(const String& name);
 
        JsonRpcConnection::Ptr GetClient(void) const;

diff --git a/lib/remoting/endpointmanager.cpp b/lib/remoting/endpointmanager.cpp
index 6ae387791da8bbb51063a8f8c110af584fd6fed6..af96a8153df13f4aac3e06e061e1bed149a08a52 100644 (file)
--- a/lib/remoting/endpointmanager.cpp
+++ b/lib/remoting/endpointmanager.cpp
@@ -168,11 +168,9 @@ void EndpointManager::ClientConnectedHandler(const Stream::Ptr& client, const St
 
        Logger::Write(LogInformation, "icinga", "New client connection at " + peerAddress + " for identity '" + identity + "'");
 
-       Endpoint::Ptr endpoint;
+       Endpoint::Ptr endpoint = Endpoint::GetByName(identity);
 
-       if (Endpoint::Exists(identity))
-               endpoint = Endpoint::GetByName(identity);
-       else
+       if (!endpoint)
                endpoint = Endpoint::MakeEndpoint(identity, true);
 
        endpoint->SetClient(jclient);