replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Switch DirEntries over to using a CStringMap. This speeds it up 

'clang -Eonly INPUTS/Cocoa_h.m' by about 4%.

llvm-svn: 39082
This commit is contained in:
Chris Lattner 2006-10-30 03:06:54 +00:00
parent 8b1e848a04
commit af65375944
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
clang/Basic/FileManager.cpp
View File

@ -25,24 +25,30 @@ using namespace clang;
// FIXME: Enhance libsystem to support inode and other fields.
#include <sys/stat.h>
/// NON_EXISTANT_DIR - A special value distinct from null that is used to
/// represent a dir name that doesn't exist on the disk.
#define NON_EXISTANT_DIR reinterpret_cast<DirectoryEntry*>((intptr_t)-1)
/// getDirectory - Lookup, cache, and verify the specified directory. This
/// returns null if the directory doesn't exist.
///
const DirectoryEntry *FileManager::getDirectory(const std::string &Filename) {
++NumDirLookups;
DirectoryEntry *&NamedDirEnt =
DirEntries.GetOrCreateValue(&Filename[0], &Filename[0] + Filename.size());
// See if there is already an entry in the map.
std::map<std::string, DirectoryEntry*>::iterator I =
DirEntries.lower_bound(Filename);
if (I != DirEntries.end() && I->first == Filename)
return I->second;
if (NamedDirEnt)
return NamedDirEnt == NON_EXISTANT_DIR ? 0 : NamedDirEnt;
++NumDirCacheMisses;
// By default, zero initialize it.
DirectoryEntry *&Ent =
DirEntries.insert(I, std::make_pair(Filename, (DirectoryEntry*)0))->second;
// By default, initialize it to invalid.
NamedDirEnt = NON_EXISTANT_DIR;
// Nope, there isn't. Check to see if the directory exists.
// Check to see if the directory exists.
struct stat StatBuf;
if (stat(Filename.c_str(), &StatBuf) || // Error stat'ing.
!S_ISDIR(StatBuf.st_mode)) // Not a directory?
@ -54,11 +60,11 @@ const DirectoryEntry *FileManager::getDirectory(const std::string &Filename) {
UniqueDirs[std::make_pair(StatBuf.st_dev, StatBuf.st_ino)];
if (UDE.getName()[0]) // Already have an entry with this inode, return it.
return Ent = &UDE;
return NamedDirEnt = &UDE;
// Otherwise, we don't have this directory yet, add it.
UDE.Name = Filename;
return Ent = &UDE;
return NamedDirEnt = &UDE;
}
/// getFile - Lookup, cache, and verify the specified file. This returns null

3
clang/include/clang/Basic/FileManager.h
View File

@ -14,6 +14,7 @@
#ifndef LLVM_CLANG_FILEMANAGER_H
#define LLVM_CLANG_FILEMANAGER_H
#include "llvm/ADT/CStringMap.h"
#include <map>
#include <string>
// FIXME: Enhance libsystem to support inode and other fields in stat.
@ -70,7 +71,7 @@ class FileManager {
/// DirEntries/FileEntries - This is a cache of directory/file entries we have
/// looked up. The actual Entry is owned by UniqueFiles/UniqueDirs above.
///
std::map<std::string, DirectoryEntry*> DirEntries;
CStringMap<DirectoryEntry*> DirEntries;
std::map<std::string, FileEntry*> FileEntries;
/// NextFileUID - Each FileEntry we create is assigned a unique ID #.