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

Performance improvements for *Group::GetMembers().

Browse Source
This commit is contained in:
Gunnar Beutner 2013-01-25 12:46:49 +01:00
parent 9413466cef
commit b79f966b53
6 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/icinga/host.cpp
View File

@ -21,7 +21,7 @@
using namespace icinga; using namespace icinga;
map<String, vector<String> > Host::m_ServicesCache; map<String, vector<Service::WeakPtr> > Host::m_ServicesCache;
bool Host::m_ServicesCacheValid = true; bool Host::m_ServicesCacheValid = true;
static AttributeDescription hostAttributes[] = { static AttributeDescription hostAttributes[] = {
@ -295,11 +295,12 @@ set<Service::Ptr> Host::GetServices(void) const
ValidateServicesCache(); ValidateServicesCache();
BOOST_FOREACH(const String& svc, m_ServicesCache[GetName()]) { BOOST_FOREACH(const Service::WeakPtr& svc, m_ServicesCache[GetName()]) {
if (!Service::Exists(svc)) Service::Ptr service = svc.lock();
if (!service)
continue; continue;
Service::Ptr service = Service::GetByName(svc);
services.insert(service); services.insert(service);
} }
@ -323,7 +324,7 @@ void Host::ValidateServicesCache(void)
BOOST_FOREACH(tie(tuples::ignore, object), DynamicType::GetByName("Service")->GetObjects()) { BOOST_FOREACH(tie(tuples::ignore, object), DynamicType::GetByName("Service")->GetObjects()) {
const Service::Ptr& service = static_pointer_cast<Service>(object); const Service::Ptr& service = static_pointer_cast<Service>(object);
m_ServicesCache[service->GetHost()->GetName()].push_back(service->GetName()); m_ServicesCache[service->GetHost()->GetName()].push_back(service);
} }
m_ServicesCacheValid = true; m_ServicesCacheValid = true;

2
lib/icinga/host.h
View File

@ -59,7 +59,7 @@ protected:
private: private:
static bool m_InitializerDone; static bool m_InitializerDone;
static map<String, vector<String> > m_ServicesCache; static map<String, vector<weak_ptr<Service> > > m_ServicesCache;
static bool m_ServicesCacheValid; static bool m_ServicesCacheValid;
static void ObjectCommittedHandler(const ConfigItem::Ptr& item); static void ObjectCommittedHandler(const ConfigItem::Ptr& item);

11
lib/icinga/hostgroup.cpp
View File

@ -21,7 +21,7 @@
using namespace icinga; using namespace icinga;
map<String, vector<String> > HostGroup::m_MembersCache; map<String, vector<Host::WeakPtr> > HostGroup::m_MembersCache;
bool HostGroup::m_MembersCacheValid = true; bool HostGroup::m_MembersCacheValid = true;
static AttributeDescription hostGroupAttributes[] = { static AttributeDescription hostGroupAttributes[] = {
@ -73,11 +73,12 @@ set<Host::Ptr> HostGroup::GetMembers(void) const
ValidateMembersCache(); ValidateMembersCache();
BOOST_FOREACH(const String& hst, m_MembersCache[GetName()]) { BOOST_FOREACH(const Host::WeakPtr& hst, m_MembersCache[GetName()]) {
if (!Host::Exists(hst)) Host::Ptr host = hst.lock();
if (!host)
continue; continue;
Host::Ptr host = Host::GetByName(hst);
hosts.insert(host); hosts.insert(host);
} }
@ -110,7 +111,7 @@ void HostGroup::ValidateMembersCache(void)
if (!HostGroup::Exists(hostgroup)) if (!HostGroup::Exists(hostgroup))
Logger::Write(LogWarning, "icinga", "Host group '" + static_cast<String>(hostgroup) + "' used but not defined."); Logger::Write(LogWarning, "icinga", "Host group '" + static_cast<String>(hostgroup) + "' used but not defined.");
m_MembersCache[hostgroup].push_back(host->GetName()); m_MembersCache[hostgroup].push_back(host);
} }
} }
} }

2
lib/icinga/hostgroup.h
View File

@ -49,7 +49,7 @@ public:
static void InvalidateMembersCache(void); static void InvalidateMembersCache(void);
private: private:
static map<String, vector<String> > m_MembersCache; static map<String, vector<weak_ptr<Host> > > m_MembersCache;
static bool m_MembersCacheValid; static bool m_MembersCacheValid;
static void ValidateMembersCache(void); static void ValidateMembersCache(void);

11
lib/icinga/servicegroup.cpp
View File

@ -21,7 +21,7 @@
using namespace icinga; using namespace icinga;
map<String, vector<String> > ServiceGroup::m_MembersCache; map<String, vector<Service::WeakPtr> > ServiceGroup::m_MembersCache;
bool ServiceGroup::m_MembersCacheValid; bool ServiceGroup::m_MembersCacheValid;
static AttributeDescription serviceGroupAttributes[] = { static AttributeDescription serviceGroupAttributes[] = {
@ -73,11 +73,12 @@ set<Service::Ptr> ServiceGroup::GetMembers(void) const
ValidateMembersCache(); ValidateMembersCache();
BOOST_FOREACH(const String& svc, m_MembersCache[GetName()]) { BOOST_FOREACH(const Service::WeakPtr& svc, m_MembersCache[GetName()]) {
if (!Service::Exists(svc)) Service::Ptr service = svc.lock();
if (!service)
continue; continue;
Service::Ptr service = Service::GetByName(svc);
services.insert(service); services.insert(service);
} }
@ -110,7 +111,7 @@ void ServiceGroup::ValidateMembersCache(void)
if (!ServiceGroup::Exists(servicegroup)) if (!ServiceGroup::Exists(servicegroup))
Logger::Write(LogWarning, "icinga", "Service group '" + static_cast<String>(servicegroup) + "' used but not defined."); Logger::Write(LogWarning, "icinga", "Service group '" + static_cast<String>(servicegroup) + "' used but not defined.");
m_MembersCache[servicegroup].push_back(service->GetName()); m_MembersCache[servicegroup].push_back(service);
} }
} }
} }

2
lib/icinga/servicegroup.h
View File

@ -49,7 +49,7 @@ public:
static void InvalidateMembersCache(void); static void InvalidateMembersCache(void);
private: private:
static map<String, vector<String> > m_MembersCache; static map<String, vector<weak_ptr<Service> > > m_MembersCache;
static bool m_MembersCacheValid; static bool m_MembersCacheValid;
static void ValidateMembersCache(void); static void ValidateMembersCache(void);