FileManager:

- set the 'StatSysCallCache' object using a setter method instead of
  FileManager's constructor. This allows the cache to be installed after the
  FileManager object is created.
- Add 'file mode' to FileEntry (useful for stat caching)


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@64351 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 19 insertions, 11 deletions

diff --git a/include/clang/Basic/FileManager.h b/include/clang/Basic/FileManager.h
index 7f733fb9ff..5a1aaaa9f1 100644
--- a/include/clang/Basic/FileManager.h
+++ b/include/clang/Basic/FileManager.h
@@ -15,6 +15,7 @@
 #define LLVM_CLANG_FILEMANAGER_H
 
 #include "llvm/ADT/StringMap.h"
+#include "llvm/ADT/OwningPtr.h"
 #include "llvm/Bitcode/SerializationFwd.h"
 #include "llvm/Support/Allocator.h"
 #include <map>
@@ -47,11 +48,13 @@ class FileEntry {
   unsigned UID;               // A unique (small) ID for the file.
   dev_t Device;               // ID for the device containing the file.
   ino_t Inode;                // Inode number for the file.
+  mode_t FileMode;            // The file mode as returned by 'stat'.
   friend class FileManager;
 public:
-  FileEntry(dev_t device, ino_t inode) : Name(0), Device(device), Inode(inode){}
+  FileEntry(dev_t device, ino_t inode, mode_t m)
+    : Name(0), Device(device), Inode(inode), FileMode(m) {}
   // Add a default constructor for use with llvm::StringMap
-  FileEntry() : Name(0), Device(0), Inode(0) {}
+  FileEntry() : Name(0), Device(0), Inode(0), FileMode(0) {}
   
   const char *getName() const { return Name; }
   off_t getSize() const { return Size; }
@@ -59,6 +62,7 @@ public:
   ino_t getInode() const { return Inode; }
   dev_t getDevice() const { return Device; }
   time_t getModificationTime() const { return ModTime; }
+  mode_t getFileMode() const { return FileMode; }
   
   /// getDir - Return the directory the file lives in.
   ///
@@ -108,15 +112,21 @@ class FileManager {
   unsigned NumDirCacheMisses, NumFileCacheMisses;
   
   // Caching.
-  StatSysCallCache *StatCache;
+  llvm::OwningPtr<StatSysCallCache> StatCache;
+
   int stat_cached(const char* path, struct stat* buf) {
-    return StatCache ? StatCache->stat(path, buf) : stat(path, buf);
+    return StatCache.get() ? StatCache->stat(path, buf) : stat(path, buf);
   }
   
 public:
-  FileManager(StatSysCallCache *statCache = 0);
+  FileManager();
   ~FileManager();
 
+  /// setStatCache - Installs the provided StatSysCallCache object within
+  ///  the FileManager.  Ownership of this object is transferred to the
+  ///  FileManager.
+  void setStatCache(StatSysCallCache *statCache) { StatCache.reset(statCache); }
+  
   /// getDirectory - Lookup, cache, and verify the specified directory.  This
   /// returns null if the directory doesn't exist.
   /// 
diff --git a/lib/Basic/FileManager.cpp b/lib/Basic/FileManager.cpp
index 2db605415d..773d366675 100644
--- a/lib/Basic/FileManager.cpp
+++ b/lib/Basic/FileManager.cpp
@@ -122,7 +122,8 @@ public:
     return
       const_cast<FileEntry&>(
                     *UniqueFiles.insert(FileEntry(StatBuf.st_dev,
-                                                  StatBuf.st_ino)).first);
+                                                  StatBuf.st_ino,
+                                                  StatBuf.st_mode)).first);
   }
 
   size_t size() { return UniqueFiles.size(); }
@@ -134,11 +135,10 @@ public:
 // Common logic.
 //===----------------------------------------------------------------------===//
 
-FileManager::FileManager(StatSysCallCache* statCache)
+FileManager::FileManager()
   : UniqueDirs(*new UniqueDirContainer),
     UniqueFiles(*new UniqueFileContainer),
-    DirEntries(64), FileEntries(64), NextFileUID(0),
-    StatCache(statCache) {
+    DirEntries(64), FileEntries(64), NextFileUID(0) {
   NumDirLookups = NumFileLookups = 0;
   NumDirCacheMisses = NumFileCacheMisses = 0;
 }
@@ -146,10 +146,8 @@ FileManager::FileManager(StatSysCallCache* statCache)
 FileManager::~FileManager() {
   delete &UniqueDirs;
   delete &UniqueFiles;
-  delete StatCache;
 }
 
-
 /// getDirectory - Lookup, cache, and verify the specified directory.  This
 /// returns null if the directory doesn't exist.
 ///