OU/CWE-ou-minkata
2
3
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-14 02:27:40 -04:00
Code Releases Activity

Use a std::map for faster page lookups.

Browse Source
This commit is contained in:
Darryl Pogue
2012-04-08 00:18:21 -07:00
parent 3a8911c1cd
commit 5ad311dd97
2 changed files with 42 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
Sources/Plasma/PubUtilLib/plResMgr/plResManager.cpp
View File

@ -140,7 +140,8 @@ hsBool plResManager::IInit()
pathIterator.GetPathAndName(fileName); pathIterator.GetPathAndName(fileName);
plRegistryPageNode* node = new plRegistryPageNode(fileName); plRegistryPageNode* node = new plRegistryPageNode(fileName);
fAllPages.insert(node); plPageInfo pi = node->GetPageInfo();
fAllPages[pi.GetLocation()] = node;
} }
} }
@ -217,9 +218,9 @@ void plResManager::IShutdown()
// Shut down the registry (finally!) // Shut down the registry (finally!)
ILockPages(); ILockPages();
PageSet::const_iterator it; PageMap::const_iterator it;
for (it = fAllPages.begin(); it != fAllPages.end(); it++) for (it = fAllPages.begin(); it != fAllPages.end(); it++)
delete *it; delete it->second;
fAllPages.clear(); fAllPages.clear();
fLoadedPages.clear(); fLoadedPages.clear();
@ -240,11 +241,11 @@ void plResManager::AddSinglePage(const char* pagePath)
plRegistryPageNode* plResManager::FindSinglePage(const char* path) const plRegistryPageNode* plResManager::FindSinglePage(const char* path) const
{ {
PageSet::const_iterator it; PageMap::const_iterator it;
for (it = fAllPages.begin(); it != fAllPages.end(); it++) for (it = fAllPages.begin(); it != fAllPages.end(); it++)
{ {
if (hsStrCaseEQ((*it)->GetPagePath(), path)) if (hsStrCaseEQ((it->second)->GetPagePath(), path))
return *it; return it->second;
} }
return nil; return nil;
@ -255,7 +256,8 @@ void plResManager::RemoveSinglePage(const char* path)
plRegistryPageNode* node = FindSinglePage(path); plRegistryPageNode* node = FindSinglePage(path);
if (node) if (node)
{ {
fAllPages.erase(node); plLocation loc = node->GetPageInfo().GetLocation();
fAllPages.erase(loc);
delete node; delete node;
} }
} }
@ -1303,21 +1305,22 @@ void plResManager::PageInAge(const char *age)
hsBool plResManager::VerifyPages() hsBool plResManager::VerifyPages()
{ {
hsTArray<plRegistryPageNode*> invalidPages, newerPages; hsTArray<plRegistryPageNode*> invalidPages, newerPages;
PageMap::iterator it = fAllPages.begin();
// Step 1: verify major/minor version changes // Step 1: verify major/minor version changes
if (plResMgrSettings::Get().GetFilterNewerPageVersions() || if (plResMgrSettings::Get().GetFilterNewerPageVersions() ||
plResMgrSettings::Get().GetFilterOlderPageVersions()) plResMgrSettings::Get().GetFilterOlderPageVersions())
{ {
PageSet::iterator it = fAllPages.begin();
while (it != fAllPages.end()) while (it != fAllPages.end())
{ {
plRegistryPageNode* page = *it; plLocation loc = it->first;
it++; plRegistryPageNode* page = it->second;
++it;
if (page->GetPageCondition() == kPageTooNew && plResMgrSettings::Get().GetFilterNewerPageVersions()) if (page->GetPageCondition() == kPageTooNew && plResMgrSettings::Get().GetFilterNewerPageVersions())
{ {
newerPages.Append(page); newerPages.Append(page);
fAllPages.erase(page); fAllPages.erase(loc);
} }
else if ( else if (
(page->GetPageCondition() == kPageCorrupt || (page->GetPageCondition() == kPageCorrupt ||
@ -1325,7 +1328,7 @@ hsBool plResManager::VerifyPages()
&& plResMgrSettings::Get().GetFilterOlderPageVersions()) && plResMgrSettings::Get().GetFilterOlderPageVersions())
{ {
invalidPages.Append(page); invalidPages.Append(page);
fAllPages.erase(page); fAllPages.erase(loc);
} }
} }
} }
@ -1345,7 +1348,8 @@ hsBool plResManager::VerifyPages()
} }
// Step 2 of verification: make sure no sequence numbers conflict // Step 2 of verification: make sure no sequence numbers conflict
PageSet::iterator it = fAllPages.begin(); // This isn't possible with a std::map
/*PageSet::iterator it = fAllPages.begin();
for (; it != fAllPages.end(); it++) for (; it != fAllPages.end(); it++)
{ {
plRegistryPageNode* page = *it; plRegistryPageNode* page = *it;
@ -1362,15 +1366,15 @@ hsBool plResManager::VerifyPages()
break; break;
} }
} }
} }*/
// Redo our loaded pages list, since Verify() might force the page's keys to load or unload // Redo our loaded pages list, since Verify() might force the page's keys to load or unload
fLoadedPages.clear(); fLoadedPages.clear();
it = fAllPages.begin(); it = fAllPages.begin();
while (it != fAllPages.end()) while (it != fAllPages.end())
{ {
plRegistryPageNode* page = *it; plRegistryPageNode* page = it->second;
it++; ++it;
if (page->IsLoaded()) if (page->IsLoaded())
fLoadedPages.insert(page); fLoadedPages.insert(page);
@ -1511,7 +1515,7 @@ void plResManager::DumpUnusedKeys(plRegistryPageNode* page) const
plRegistryPageNode* plResManager::CreatePage(const plLocation& location, const char* age, const char* page) plRegistryPageNode* plResManager::CreatePage(const plLocation& location, const char* age, const char* page)
{ {
plRegistryPageNode* pageNode = new plRegistryPageNode(location, age, page, fDataPath.c_str()); plRegistryPageNode* pageNode = new plRegistryPageNode(location, age, page, fDataPath.c_str());
fAllPages.insert(pageNode); fAllPages[location] = pageNode;
return pageNode; return pageNode;
} }
@ -1520,7 +1524,9 @@ plRegistryPageNode* plResManager::CreatePage(const plLocation& location, const c
void plResManager::AddPage(plRegistryPageNode* page) void plResManager::AddPage(plRegistryPageNode* page)
{ {
fAllPages.insert(page); plLocation loc = page->GetPageInfo().GetLocation();
fAllPages[loc] = page;
if (page->IsLoaded()) if (page->IsLoaded())
fLoadedPages.insert(page); fLoadedPages.insert(page);
} }
@ -1627,15 +1633,11 @@ plRegistryPageNode* plResManager::FindPage(const plLocation& location) const
if (fLastFoundPage != nil && fLastFoundPage->GetPageInfo().GetLocation() == location) if (fLastFoundPage != nil && fLastFoundPage->GetPageInfo().GetLocation() == location)
return fLastFoundPage; return fLastFoundPage;
PageSet::const_iterator it; PageMap::const_iterator it = fAllPages.find(location);
for (it = fAllPages.begin(); it != fAllPages.end(); it++) if (it != fAllPages.end())
{ {
const plLocation& pageloc = (*it)->GetPageInfo().GetLocation(); fLastFoundPage = it->second;
if (pageloc == location) return it->second;
{
fLastFoundPage = *it;
return fLastFoundPage;
}
} }
return nil; return nil;
@ -1645,13 +1647,13 @@ plRegistryPageNode* plResManager::FindPage(const plLocation& location) const
plRegistryPageNode* plResManager::FindPage(const char* age, const char* page) const plRegistryPageNode* plResManager::FindPage(const char* age, const char* page) const
{ {
PageSet::const_iterator it; PageMap::const_iterator it;
for (it = fAllPages.begin(); it != fAllPages.end(); it++) for (it = fAllPages.begin(); it != fAllPages.end(); ++it)
{ {
const plPageInfo& info = (*it)->GetPageInfo(); const plPageInfo& info = (it->second)->GetPageInfo();
if (hsStrCaseEQ(info.GetAge(), age) && if (hsStrCaseEQ(info.GetAge(), age) &&
hsStrCaseEQ(info.GetPage(), page)) hsStrCaseEQ(info.GetPage(), page))
return *it; return it->second;
} }
return nil; return nil;
@ -1786,13 +1788,14 @@ hsBool plResManager::IterateAllPages(plRegistryPageIterator* iterator)
{ {
ILockPages(); ILockPages();
PageSet::const_iterator it; PageMap::const_iterator it;
for (it = fAllPages.begin(); it != fAllPages.end(); it++) for (it = fAllPages.begin(); it != fAllPages.end(); ++it)
{ {
plRegistryPageNode* page = *it; if (it->first == plLocation::kGlobalFixedLoc)
if (page->GetPageInfo().GetLocation() == plLocation::kGlobalFixedLoc)
continue; continue;
plRegistryPageNode* page = it->second;
if (!iterator->EatPage(page)) if (!iterator->EatPage(page))
{ {
IUnlockPages(); IUnlockPages();
@ -1830,10 +1833,10 @@ void plResManager::IUnlockPages()
fLoadedPages.clear(); fLoadedPages.clear();
PageSet::const_iterator it; PageMap::const_iterator it;
for (it = fAllPages.begin(); it != fAllPages.end(); it++) for (it = fAllPages.begin(); it != fAllPages.end(); ++it)
{ {
plRegistryPageNode* page = *it; plRegistryPageNode* page = it->second;
if (page->IsLoaded()) if (page->IsLoaded())
fLoadedPages.insert(page); fLoadedPages.insert(page);
} }

3
Sources/Plasma/PubUtilLib/plResMgr/plResManager.h
View File

@ -235,7 +235,8 @@ protected:
hsBool fPagesNeedCleanup; // True if something modified the page lists while they were locked. hsBool fPagesNeedCleanup; // True if something modified the page lists while they were locked.
typedef std::set<plRegistryPageNode*> PageSet; typedef std::set<plRegistryPageNode*> PageSet;
PageSet fAllPages; // All the pages, loaded or not typedef std::map<plLocation, plRegistryPageNode*> PageMap;
PageMap fAllPages; // All the pages, loaded or not
PageSet fLoadedPages; // Just the loaded pages PageSet fLoadedPages; // Just the loaded pages
mutable plRegistryPageNode* fLastFoundPage; mutable plRegistryPageNode* fLastFoundPage;