From dda6f52db192491cd828db5d4fb56be41d4897ac Mon Sep 17 00:00:00 2001 From: Ben Langmuir Date: Thu, 27 Feb 2014 19:20:35 +0000 Subject: [PATCH] Revert "Remove constructors from FileEntry that prevent owning resources" This reverts commit r202420, which broke the build. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@202421 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Basic/FileManager.h | 26 ++++++++++---- lib/Basic/FileManager.cpp | 60 ++++++++++++++++++++++++------- 2 files changed, 68 insertions(+), 18 deletions(-) diff --git a/include/clang/Basic/FileManager.h b/include/clang/Basic/FileManager.h index 616f9846a2..bd85318e2f 100644 --- a/include/clang/Basic/FileManager.h +++ b/include/clang/Basic/FileManager.h @@ -27,7 +27,6 @@ #include "llvm/Support/Allocator.h" // FIXME: Enhance libsystem to support inode and other fields in stat. #include -#include #ifdef _MSC_VER typedef unsigned short mode_t; @@ -77,15 +76,27 @@ class FileEntry { File.reset(0); // rely on destructor to close File } - FileEntry(const FileEntry &) LLVM_DELETED_FUNCTION; - void operator=(const FileEntry &) LLVM_DELETED_FUNCTION; - public: + FileEntry(llvm::sys::fs::UniqueID UniqueID, bool IsNamedPipe, bool InPCH) + : Name(0), UniqueID(UniqueID), IsNamedPipe(IsNamedPipe), InPCH(InPCH), + IsValid(false) + {} + // Add a default constructor for use with llvm::StringMap FileEntry() : Name(0), UniqueID(0, 0), IsNamedPipe(false), InPCH(false), IsValid(false) {} + FileEntry(const FileEntry &FE) { + memcpy(this, &FE, sizeof(FE)); + assert(!File && "Cannot copy a file-owning FileEntry"); + } + + void operator=(const FileEntry &FE) { + memcpy(this, &FE, sizeof(FE)); + assert(!File && "Cannot assign a file-owning FileEntry"); + } + const char *getName() const { return Name; } bool isValid() const { return IsValid; } off_t getSize() const { return Size; } @@ -117,11 +128,14 @@ class FileManager : public RefCountedBase { IntrusiveRefCntPtr FS; FileSystemOptions FileSystemOpts; + class UniqueDirContainer; + class UniqueFileContainer; + /// \brief Cache for existing real directories. - std::map UniqueRealDirs; + UniqueDirContainer &UniqueRealDirs; /// \brief Cache for existing real files. - std::map UniqueRealFiles; + UniqueFileContainer &UniqueRealFiles; /// \brief The virtual directories that we have allocated. /// diff --git a/lib/Basic/FileManager.cpp b/lib/Basic/FileManager.cpp index f7e566b977..d019686b77 100644 --- a/lib/Basic/FileManager.cpp +++ b/lib/Basic/FileManager.cpp @@ -43,6 +43,41 @@ using namespace clang; /// represent a filename that doesn't exist on the disk. #define NON_EXISTENT_FILE reinterpret_cast((intptr_t)-1) + +class FileManager::UniqueDirContainer { + /// UniqueDirs - Cache from ID's to existing directories/files. + std::map UniqueDirs; + +public: + /// getDirectory - Return an existing DirectoryEntry with the given + /// ID's if there is already one; otherwise create and return a + /// default-constructed DirectoryEntry. + DirectoryEntry &getDirectory(const llvm::sys::fs::UniqueID &UniqueID) { + return UniqueDirs[UniqueID]; + } + + size_t size() const { return UniqueDirs.size(); } +}; + +class FileManager::UniqueFileContainer { + /// UniqueFiles - Cache from ID's to existing directories/files. + std::set UniqueFiles; + +public: + /// getFile - Return an existing FileEntry with the given ID's if + /// there is already one; otherwise create and return a + /// default-constructed FileEntry. + FileEntry &getFile(llvm::sys::fs::UniqueID UniqueID, bool IsNamedPipe, + bool InPCH) { + return const_cast( + *UniqueFiles.insert(FileEntry(UniqueID, IsNamedPipe, InPCH)).first); + } + + size_t size() const { return UniqueFiles.size(); } + + void erase(const FileEntry *Entry) { UniqueFiles.erase(*Entry); } +}; + //===----------------------------------------------------------------------===// // Common logic. //===----------------------------------------------------------------------===// @@ -50,6 +85,8 @@ using namespace clang; FileManager::FileManager(const FileSystemOptions &FSO, IntrusiveRefCntPtr FS) : FS(FS), FileSystemOpts(FSO), + UniqueRealDirs(*new UniqueDirContainer()), + UniqueRealFiles(*new UniqueFileContainer()), SeenDirEntries(64), SeenFileEntries(64), NextFileUID(0) { NumDirLookups = NumFileLookups = 0; NumDirCacheMisses = NumFileCacheMisses = 0; @@ -61,6 +98,8 @@ FileManager::FileManager(const FileSystemOptions &FSO, } FileManager::~FileManager() { + delete &UniqueRealDirs; + delete &UniqueRealFiles; for (unsigned i = 0, e = VirtualFileEntries.size(); i != e; ++i) delete VirtualFileEntries[i]; for (unsigned i = 0, e = VirtualDirectoryEntries.size(); i != e; ++i) @@ -204,7 +243,8 @@ const DirectoryEntry *FileManager::getDirectory(StringRef DirName, // same inode (this occurs on Unix-like systems when one dir is // symlinked to another, for example) or the same path (on // Windows). - DirectoryEntry &UDE = UniqueRealDirs[Data.UniqueID]; + DirectoryEntry &UDE = + UniqueRealDirs.getDirectory(Data.UniqueID); NamedDirEnt.setValue(&UDE); if (!UDE.getName()) { @@ -270,7 +310,8 @@ const FileEntry *FileManager::getFile(StringRef Filename, bool openFile, // It exists. See if we have already opened a file with the same inode. // This occurs when one dir is symlinked to another, for example. - FileEntry &UFE = UniqueRealFiles[Data.UniqueID]; + FileEntry &UFE = + UniqueRealFiles.getFile(Data.UniqueID, Data.IsNamedPipe, Data.InPCH); NamedFileEnt.setValue(&UFE); if (UFE.isValid()) { // Already have an entry with this inode, return it. @@ -281,15 +322,14 @@ const FileEntry *FileManager::getFile(StringRef Filename, bool openFile, return &UFE; } - // Otherwise, we don't have this file yet, add it. + // Otherwise, we don't have this directory yet, add it. + // FIXME: Change the name to be a char* that points back to the + // 'SeenFileEntries' key. UFE.Name = InterndFileName; UFE.Size = Data.Size; UFE.ModTime = Data.ModTime; UFE.Dir = DirInfo; UFE.UID = NextFileUID++; - UFE.UniqueID = Data.UniqueID; - UFE.IsNamedPipe = Data.IsNamedPipe; - UFE.InPCH = Data.InPCH; UFE.File.reset(F); UFE.IsValid = true; return &UFE; @@ -330,7 +370,7 @@ FileManager::getVirtualFile(StringRef Filename, off_t Size, if (getStatValue(InterndFileName, Data, true, 0) == 0) { Data.Size = Size; Data.ModTime = ModificationTime; - UFE = &UniqueRealFiles[Data.UniqueID]; + UFE = &UniqueRealFiles.getFile(Data.UniqueID, Data.IsNamedPipe, Data.InPCH); NamedFileEnt.setValue(UFE); @@ -343,10 +383,6 @@ FileManager::getVirtualFile(StringRef Filename, off_t Size, // If we already have an entry with this inode, return it. if (UFE->isValid()) return UFE; - - UFE->UniqueID = Data.UniqueID; - UFE->IsNamedPipe = Data.IsNamedPipe; - UFE->InPCH = Data.InPCH; } if (!UFE) { @@ -473,7 +509,7 @@ void FileManager::invalidateCache(const FileEntry *Entry) { // FileEntry invalidation should not block future optimizations in the file // caches. Possible alternatives are cache truncation (invalidate last N) or // invalidation of the whole cache. - UniqueRealFiles.erase(Entry->getUniqueID()); + UniqueRealFiles.erase(Entry); } -- 2.40.0