<div dir="ltr">Hi Rafael,<div><br></div><div>MSan reported an error after this commit, which I hopefully fixed in r187647.</div><div>Default PPRegion ctor didn't initialize UniqueID, which could lead to weird comparison results.</div>
<div>Another possible fix would be to make default UniqueID ctor initialize the members with zeroes, but I didn't like it,</div><div>as UniqueID is essentially a pair, and zeroes might be valid values on some platforms. Could you check if this looks fine to you?</div>
</div><div class="gmail_extra"><br><br><div class="gmail_quote">On Fri, Aug 2, 2013 at 1:42 AM, Rafael Espindola <span dir="ltr"><<a href="mailto:rafael.espindola@gmail.com" target="_blank">rafael.espindola@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: rafael<br>
Date: Thu Aug 1 16:42:11 2013<br>
New Revision: 187619<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=187619&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=187619&view=rev</a><br>
Log:<br>
Use llvm::sys::fs::UniqueID for windows and unix.<br>
<br>
This unifies the unix and windows versions of FileManager::UniqueDirContainer<br>
and FileManager::UniqueFileContainer by using UniqueID.<br>
<br>
We cannot just replace "struct stat" with llvm::sys::fs::file_status, since we<br>
want to be able to construct fake ones, and file_status has different members<br>
on unix and windows.<br>
<br>
What the patch does is:<br>
<br>
* Record only the information that clang is actually using.<br>
* Use llvm::sys::fs::status instead of stat and fstat.<br>
* Use llvm::sys::fs::UniqueID<br>
* Delete the old windows versions of UniqueDirContainer and<br>
UniqueFileContainer since the "unix" one now works on windows too.<br>
<br>
Modified:<br>
cfe/trunk/include/clang/Basic/FileManager.h<br>
cfe/trunk/include/clang/Basic/FileSystemStatCache.h<br>
cfe/trunk/lib/Basic/FileManager.cpp<br>
cfe/trunk/lib/Basic/FileSystemStatCache.cpp<br>
cfe/trunk/lib/Frontend/CacheTokens.cpp<br>
cfe/trunk/lib/Frontend/TextDiagnostic.cpp<br>
cfe/trunk/lib/Lex/PTHLexer.cpp<br>
cfe/trunk/tools/libclang/CIndex.cpp<br>
cfe/trunk/tools/libclang/Indexing.cpp<br>
cfe/trunk/unittests/Basic/FileManagerTest.cpp<br>
<br>
Modified: cfe/trunk/include/clang/Basic/FileManager.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/FileManager.h?rev=187619&r1=187618&r2=187619&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/FileManager.h?rev=187619&r1=187618&r2=187619&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Basic/FileManager.h (original)<br>
+++ cfe/trunk/include/clang/Basic/FileManager.h Thu Aug 1 16:42:11 2013<br>
@@ -63,9 +63,9 @@ class FileEntry {<br>
time_t ModTime; // Modification time of file.<br>
const DirectoryEntry *Dir; // Directory file lives in.<br>
unsigned UID; // A unique (small) ID for the file.<br>
- dev_t Device; // ID for the device containing the file.<br>
- ino_t Inode; // Inode number for the file.<br>
- mode_t FileMode; // The file mode as returned by 'stat'.<br>
+ llvm::sys::fs::UniqueID UniqueID;<br>
+ bool IsNamedPipe;<br>
+ bool InPCH;<br>
<br>
/// FD - The file descriptor for the file entry if it is opened and owned<br>
/// by the FileEntry. If not, this is set to -1.<br>
@@ -73,10 +73,12 @@ class FileEntry {<br>
friend class FileManager;<br>
<br>
public:<br>
- FileEntry(dev_t device, ino_t inode, mode_t m)<br>
- : Name(0), Device(device), Inode(inode), FileMode(m), FD(-1) {}<br>
+ FileEntry(llvm::sys::fs::UniqueID UniqueID, bool IsNamedPipe, bool InPCH)<br>
+ : Name(0), UniqueID(UniqueID), IsNamedPipe(IsNamedPipe), InPCH(InPCH),<br>
+ FD(-1) {}<br>
// Add a default constructor for use with llvm::StringMap<br>
- FileEntry() : Name(0), Device(0), Inode(0), FileMode(0), FD(-1) {}<br>
+ FileEntry()<br>
+ : Name(0), UniqueID(0, 0), IsNamedPipe(false), InPCH(false), FD(-1) {}<br>
<br>
FileEntry(const FileEntry &FE) {<br>
memcpy(this, &FE, sizeof(FE));<br>
@@ -93,23 +95,22 @@ public:<br>
const char *getName() const { return Name; }<br>
off_t getSize() const { return Size; }<br>
unsigned getUID() const { return UID; }<br>
- ino_t getInode() const { return Inode; }<br>
- dev_t getDevice() const { return Device; }<br>
+ const llvm::sys::fs::UniqueID &getUniqueID() const { return UniqueID; }<br>
+ bool isInPCH() const { return InPCH; }<br>
time_t getModificationTime() const { return ModTime; }<br>
- mode_t getFileMode() const { return FileMode; }<br>
<br>
/// \brief Return the directory the file lives in.<br>
const DirectoryEntry *getDir() const { return Dir; }<br>
<br>
- bool operator<(const FileEntry &RHS) const {<br>
- return Device < RHS.Device || (Device == RHS.Device && Inode < RHS.Inode);<br>
- }<br>
+ bool operator<(const FileEntry &RHS) const { return UniqueID < RHS.UniqueID; }<br>
<br>
/// \brief Check whether the file is a named pipe (and thus can't be opened by<br>
/// the native FileManager methods).<br>
- bool isNamedPipe() const;<br>
+ bool isNamedPipe() const { return IsNamedPipe; }<br>
};<br>
<br>
+struct FileData;<br>
+<br>
/// \brief Implements support for file system lookup, file system caching,<br>
/// and directory search management.<br>
///<br>
@@ -170,8 +171,8 @@ class FileManager : public RefCountedBas<br>
// Caching.<br>
OwningPtr<FileSystemStatCache> StatCache;<br>
<br>
- bool getStatValue(const char *Path, struct stat &StatBuf,<br>
- bool isFile, int *FileDescriptor);<br>
+ bool getStatValue(const char *Path, FileData &Data, bool isFile,<br>
+ int *FileDescriptor);<br>
<br>
/// Add all ancestors of the given path (pointing to either a file<br>
/// or a directory) as virtual directories.<br>
<br>
Modified: cfe/trunk/include/clang/Basic/FileSystemStatCache.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/FileSystemStatCache.h?rev=187619&r1=187618&r2=187619&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/FileSystemStatCache.h?rev=187619&r1=187618&r2=187619&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Basic/FileSystemStatCache.h (original)<br>
+++ cfe/trunk/include/clang/Basic/FileSystemStatCache.h Thu Aug 1 16:42:11 2013<br>
@@ -18,11 +18,21 @@<br>
#include "clang/Basic/LLVM.h"<br>
#include "llvm/ADT/OwningPtr.h"<br>
#include "llvm/ADT/StringMap.h"<br>
+#include "llvm/Support/FileSystem.h"<br>
#include <sys/stat.h><br>
#include <sys/types.h><br>
<br>
namespace clang {<br>
<br>
+struct FileData {<br>
+ uint64_t Size;<br>
+ time_t ModTime;<br>
+ llvm::sys::fs::UniqueID UniqueID;<br>
+ bool IsDirectory;<br>
+ bool IsNamedPipe;<br>
+ bool InPCH;<br>
+};<br>
+<br>
/// \brief Abstract interface for introducing a FileManager cache for 'stat'<br>
/// system calls, which is used by precompiled and pretokenized headers to<br>
/// improve performance.<br>
@@ -49,10 +59,9 @@ public:<br>
/// success for directories (not files). On a successful file lookup, the<br>
/// implementation can optionally fill in FileDescriptor with a valid<br>
/// descriptor and the client guarantees that it will close it.<br>
- static bool get(const char *Path, struct stat &StatBuf,<br>
- bool isFile, int *FileDescriptor, FileSystemStatCache *Cache);<br>
-<br>
-<br>
+ static bool get(const char *Path, FileData &Data, bool isFile,<br>
+ int *FileDescriptor, FileSystemStatCache *Cache);<br>
+<br>
/// \brief Sets the next stat call cache in the chain of stat caches.<br>
/// Takes ownership of the given stat cache.<br>
void setNextStatCache(FileSystemStatCache *Cache) {<br>
@@ -68,18 +77,18 @@ public:<br>
FileSystemStatCache *takeNextStatCache() { return NextStatCache.take(); }<br>
<br>
protected:<br>
- virtual LookupResult getStat(const char *Path, struct stat &StatBuf,<br>
- bool isFile, int *FileDescriptor) = 0;<br>
+ virtual LookupResult getStat(const char *Path, FileData &Data, bool isFile,<br>
+ int *FileDescriptor) = 0;<br>
<br>
- LookupResult statChained(const char *Path, struct stat &StatBuf,<br>
- bool isFile, int *FileDescriptor) {<br>
+ LookupResult statChained(const char *Path, FileData &Data, bool isFile,<br>
+ int *FileDescriptor) {<br>
if (FileSystemStatCache *Next = getNextStatCache())<br>
- return Next->getStat(Path, StatBuf, isFile, FileDescriptor);<br>
-<br>
+ return Next->getStat(Path, Data, isFile, FileDescriptor);<br>
+<br>
// If we hit the end of the list of stat caches to try, just compute and<br>
// return it without a cache.<br>
- return get(Path, StatBuf,<br>
- isFile, FileDescriptor, 0) ? CacheMissing : CacheExists;<br>
+ return get(Path, Data, isFile, FileDescriptor, 0) ? CacheMissing<br>
+ : CacheExists;<br>
}<br>
};<br>
<br>
@@ -89,16 +98,16 @@ protected:<br>
class MemorizeStatCalls : public FileSystemStatCache {<br>
public:<br>
/// \brief The set of stat() calls that have been seen.<br>
- llvm::StringMap<struct stat, llvm::BumpPtrAllocator> StatCalls;<br>
-<br>
- typedef llvm::StringMap<struct stat, llvm::BumpPtrAllocator>::const_iterator<br>
+ llvm::StringMap<FileData, llvm::BumpPtrAllocator> StatCalls;<br>
+<br>
+ typedef llvm::StringMap<FileData, llvm::BumpPtrAllocator>::const_iterator<br>
iterator;<br>
-<br>
+<br>
iterator begin() const { return StatCalls.begin(); }<br>
iterator end() const { return StatCalls.end(); }<br>
-<br>
- virtual LookupResult getStat(const char *Path, struct stat &StatBuf,<br>
- bool isFile, int *FileDescriptor);<br>
+<br>
+ virtual LookupResult getStat(const char *Path, FileData &Data, bool isFile,<br>
+ int *FileDescriptor);<br>
};<br>
<br>
} // end namespace clang<br>
<br>
Modified: cfe/trunk/lib/Basic/FileManager.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/FileManager.cpp?rev=187619&r1=187618&r2=187619&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/FileManager.cpp?rev=187619&r1=187618&r2=187619&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Basic/FileManager.cpp (original)<br>
+++ cfe/trunk/lib/Basic/FileManager.cpp Thu Aug 1 16:42:11 2013<br>
@@ -63,91 +63,16 @@ FileEntry::~FileEntry() {<br>
if (FD != -1) ::close(FD);<br>
}<br>
<br>
-bool FileEntry::isNamedPipe() const {<br>
- return S_ISFIFO(FileMode);<br>
-}<br>
-<br>
-//===----------------------------------------------------------------------===//<br>
-// Windows.<br>
-//===----------------------------------------------------------------------===//<br>
-<br>
-#ifdef LLVM_ON_WIN32<br>
-<br>
-namespace {<br>
- static std::string GetFullPath(const char *relPath) {<br>
- char *absPathStrPtr = _fullpath(NULL, relPath, 0);<br>
- assert(absPathStrPtr && "_fullpath() returned NULL!");<br>
-<br>
- std::string absPath(absPathStrPtr);<br>
-<br>
- free(absPathStrPtr);<br>
- return absPath;<br>
- }<br>
-}<br>
-<br>
-class FileManager::UniqueDirContainer {<br>
- /// UniqueDirs - Cache from full path to existing directories/files.<br>
- ///<br>
- llvm::StringMap<DirectoryEntry> UniqueDirs;<br>
-<br>
-public:<br>
- /// getDirectory - Return an existing DirectoryEntry with the given<br>
- /// name if there is already one; otherwise create and return a<br>
- /// default-constructed DirectoryEntry.<br>
- DirectoryEntry &getDirectory(const char *Name,<br>
- const struct stat & /*StatBuf*/) {<br>
- std::string FullPath(GetFullPath(Name));<br>
- return UniqueDirs.GetOrCreateValue(FullPath).getValue();<br>
- }<br>
-<br>
- size_t size() const { return UniqueDirs.size(); }<br>
-};<br>
-<br>
-class FileManager::UniqueFileContainer {<br>
- /// UniqueFiles - Cache from full path to existing directories/files.<br>
- ///<br>
- llvm::StringMap<FileEntry, llvm::BumpPtrAllocator> UniqueFiles;<br>
-<br>
-public:<br>
- /// getFile - Return an existing FileEntry with the given name if<br>
- /// there is already one; otherwise create and return a<br>
- /// default-constructed FileEntry.<br>
- FileEntry &getFile(const char *Name, const struct stat & /*StatBuf*/) {<br>
- std::string FullPath(GetFullPath(Name));<br>
-<br>
- // Lowercase string because Windows filesystem is case insensitive.<br>
- FullPath = StringRef(FullPath).lower();<br>
- return UniqueFiles.GetOrCreateValue(FullPath).getValue();<br>
- }<br>
-<br>
- size_t size() const { return UniqueFiles.size(); }<br>
-<br>
- void erase(const FileEntry *Entry) {<br>
- std::string FullPath(GetFullPath(Entry->getName()));<br>
-<br>
- // Lowercase string because Windows filesystem is case insensitive.<br>
- FullPath = StringRef(FullPath).lower();<br>
- UniqueFiles.erase(FullPath);<br>
- }<br>
-};<br>
-<br>
-//===----------------------------------------------------------------------===//<br>
-// Unix-like Systems.<br>
-//===----------------------------------------------------------------------===//<br>
-<br>
-#else<br>
-<br>
class FileManager::UniqueDirContainer {<br>
/// UniqueDirs - Cache from ID's to existing directories/files.<br>
- std::map<std::pair<dev_t, ino_t>, DirectoryEntry> UniqueDirs;<br>
+ std::map<llvm::sys::fs::UniqueID, DirectoryEntry> UniqueDirs;<br>
<br>
public:<br>
/// getDirectory - Return an existing DirectoryEntry with the given<br>
/// ID's if there is already one; otherwise create and return a<br>
/// default-constructed DirectoryEntry.<br>
- DirectoryEntry &getDirectory(const char * /*Name*/,<br>
- const struct stat &StatBuf) {<br>
- return UniqueDirs[std::make_pair(StatBuf.st_dev, StatBuf.st_ino)];<br>
+ DirectoryEntry &getDirectory(const llvm::sys::fs::UniqueID &UniqueID) {<br>
+ return UniqueDirs[UniqueID];<br>
}<br>
<br>
size_t size() const { return UniqueDirs.size(); }<br>
@@ -161,12 +86,10 @@ public:<br>
/// getFile - Return an existing FileEntry with the given ID's if<br>
/// there is already one; otherwise create and return a<br>
/// default-constructed FileEntry.<br>
- FileEntry &getFile(const char * /*Name*/, const struct stat &StatBuf) {<br>
- return<br>
- const_cast<FileEntry&>(<br>
- *UniqueFiles.insert(FileEntry(StatBuf.st_dev,<br>
- StatBuf.st_ino,<br>
- StatBuf.st_mode)).first);<br>
+ FileEntry &getFile(llvm::sys::fs::UniqueID UniqueID, bool IsNamedPipe,<br>
+ bool InPCH) {<br>
+ return const_cast<FileEntry &>(<br>
+ *UniqueFiles.insert(FileEntry(UniqueID, IsNamedPipe, InPCH)).first);<br>
}<br>
<br>
size_t size() const { return UniqueFiles.size(); }<br>
@@ -174,8 +97,6 @@ public:<br>
void erase(const FileEntry *Entry) { UniqueFiles.erase(*Entry); }<br>
};<br>
<br>
-#endif<br>
-<br>
//===----------------------------------------------------------------------===//<br>
// Common logic.<br>
//===----------------------------------------------------------------------===//<br>
@@ -323,8 +244,8 @@ const DirectoryEntry *FileManager::getDi<br>
const char *InterndDirName = NamedDirEnt.getKeyData();<br>
<br>
// Check to see if the directory exists.<br>
- struct stat StatBuf;<br>
- if (getStatValue(InterndDirName, StatBuf, false, 0/*directory lookup*/)) {<br>
+ FileData Data;<br>
+ if (getStatValue(InterndDirName, Data, false, 0 /*directory lookup*/)) {<br>
// There's no real directory at the given path.<br>
if (!CacheFailure)<br>
SeenDirEntries.erase(DirName);<br>
@@ -335,7 +256,8 @@ const DirectoryEntry *FileManager::getDi<br>
// same inode (this occurs on Unix-like systems when one dir is<br>
// symlinked to another, for example) or the same path (on<br>
// Windows).<br>
- DirectoryEntry &UDE = UniqueRealDirs.getDirectory(InterndDirName, StatBuf);<br>
+ DirectoryEntry &UDE =<br>
+ UniqueRealDirs.getDirectory(Data.UniqueID);<br>
<br>
NamedDirEnt.setValue(&UDE);<br>
if (!UDE.getName()) {<br>
@@ -388,8 +310,8 @@ const FileEntry *FileManager::getFile(St<br>
<br>
// Nope, there isn't. Check to see if the file exists.<br>
int FileDescriptor = -1;<br>
- struct stat StatBuf;<br>
- if (getStatValue(InterndFileName, StatBuf, true,<br>
+ FileData Data;<br>
+ if (getStatValue(InterndFileName, Data, true,<br>
openFile ? &FileDescriptor : 0)) {<br>
// There's no real file at the given path.<br>
if (!CacheFailure)<br>
@@ -405,7 +327,8 @@ const FileEntry *FileManager::getFile(St<br>
<br>
// It exists. See if we have already opened a file with the same inode.<br>
// This occurs when one dir is symlinked to another, for example.<br>
- FileEntry &UFE = UniqueRealFiles.getFile(InterndFileName, StatBuf);<br>
+ FileEntry &UFE =<br>
+ UniqueRealFiles.getFile(Data.UniqueID, Data.IsNamedPipe, Data.InPCH);<br>
<br>
NamedFileEnt.setValue(&UFE);<br>
if (UFE.getName()) { // Already have an entry with this inode, return it.<br>
@@ -420,8 +343,8 @@ const FileEntry *FileManager::getFile(St<br>
// FIXME: Change the name to be a char* that points back to the<br>
// 'SeenFileEntries' key.<br>
UFE.Name = InterndFileName;<br>
- UFE.Size = StatBuf.st_size;<br>
- UFE.ModTime = StatBuf.st_mtime;<br>
+ UFE.Size = Data.Size;<br>
+ UFE.ModTime = Data.ModTime;<br>
UFE.Dir = DirInfo;<br>
UFE.UID = NextFileUID++;<br>
UFE.FD = FileDescriptor;<br>
@@ -458,12 +381,12 @@ FileManager::getVirtualFile(StringRef Fi<br>
"The directory of a virtual file should already be in the cache.");<br>
<br>
// Check to see if the file exists. If so, drop the virtual file<br>
- struct stat StatBuf;<br>
+ FileData Data;<br>
const char *InterndFileName = NamedFileEnt.getKeyData();<br>
- if (getStatValue(InterndFileName, StatBuf, true, 0) == 0) {<br>
- StatBuf.st_size = Size;<br>
- StatBuf.st_mtime = ModificationTime;<br>
- UFE = &UniqueRealFiles.getFile(InterndFileName, StatBuf);<br>
+ if (getStatValue(InterndFileName, Data, true, 0) == 0) {<br>
+ Data.Size = Size;<br>
+ Data.ModTime = ModificationTime;<br>
+ UFE = &UniqueRealFiles.getFile(Data.UniqueID, Data.IsNamedPipe, Data.InPCH);<br>
<br>
NamedFileEnt.setValue(UFE);<br>
<br>
@@ -572,19 +495,19 @@ getBufferForFile(StringRef Filename, std<br>
/// if the path points to a virtual file or does not exist, or returns<br>
/// false if it's an existent real file. If FileDescriptor is NULL,<br>
/// do directory look-up instead of file look-up.<br>
-bool FileManager::getStatValue(const char *Path, struct stat &StatBuf,<br>
- bool isFile, int *FileDescriptor) {<br>
+bool FileManager::getStatValue(const char *Path, FileData &Data, bool isFile,<br>
+ int *FileDescriptor) {<br>
// FIXME: FileSystemOpts shouldn't be passed in here, all paths should be<br>
// absolute!<br>
if (FileSystemOpts.WorkingDir.empty())<br>
- return FileSystemStatCache::get(Path, StatBuf, isFile, FileDescriptor,<br>
+ return FileSystemStatCache::get(Path, Data, isFile, FileDescriptor,<br>
StatCache.get());<br>
<br>
SmallString<128> FilePath(Path);<br>
FixupRelativePath(FilePath);<br>
<br>
- return FileSystemStatCache::get(FilePath.c_str(), StatBuf,<br>
- isFile, FileDescriptor, StatCache.get());<br>
+ return FileSystemStatCache::get(FilePath.c_str(), Data, isFile,<br>
+ FileDescriptor, StatCache.get());<br>
}<br>
<br>
bool FileManager::getNoncachedStatValue(StringRef Path,<br>
<br>
Modified: cfe/trunk/lib/Basic/FileSystemStatCache.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/FileSystemStatCache.cpp?rev=187619&r1=187618&r2=187619&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/FileSystemStatCache.cpp?rev=187619&r1=187618&r2=187619&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Basic/FileSystemStatCache.cpp (original)<br>
+++ cfe/trunk/lib/Basic/FileSystemStatCache.cpp Thu Aug 1 16:42:11 2013<br>
@@ -30,6 +30,16 @@ using namespace clang;<br>
<br>
void FileSystemStatCache::anchor() { }<br>
<br>
+static void copyStatusToFileData(const llvm::sys::fs::file_status &Status,<br>
+ FileData &Data) {<br>
+ Data.Size = Status.getSize();<br>
+ Data.ModTime = Status.getLastModificationTime().toEpochTime();<br>
+ Data.UniqueID = Status.getUniqueID();<br>
+ Data.IsDirectory = is_directory(Status);<br>
+ Data.IsNamedPipe = Status.type() == llvm::sys::fs::file_type::fifo_file;<br>
+ Data.InPCH = false;<br>
+}<br>
+<br>
/// FileSystemStatCache::get - Get the 'stat' information for the specified<br>
/// path, using the cache to accelerate it if possible. This returns true if<br>
/// the path does not exist or false if it exists.<br>
@@ -39,19 +49,24 @@ void FileSystemStatCache::anchor() { }<br>
/// success for directories (not files). On a successful file lookup, the<br>
/// implementation can optionally fill in FileDescriptor with a valid<br>
/// descriptor and the client guarantees that it will close it.<br>
-bool FileSystemStatCache::get(const char *Path, struct stat &StatBuf,<br>
- bool isFile, int *FileDescriptor,<br>
- FileSystemStatCache *Cache) {<br>
+bool FileSystemStatCache::get(const char *Path, FileData &Data, bool isFile,<br>
+ int *FileDescriptor, FileSystemStatCache *Cache) {<br>
LookupResult R;<br>
bool isForDir = !isFile;<br>
<br>
// If we have a cache, use it to resolve the stat query.<br>
if (Cache)<br>
- R = Cache->getStat(Path, StatBuf, isFile, FileDescriptor);<br>
+ R = Cache->getStat(Path, Data, isFile, FileDescriptor);<br>
else if (isForDir || !FileDescriptor) {<br>
// If this is a directory or a file descriptor is not needed and we have<br>
// no cache, just go to the file system.<br>
- R = ::stat(Path, &StatBuf) != 0 ? CacheMissing : CacheExists;<br>
+ llvm::sys::fs::file_status Status;<br>
+ if (llvm::sys::fs::status(Path, Status)) {<br>
+ R = CacheMissing;<br>
+ } else {<br>
+ R = CacheExists;<br>
+ copyStatusToFileData(Status, Data);<br>
+ }<br>
} else {<br>
// Otherwise, we have to go to the filesystem. We can always just use<br>
// 'stat' here, but (for files) the client is asking whether the file exists<br>
@@ -69,9 +84,11 @@ bool FileSystemStatCache::get(const char<br>
// Otherwise, the open succeeded. Do an fstat to get the information<br>
// about the file. We'll end up returning the open file descriptor to the<br>
// client to do what they please with it.<br>
- if (::fstat(*FileDescriptor, &StatBuf) == 0)<br>
+ llvm::sys::fs::file_status Status;<br>
+ if (!llvm::sys::fs::status(*FileDescriptor, Status)) {<br>
R = CacheExists;<br>
- else {<br>
+ copyStatusToFileData(Status, Data);<br>
+ } else {<br>
// fstat rarely fails. If it does, claim the initial open didn't<br>
// succeed.<br>
R = CacheMissing;<br>
@@ -86,7 +103,7 @@ bool FileSystemStatCache::get(const char<br>
<br>
// If the path exists, make sure that its "directoryness" matches the clients<br>
// demands.<br>
- if (S_ISDIR(StatBuf.st_mode) != isForDir) {<br>
+ if (Data.IsDirectory != isForDir) {<br>
// If not, close the file if opened.<br>
if (FileDescriptor && *FileDescriptor != -1) {<br>
::close(*FileDescriptor);<br>
@@ -99,12 +116,11 @@ bool FileSystemStatCache::get(const char<br>
return false;<br>
}<br>
<br>
-<br>
MemorizeStatCalls::LookupResult<br>
-MemorizeStatCalls::getStat(const char *Path, struct stat &StatBuf,<br>
- bool isFile, int *FileDescriptor) {<br>
- LookupResult Result = statChained(Path, StatBuf, isFile, FileDescriptor);<br>
-<br>
+MemorizeStatCalls::getStat(const char *Path, FileData &Data, bool isFile,<br>
+ int *FileDescriptor) {<br>
+ LookupResult Result = statChained(Path, Data, isFile, FileDescriptor);<br>
+<br>
// Do not cache failed stats, it is easy to construct common inconsistent<br>
// situations if we do, and they are not important for PCH performance (which<br>
// currently only needs the stats to construct the initial FileManager<br>
@@ -113,8 +129,8 @@ MemorizeStatCalls::getStat(const char *P<br>
return Result;<br>
<br>
// Cache file 'stat' results and directories with absolutely paths.<br>
- if (!S_ISDIR(StatBuf.st_mode) || llvm::sys::path::is_absolute(Path))<br>
- StatCalls[Path] = StatBuf;<br>
-<br>
+ if (!Data.IsDirectory || llvm::sys::path::is_absolute(Path))<br>
+ StatCalls[Path] = Data;<br>
+<br>
return Result;<br>
}<br>
<br>
Modified: cfe/trunk/lib/Frontend/CacheTokens.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/CacheTokens.cpp?rev=187619&r1=187618&r2=187619&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/CacheTokens.cpp?rev=187619&r1=187618&r2=187619&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Frontend/CacheTokens.cpp (original)<br>
+++ cfe/trunk/lib/Frontend/CacheTokens.cpp Thu Aug 1 16:42:11 2013<br>
@@ -58,16 +58,16 @@ public:<br>
class PTHEntryKeyVariant {<br>
union { const FileEntry* FE; const char* Path; };<br>
enum { IsFE = 0x1, IsDE = 0x2, IsNoExist = 0x0 } Kind;<br>
- struct stat *StatBuf;<br>
+ FileData *Data;<br>
+<br>
public:<br>
- PTHEntryKeyVariant(const FileEntry *fe)<br>
- : FE(fe), Kind(IsFE), StatBuf(0) {}<br>
+ PTHEntryKeyVariant(const FileEntry *fe) : FE(fe), Kind(IsFE), Data(0) {}<br>
<br>
- PTHEntryKeyVariant(struct stat* statbuf, const char* path)<br>
- : Path(path), Kind(IsDE), StatBuf(new struct stat(*statbuf)) {}<br>
+ PTHEntryKeyVariant(FileData *Data, const char *path)<br>
+ : Path(path), Kind(IsDE), Data(new FileData(*Data)) {}<br>
<br>
- explicit PTHEntryKeyVariant(const char* path)<br>
- : Path(path), Kind(IsNoExist), StatBuf(0) {}<br>
+ explicit PTHEntryKeyVariant(const char *path)<br>
+ : Path(path), Kind(IsNoExist), Data(0) {}<br>
<br>
bool isFile() const { return Kind == IsFE; }<br>
<br>
@@ -79,22 +79,21 @@ public:<br>
<br>
void EmitData(raw_ostream& Out) {<br>
switch (Kind) {<br>
- case IsFE:<br>
+ case IsFE: {<br>
// Emit stat information.<br>
- ::Emit32(Out, FE->getInode());<br>
- ::Emit32(Out, FE->getDevice());<br>
- ::Emit16(Out, FE->getFileMode());<br>
+ llvm::sys::fs::UniqueID UID = FE->getUniqueID();<br>
+ ::Emit64(Out, UID.getFile());<br>
+ ::Emit64(Out, UID.getDevice());<br>
::Emit64(Out, FE->getModificationTime());<br>
::Emit64(Out, FE->getSize());<br>
- break;<br>
+ } break;<br>
case IsDE:<br>
// Emit stat information.<br>
- ::Emit32(Out, (uint32_t) StatBuf->st_ino);<br>
- ::Emit32(Out, (uint32_t) StatBuf->st_dev);<br>
- ::Emit16(Out, (uint16_t) StatBuf->st_mode);<br>
- ::Emit64(Out, (uint64_t) StatBuf->st_mtime);<br>
- ::Emit64(Out, (uint64_t) StatBuf->st_size);<br>
- delete StatBuf;<br>
+ ::Emit64(Out, Data->UniqueID.getFile());<br>
+ ::Emit64(Out, Data->UniqueID.getDevice());<br>
+ ::Emit64(Out, Data->ModTime);<br>
+ ::Emit64(Out, Data->Size);<br>
+ delete Data;<br>
break;<br>
default:<br>
break;<br>
@@ -516,18 +515,18 @@ public:<br>
StatListener(PTHMap &pm) : PM(pm) {}<br>
~StatListener() {}<br>
<br>
- LookupResult getStat(const char *Path, struct stat &StatBuf,<br>
- bool isFile, int *FileDescriptor) {<br>
- LookupResult Result = statChained(Path, StatBuf, isFile, FileDescriptor);<br>
+ LookupResult getStat(const char *Path, FileData &Data, bool isFile,<br>
+ int *FileDescriptor) {<br>
+ LookupResult Result = statChained(Path, Data, isFile, FileDescriptor);<br>
<br>
if (Result == CacheMissing) // Failed 'stat'.<br>
PM.insert(PTHEntryKeyVariant(Path), PTHEntry());<br>
- else if (S_ISDIR(StatBuf.st_mode)) {<br>
+ else if (Data.IsDirectory) {<br>
// Only cache directories with absolute paths.<br>
if (llvm::sys::path::is_relative(Path))<br>
return Result;<br>
<br>
- PM.insert(PTHEntryKeyVariant(&StatBuf, Path), PTHEntry());<br>
+ PM.insert(PTHEntryKeyVariant(&Data, Path), PTHEntry());<br>
}<br>
<br>
return Result;<br>
<br>
Modified: cfe/trunk/lib/Frontend/TextDiagnostic.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/TextDiagnostic.cpp?rev=187619&r1=187618&r2=187619&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/TextDiagnostic.cpp?rev=187619&r1=187618&r2=187619&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Frontend/TextDiagnostic.cpp (original)<br>
+++ cfe/trunk/lib/Frontend/TextDiagnostic.cpp Thu Aug 1 16:42:11 2013<br>
@@ -778,11 +778,8 @@ void TextDiagnostic::emitDiagnosticLoc(S<br>
const FileEntry* FE = SM.getFileEntryForID(FID);<br>
if (FE && FE->getName()) {<br>
OS << FE->getName();<br>
- if (FE->getDevice() == 0 && FE->getInode() == 0<br>
- && FE->getFileMode() == 0) {<br>
- // in PCH is a guess, but a good one:<br>
+ if (FE->isInPCH())<br>
OS << " (in PCH)";<br>
- }<br>
OS << ": ";<br>
}<br>
}<br>
<br>
Modified: cfe/trunk/lib/Lex/PTHLexer.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Lex/PTHLexer.cpp?rev=187619&r1=187618&r2=187619&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Lex/PTHLexer.cpp?rev=187619&r1=187618&r2=187619&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Lex/PTHLexer.cpp (original)<br>
+++ cfe/trunk/lib/Lex/PTHLexer.cpp Thu Aug 1 16:42:11 2013<br>
@@ -619,18 +619,18 @@ PTHLexer *PTHManager::CreateLexer(FileID<br>
namespace {<br>
class PTHStatData {<br>
public:<br>
- const bool hasStat;<br>
- const ino_t ino;<br>
- const dev_t dev;<br>
- const mode_t mode;<br>
- const time_t mtime;<br>
- const off_t size;<br>
+ const bool HasData;<br>
+ uint64_t Size;<br>
+ time_t ModTime;<br>
+ llvm::sys::fs::UniqueID UniqueID;<br>
+ bool IsDirectory;<br>
+<br>
+ PTHStatData(uint64_t Size, time_t ModTime, llvm::sys::fs::UniqueID UniqueID,<br>
+ bool IsDirectory)<br>
+ : HasData(true), Size(Size), ModTime(ModTime), UniqueID(UniqueID),<br>
+ IsDirectory(IsDirectory) {}<br>
<br>
- PTHStatData(ino_t i, dev_t d, mode_t mo, time_t m, off_t s)<br>
- : hasStat(true), ino(i), dev(d), mode(mo), mtime(m), size(s) {}<br>
-<br>
- PTHStatData()<br>
- : hasStat(false), ino(0), dev(0), mode(0), mtime(0), size(0) {}<br>
+ PTHStatData() : HasData(false) {}<br>
};<br>
<br>
class PTHStatLookupTrait : public PTHFileLookupCommonTrait {<br>
@@ -653,12 +653,18 @@ public:<br>
unsigned) {<br>
<br>
if (k.first /* File or Directory */) {<br>
- if (k.first == 0x1 /* File */) d += 4 * 2; // Skip the first 2 words.<br>
- ino_t ino = (ino_t) ReadUnalignedLE32(d);<br>
- dev_t dev = (dev_t) ReadUnalignedLE32(d);<br>
- mode_t mode = (mode_t) ReadUnalignedLE16(d);<br>
- time_t mtime = (time_t) ReadUnalignedLE64(d);<br>
- return data_type(ino, dev, mode, mtime, (off_t) ReadUnalignedLE64(d));<br>
+ bool IsDirectory = true;<br>
+ if (k.first == 0x1 /* File */) {<br>
+ IsDirectory = false;<br>
+ d += 4 * 2; // Skip the first 2 words.<br>
+ }<br>
+<br>
+ uint64_t File = ReadUnalignedLE64(d);<br>
+ uint64_t Device = ReadUnalignedLE64(d);<br>
+ llvm::sys::fs::UniqueID UniqueID(File, Device);<br>
+ time_t ModTime = ReadUnalignedLE64(d);<br>
+ uint64_t Size = ReadUnalignedLE64(d);<br>
+ return data_type(Size, ModTime, UniqueID, IsDirectory);<br>
}<br>
<br>
// Negative stat. Don't read anything.<br>
@@ -677,25 +683,27 @@ public:<br>
<br>
~PTHStatCache() {}<br>
<br>
- LookupResult getStat(const char *Path, struct stat &StatBuf,<br>
- bool isFile, int *FileDescriptor) {<br>
+ LookupResult getStat(const char *Path, FileData &Data, bool isFile,<br>
+ int *FileDescriptor) {<br>
// Do the lookup for the file's data in the PTH file.<br>
CacheTy::iterator I = Cache.find(Path);<br>
<br>
// If we don't get a hit in the PTH file just forward to 'stat'.<br>
if (I == Cache.end())<br>
- return statChained(Path, StatBuf, isFile, FileDescriptor);<br>
+ return statChained(Path, Data, isFile, FileDescriptor);<br>
<br>
- const PTHStatData &Data = *I;<br>
+ const PTHStatData &D = *I;<br>
<br>
- if (!Data.hasStat)<br>
+ if (!D.HasData)<br>
return CacheMissing;<br>
<br>
- StatBuf.st_ino = Data.ino;<br>
- StatBuf.st_dev = Data.dev;<br>
- StatBuf.st_mtime = Data.mtime;<br>
- StatBuf.st_mode = Data.mode;<br>
- StatBuf.st_size = Data.size;<br>
+ Data.Size = D.Size;<br>
+ Data.ModTime = D.ModTime;<br>
+ Data.UniqueID = D.UniqueID;<br>
+ Data.IsDirectory = D.IsDirectory;<br>
+ Data.IsNamedPipe = false;<br>
+ Data.InPCH = true;<br>
+<br>
return CacheExists;<br>
}<br>
};<br>
<br>
Modified: cfe/trunk/tools/libclang/CIndex.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/CIndex.cpp?rev=187619&r1=187618&r2=187619&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/CIndex.cpp?rev=187619&r1=187618&r2=187619&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/tools/libclang/CIndex.cpp (original)<br>
+++ cfe/trunk/tools/libclang/CIndex.cpp Thu Aug 1 16:42:11 2013<br>
@@ -3057,15 +3057,12 @@ int clang_getFileUniqueID(CXFile file, C<br>
if (!file || !outID)<br>
return 1;<br>
<br>
-#ifdef LLVM_ON_WIN32<br>
- return 1; // inodes not supported on windows.<br>
-#else<br>
FileEntry *FEnt = static_cast<FileEntry *>(file);<br>
- outID->data[0] = FEnt->getDevice();<br>
- outID->data[1] = FEnt->getInode();<br>
+ const llvm::sys::fs::UniqueID &ID = FEnt->getUniqueID();<br>
+ outID->data[0] = ID.getDevice();<br>
+ outID->data[1] = ID.getFile();<br>
outID->data[2] = FEnt->getModificationTime();<br>
return 0;<br>
-#endif<br>
}<br>
<br>
} // end: extern "C"<br>
<br>
Modified: cfe/trunk/tools/libclang/Indexing.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/Indexing.cpp?rev=187619&r1=187618&r2=187619&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/Indexing.cpp?rev=187619&r1=187618&r2=187619&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/tools/libclang/Indexing.cpp (original)<br>
+++ cfe/trunk/tools/libclang/Indexing.cpp Thu Aug 1 16:42:11 2013<br>
@@ -88,25 +88,23 @@ public:<br>
/// #3 is identified as the location of "#ifdef CAKE"<br>
///<br>
class PPRegion {<br>
- ino_t ino;<br>
+ llvm::sys::fs::UniqueID UniqueID;<br>
time_t ModTime;<br>
- dev_t dev;<br>
unsigned Offset;<br>
public:<br>
- PPRegion() : ino(), ModTime(), dev(), Offset() {}<br>
- PPRegion(dev_t dev, ino_t ino, unsigned offset, time_t modTime)<br>
- : ino(ino), ModTime(modTime), dev(dev), Offset(offset) {}<br>
+ PPRegion() : ModTime(), Offset() {}<br>
+ PPRegion(llvm::sys::fs::UniqueID UniqueID, unsigned offset, time_t modTime)<br>
+ : UniqueID(UniqueID), ModTime(modTime), Offset(offset) {}<br>
<br>
- ino_t getIno() const { return ino; }<br>
- dev_t getDev() const { return dev; }<br>
+ const llvm::sys::fs::UniqueID &getUniqueID() const { return UniqueID; }<br>
unsigned getOffset() const { return Offset; }<br>
time_t getModTime() const { return ModTime; }<br>
<br>
bool isInvalid() const { return *this == PPRegion(); }<br>
<br>
friend bool operator==(const PPRegion &lhs, const PPRegion &rhs) {<br>
- return lhs.dev == rhs.dev && lhs.ino == rhs.ino &&<br>
- lhs.Offset == rhs.Offset && lhs.ModTime == rhs.ModTime;<br>
+ return lhs.UniqueID == rhs.UniqueID && lhs.Offset == rhs.Offset &&<br>
+ lhs.ModTime == rhs.ModTime;<br>
}<br>
};<br>
<br>
@@ -122,16 +120,17 @@ namespace llvm {<br>
template <><br>
struct DenseMapInfo<PPRegion> {<br>
static inline PPRegion getEmptyKey() {<br>
- return PPRegion(0, 0, unsigned(-1), 0);<br>
+ return PPRegion(llvm::sys::fs::UniqueID(0, 0), unsigned(-1), 0);<br>
}<br>
static inline PPRegion getTombstoneKey() {<br>
- return PPRegion(0, 0, unsigned(-2), 0);<br>
+ return PPRegion(llvm::sys::fs::UniqueID(0, 0), unsigned(-2), 0);<br>
}<br>
<br>
static unsigned getHashValue(const PPRegion &S) {<br>
llvm::FoldingSetNodeID ID;<br>
- ID.AddInteger(S.getIno());<br>
- ID.AddInteger(S.getDev());<br>
+ const llvm::sys::fs::UniqueID &UniqueID = S.getUniqueID();<br>
+ ID.AddInteger(UniqueID.getFile());<br>
+ ID.AddInteger(UniqueID.getDevice());<br>
ID.AddInteger(S.getOffset());<br>
ID.AddInteger(S.getModTime());<br>
return ID.ComputeHash();<br>
@@ -208,9 +207,10 @@ private:<br>
PPRegion getRegion(SourceLocation Loc, FileID FID, const FileEntry *FE) {<br>
SourceLocation RegionLoc = PPRec.findConditionalDirectiveRegionLoc(Loc);<br>
if (RegionLoc.isInvalid()) {<br>
- if (isParsedOnceInclude(FE))<br>
- return PPRegion(FE->getDevice(), FE->getInode(), 0,<br>
- FE->getModificationTime());<br>
+ if (isParsedOnceInclude(FE)) {<br>
+ const llvm::sys::fs::UniqueID &ID = FE->getUniqueID();<br>
+ return PPRegion(ID, 0, FE->getModificationTime());<br>
+ }<br>
return PPRegion();<br>
}<br>
<br>
@@ -221,14 +221,15 @@ private:<br>
llvm::tie(RegionFID, RegionOffset) = SM.getDecomposedLoc(RegionLoc);<br>
<br>
if (RegionFID != FID) {<br>
- if (isParsedOnceInclude(FE))<br>
- return PPRegion(FE->getDevice(), FE->getInode(), 0,<br>
- FE->getModificationTime());<br>
+ if (isParsedOnceInclude(FE)) {<br>
+ const llvm::sys::fs::UniqueID &ID = FE->getUniqueID();<br>
+ return PPRegion(ID, 0, FE->getModificationTime());<br>
+ }<br>
return PPRegion();<br>
}<br>
<br>
- return PPRegion(FE->getDevice(), FE->getInode(), RegionOffset,<br>
- FE->getModificationTime());<br>
+ const llvm::sys::fs::UniqueID &ID = FE->getUniqueID();<br>
+ return PPRegion(ID, RegionOffset, FE->getModificationTime());<br>
}<br>
<br>
bool isParsedOnceInclude(const FileEntry *FE) {<br>
<br>
Modified: cfe/trunk/unittests/Basic/FileManagerTest.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Basic/FileManagerTest.cpp?rev=187619&r1=187618&r2=187619&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Basic/FileManagerTest.cpp?rev=187619&r1=187618&r2=187619&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/unittests/Basic/FileManagerTest.cpp (original)<br>
+++ cfe/trunk/unittests/Basic/FileManagerTest.cpp Thu Aug 1 16:42:11 2013<br>
@@ -24,18 +24,15 @@ class FakeStatCache : public FileSystemS<br>
private:<br>
// Maps a file/directory path to its desired stat result. Anything<br>
// not in this map is considered to not exist in the file system.<br>
- llvm::StringMap<struct stat, llvm::BumpPtrAllocator> StatCalls;<br>
+ llvm::StringMap<FileData, llvm::BumpPtrAllocator> StatCalls;<br>
<br>
void InjectFileOrDirectory(const char *Path, ino_t INode, bool IsFile) {<br>
- struct stat statBuf;<br>
- memset(&statBuf, 0, sizeof(statBuf));<br>
- statBuf.st_dev = 1;<br>
-#ifndef _WIN32 // struct stat has no st_ino field on Windows.<br>
- statBuf.st_ino = INode;<br>
-#endif<br>
- statBuf.st_mode = IsFile ? (0777 | S_IFREG) // a regular file<br>
- : (0777 | S_IFDIR); // a directory<br>
- StatCalls[Path] = statBuf;<br>
+ FileData Data;<br>
+ memset(&Data, 0, sizeof(FileData));<br>
+ llvm::sys::fs::UniqueID ID(1, INode);<br>
+ Data.UniqueID = ID;<br>
+ Data.IsDirectory = !IsFile;<br>
+ StatCalls[Path] = Data;<br>
}<br>
<br>
public:<br>
@@ -50,10 +47,10 @@ public:<br>
}<br>
<br>
// Implement FileSystemStatCache::getStat().<br>
- virtual LookupResult getStat(const char *Path, struct stat &StatBuf,<br>
- bool isFile, int *FileDescriptor) {<br>
+ virtual LookupResult getStat(const char *Path, FileData &Data, bool isFile,<br>
+ int *FileDescriptor) {<br>
if (StatCalls.count(Path) != 0) {<br>
- StatBuf = StatCalls[Path];<br>
+ Data = StatCalls[Path];<br>
return CacheExists;<br>
}<br>
<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br><br clear="all"><div><br></div>-- <br><div>Alexey Samsonov, MSK</div>
</div>