forked from OSchip/llvm-project
Avoid storing a directory name in both the DirEntries map keys and in the
UniqueDirs value. Instead, just have the UniqueDirs value contain a pointer to the key in the DirEntries map. llvm-svn: 39083
This commit is contained in:
parent
af65375944
commit
a85cbe28a0
|
@ -59,11 +59,12 @@ const DirectoryEntry *FileManager::getDirectory(const std::string &Filename) {
|
||||||
DirectoryEntry &UDE =
|
DirectoryEntry &UDE =
|
||||||
UniqueDirs[std::make_pair(StatBuf.st_dev, StatBuf.st_ino)];
|
UniqueDirs[std::make_pair(StatBuf.st_dev, StatBuf.st_ino)];
|
||||||
|
|
||||||
if (UDE.getName()[0]) // Already have an entry with this inode, return it.
|
if (UDE.getName()) // Already have an entry with this inode, return it.
|
||||||
return NamedDirEnt = &UDE;
|
return NamedDirEnt = &UDE;
|
||||||
|
|
||||||
// Otherwise, we don't have this directory yet, add it.
|
// Otherwise, we don't have this directory yet, add it. We use the string
|
||||||
UDE.Name = Filename;
|
// key from the DirEntries map as the string.
|
||||||
|
UDE.Name = DirEntries.GetKeyForValueInMap(NamedDirEnt);
|
||||||
return NamedDirEnt = &UDE;
|
return NamedDirEnt = &UDE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -27,11 +27,11 @@ class FileManager;
|
||||||
/// DirectoryEntry - Cached information about one directory on the disk.
|
/// DirectoryEntry - Cached information about one directory on the disk.
|
||||||
///
|
///
|
||||||
class DirectoryEntry {
|
class DirectoryEntry {
|
||||||
std::string Name; // Name of the directory.
|
const char *Name; // Name of the directory.
|
||||||
friend class FileManager;
|
friend class FileManager;
|
||||||
public:
|
public:
|
||||||
DirectoryEntry() {}
|
DirectoryEntry() : Name(0) {}
|
||||||
const char *getName() const { return Name.c_str(); }
|
const char *getName() const { return Name; }
|
||||||
};
|
};
|
||||||
|
|
||||||
/// FileEntry - Cached information about one file on the disk.
|
/// FileEntry - Cached information about one file on the disk.
|
||||||
|
|
Loading…
Reference in New Issue