maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[Support] Fill the file_status struct with link count. 

Differential Revision: https://reviews.llvm.org/D31110

llvm-svn: 298326
This commit is contained in:
Zachary Turner 2017-03-20 23:55:20 +00:00
parent 076a259938
commit 5821a3bf36
4 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lldb/source/Host/common/File.cpp
View File

@ -19,6 +19,7 @@
#include "lldb/Host/windows/windows.h" #include "lldb/Host/windows/windows.h"
#else #else
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/stat.h>
#include <termios.h> #include <termios.h>
#endif #endif

27
llvm/include/llvm/Support/FileSystem.h
View File

@ -147,6 +147,7 @@ class file_status
#if defined(LLVM_ON_UNIX) #if defined(LLVM_ON_UNIX)
dev_t fs_st_dev = 0; dev_t fs_st_dev = 0;
nlink_t fs_st_nlinks = 0;
ino_t fs_st_ino = 0; ino_t fs_st_ino = 0;
time_t fs_st_atime = 0; time_t fs_st_atime = 0;
time_t fs_st_mtime = 0; time_t fs_st_mtime = 0;
@ -154,6 +155,7 @@ class file_status
gid_t fs_st_gid = 0; gid_t fs_st_gid = 0;
off_t fs_st_size = 0; off_t fs_st_size = 0;
#elif defined (LLVM_ON_WIN32) #elif defined (LLVM_ON_WIN32)
uint32_t NumLinks = 0;
uint32_t LastAccessedTimeHigh = 0; uint32_t LastAccessedTimeHigh = 0;
uint32_t LastAccessedTimeLow = 0; uint32_t LastAccessedTimeLow = 0;
uint32_t LastWriteTimeHigh = 0; uint32_t LastWriteTimeHigh = 0;
@ -173,22 +175,24 @@ public:
file_status(file_type Type) : Type(Type) {} file_status(file_type Type) : Type(Type) {}
file_status(file_type Type, perms Perms, dev_t Dev, ino_t Ino, time_t ATime, file_status(file_type Type, perms Perms, dev_t Dev, nlink_t Links, ino_t Ino,
time_t MTime, uid_t UID, gid_t GID, off_t Size) time_t ATime, time_t MTime, uid_t UID, gid_t GID, off_t Size)
: fs_st_dev(Dev), fs_st_ino(Ino), fs_st_atime(ATime), fs_st_mtime(MTime), : fs_st_dev(Dev), fs_st_nlinks(Links), fs_st_ino(Ino), fs_st_atime(ATime),
fs_st_uid(UID), fs_st_gid(GID), fs_st_size(Size), Type(Type), fs_st_mtime(MTime), fs_st_uid(UID), fs_st_gid(GID), fs_st_size(Size),
Perms(Perms) {} Type(Type), Perms(Perms) {}
#elif defined(LLVM_ON_WIN32) #elif defined(LLVM_ON_WIN32)
file_status() = default; file_status() = default;
file_status(file_type Type) : Type(Type) {} file_status(file_type Type) : Type(Type) {}
file_status(file_type Type, perms Perms, uint32_t LastAccessTimeHigh, file_status(file_type Type, perms Perms, uint32_t LinkCount,
uint32_t LastAccessTimeLow, uint32_t LastWriteTimeHigh, uint32_t LastAccessTimeHigh, uint32_t LastAccessTimeLow,
uint32_t LastWriteTimeLow, uint32_t VolumeSerialNumber, uint32_t LastWriteTimeHigh, uint32_t LastWriteTimeLow,
uint32_t FileSizeHigh, uint32_t FileSizeLow, uint32_t VolumeSerialNumber, uint32_t FileSizeHigh,
uint32_t FileIndexHigh, uint32_t FileIndexLow) uint32_t FileSizeLow, uint32_t FileIndexHigh,
: LastAccessedTimeHigh(LastAccessTimeHigh), LastAccessedTimeLow(LastAccessTimeLow), uint32_t FileIndexLow)
: NumLinks(LinkCount), LastAccessedTimeHigh(LastAccessTimeHigh),
LastAccessedTimeLow(LastAccessTimeLow),
LastWriteTimeHigh(LastWriteTimeHigh), LastWriteTimeHigh(LastWriteTimeHigh),
LastWriteTimeLow(LastWriteTimeLow), LastWriteTimeLow(LastWriteTimeLow),
VolumeSerialNumber(VolumeSerialNumber), FileSizeHigh(FileSizeHigh), VolumeSerialNumber(VolumeSerialNumber), FileSizeHigh(FileSizeHigh),
@ -202,6 +206,7 @@ public:
TimePoint<> getLastAccessedTime() const; TimePoint<> getLastAccessedTime() const;
TimePoint<> getLastModificationTime() const; TimePoint<> getLastModificationTime() const;
UniqueID getUniqueID() const; UniqueID getUniqueID() const;
uint32_t getLinkCount() const;
#if defined(LLVM_ON_UNIX) #if defined(LLVM_ON_UNIX)
uint32_t getUser() const { return fs_st_uid; } uint32_t getUser() const { return fs_st_uid; }

11
llvm/lib/Support/Unix/Path.inc
View File

@ -230,6 +230,10 @@ UniqueID file_status::getUniqueID() const {
return UniqueID(fs_st_dev, fs_st_ino); return UniqueID(fs_st_dev, fs_st_ino);
} }
uint32_t file_status::getLinkCount() const {
return fs_st_nlinks;
}
ErrorOr<space_info> disk_space(const Twine &Path) { ErrorOr<space_info> disk_space(const Twine &Path) {
struct STATVFS Vfs; struct STATVFS Vfs;
if (::STATVFS(Path.str().c_str(), &Vfs)) if (::STATVFS(Path.str().c_str(), &Vfs))
@ -549,10 +553,9 @@ static std::error_code fillStatus(int StatRet, const struct stat &Status,
Type = file_type::symlink_file; Type = file_type::symlink_file;
perms Perms = static_cast<perms>(Status.st_mode) & all_perms; perms Perms = static_cast<perms>(Status.st_mode) & all_perms;
Result = Result = file_status(Type, Perms, Status.st_dev, Status.st_nlink,
file_status(Type, Perms, Status.st_dev, Status.st_ino, Status.st_atime, Status.st_ino, Status.st_atime, Status.st_mtime,
Status.st_mtime, Status.st_uid, Status.st_gid, Status.st_uid, Status.st_gid, Status.st_size);
Status.st_size);
return std::error_code(); return std::error_code();
} }

7
llvm/lib/Support/Windows/Path.inc
View File

@ -179,6 +179,10 @@ TimePoint<> file_status::getLastModificationTime() const {
return toTimePoint(Time); return toTimePoint(Time);
} }
uint32_t file_status::getLinkCount() const {
return NumLinks;
}
std::error_code current_path(SmallVectorImpl<char> &result) { std::error_code current_path(SmallVectorImpl<char> &result) {
SmallVector<wchar_t, MAX_PATH> cur_path; SmallVector<wchar_t, MAX_PATH> cur_path;
DWORD len = MAX_PATH; DWORD len = MAX_PATH;
@ -534,7 +538,8 @@ static std::error_code getStatus(HANDLE FileHandle, file_status &Result) {
? (all_read | all_exe) ? (all_read | all_exe)
: all_all; : all_all;
Result = file_status( Result = file_status(
Type, Permissions, Info.ftLastAccessTime.dwHighDateTime, Type, Permissions, Info.nNumberOfLinks,
Info.ftLastAccessTime.dwHighDateTime,
Info.ftLastAccessTime.dwLowDateTime, Info.ftLastAccessTime.dwLowDateTime,
Info.ftLastWriteTime.dwHighDateTime, Info.ftLastWriteTime.dwLowDateTime, Info.ftLastWriteTime.dwHighDateTime, Info.ftLastWriteTime.dwLowDateTime,
Info.dwVolumeSerialNumber, Info.nFileSizeHigh, Info.nFileSizeLow, Info.dwVolumeSerialNumber, Info.nFileSizeHigh, Info.nFileSizeLow,