Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

remove the unordered_map from ISOFileSystem

Browse source
This commit is contained in:
KentuckyCompass 2015-09-12 21:12:11 -07:00
parent c7d24407ee
commit 8c72cb17b1
2 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Core/FileSystems/ISOFileSystem.cpp
View file

@ -297,11 +297,6 @@ void ISOFileSystem::ReadDirectory(u32 startsector, u32 dirsize, TreeEntry *root,
root->children.push_back(e);
}
}
root->fastChildren.reserve(root->children.size());
for (TreeEntry *e : root->children) {
root->fastChildren[e->name] = e;
}
}
ISOFileSystem::TreeEntry *ISOFileSystem::GetFromPath(const std::string &path, bool catchError)
@ -338,14 +333,20 @@ ISOFileSystem::TreeEntry *ISOFileSystem::GetFromPath(const std::string &path, bo
nextSlashIndex = pathLength;
const std::string firstPathComponent = path.substr(pathIndex, nextSlashIndex - pathIndex);
auto child = e->fastChildren.find(firstPathComponent);
if (child != e->fastChildren.end()) {
//yay we got it
ne = child->second;
name = child->first;
for (size_t i = 0; i < e->children.size(); i++)
{
const std::string &n = e->children[i]->name;
if (firstPathComponent == n)
{
//yay we got it
ne = e->children[i];
name = n;
break;
}
}
}
if (ne)
{
e = ne;

6
Core/FileSystems/ISOFileSystem.h
View file

@ -19,7 +19,6 @@
#include <map>
#include <list>
#include <unordered_map>
#include "FileSystem.h"
@ -69,12 +68,7 @@ private:
bool isDirectory;
TreeEntry *parent;
// slow lookup, in PSP-accurate sorting order
std::vector<TreeEntry *> children;
// fast lookup, in undefined order
std::unordered_map<std::string, TreeEntry *> fastChildren;
};
struct OpenFileEntry