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

Speed up item lookups for ConfigItem::GetDefaultTemplates 

refs #12575
This commit is contained in:
Gunnar Beutner 2016-08-29 08:40:46 +02:00
parent f12b52f465
commit 32e6da1c60
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/config/configitem.cpp
View File

@ -42,6 +42,7 @@ using namespace icinga;
boost::mutex ConfigItem::m_Mutex; boost::mutex ConfigItem::m_Mutex;
ConfigItem::TypeMap ConfigItem::m_Items; ConfigItem::TypeMap ConfigItem::m_Items;
ConfigItem::TypeMap ConfigItem::m_DefaultTemplates;
ConfigItem::ItemList ConfigItem::m_UnnamedItems; ConfigItem::ItemList ConfigItem::m_UnnamedItems;
ConfigItem::IgnoredItemList ConfigItem::m_IgnoredItems; ConfigItem::IgnoredItemList ConfigItem::m_IgnoredItems;
@ -342,6 +343,9 @@ void ConfigItem::Register(void)
} }
m_Items[m_Type][m_Name] = this; m_Items[m_Type][m_Name] = this;
if (m_DefaultTmpl)
m_DefaultTemplates[m_Type][m_Name] = this;
} }
} }
@ -358,6 +362,7 @@ void ConfigItem::Unregister(void)
boost::mutex::scoped_lock lock(m_Mutex); boost::mutex::scoped_lock lock(m_Mutex);
m_UnnamedItems.erase(std::remove(m_UnnamedItems.begin(), m_UnnamedItems.end(), this), m_UnnamedItems.end()); m_UnnamedItems.erase(std::remove(m_UnnamedItems.begin(), m_UnnamedItems.end(), this), m_UnnamedItems.end());
m_Items[m_Type].erase(m_Name); m_Items[m_Type].erase(m_Name);
m_DefaultTemplates[m_Type].erase(m_Name);
} }
/** /**
@ -650,6 +655,8 @@ std::vector<ConfigItem::Ptr> ConfigItem::GetItems(const String& type)
if (it == m_Items.end()) if (it == m_Items.end())
return items; return items;
items.reserve(it->second.size());
for (const ItemMap::value_type& kv : it->second) for (const ItemMap::value_type& kv : it->second)
{ {
items.push_back(kv.second); items.push_back(kv.second);
@ -664,15 +671,16 @@ std::vector<ConfigItem::Ptr> ConfigItem::GetDefaultTemplates(const String& type)
boost::mutex::scoped_lock lock(m_Mutex); boost::mutex::scoped_lock lock(m_Mutex);
auto it = m_Items.find(type); auto it = m_DefaultTemplates.find(type);
if (it == m_Items.end()) if (it == m_DefaultTemplates.end())
return items; return items;
items.reserve(it->second.size());
for (const ItemMap::value_type& kv : it->second) for (const ItemMap::value_type& kv : it->second)
{ {
if (kv.second->IsDefaultTemplate()) items.push_back(kv.second);
items.push_back(kv.second);
} }
return items; return items;

1
lib/config/configitem.hpp
View File

@ -101,6 +101,7 @@ private:
typedef std::map<String, ConfigItem::Ptr> ItemMap; typedef std::map<String, ConfigItem::Ptr> ItemMap;
typedef std::map<String, ItemMap> TypeMap; typedef std::map<String, ItemMap> TypeMap;
static TypeMap m_Items; /**< All registered configuration items. */ static TypeMap m_Items; /**< All registered configuration items. */
static TypeMap m_DefaultTemplates;
typedef std::vector<ConfigItem::Ptr> ItemList; typedef std::vector<ConfigItem::Ptr> ItemList;
static ItemList m_UnnamedItems; static ItemList m_UnnamedItems;