* smallprint.cc (__small_vswprintf): Fix uninitialized usage of `w'.
Revamp advisory file locking to avoid cross reference pointers as well as to allow BSD flock semantics. More agressively delete unused nodes and sync objects. * fhandler.h (fhandler_base::ino): Rename from namehash. Fix comment. (fhandler_base::node): Remove. (fhandler_base::unique_id): Add. (fhandler_base::del_my_locks): New method. (get_ino): Rename from get_namehash. Change usage throughout Cygwin. (get_unique_id): New method. * fhandler.cc (fhandler_base::close): Call own del_my_locks method. Fix comment. (fhandler_base::fhandler_base): Accommodate new and changed members. (fhandler_base::fixup_after_fork): Call del_my_locks. (fhandler_base::fixup_after_exec): Ditto for files with close-on-exec flag set. * fhandler_disk_file.cc (get_ino_by_handle): Rename from readdir_get_ino_by_handle. Accommodate throughout. (fhandler_base::open_fs): Fill ino with inode number if FS has good inodes. Allocate a LUID and store in unique_id to recognize file descriptors referencing the same file object. * flock.cc: Drop flock TODO comments. Use explicit types __dev32_t and __ino64_t instead of dev_t and ino_t. (LOCK_OBJ_NAME_LEN): Change to reflect longer lf_id length. (get_obj_handle_count): New method. (lockf_t::lf_id): Change type to long long. (inode_t::get_lock_obj_handle_count): Drop in favor of static function get_obj_handle_count. (inode_t::del_locks): Remove. (inode_t::get): Add create_if_missing flag argument. (inode_t::del_my_locks): Reimplement to handle POSIX and BSD flock locks. Return if node can be deleted or not. (inode_t::~inode_t): Ditto. Close handles to i_dir and i_mtx. (fixup_lockf_after_fork): Remove. (fhandler_base::del_my_locks): New method. (fixup_lockf_after_exec): Check if node can be deleted. (inode_t::get): Only create node if create_if_missing is set. Lock the returned node here before unlocking the node list. (inode_t::get_all_locks_list): Accommodate new lf_id length. (inode_t::create_lock_obj): Ditto. (lockf_t::open_lock_obj): Ditto. Change return type to bool. De-const. Set lf_obj instead of returning a handle. (lockf_t::del_lock_obj): Call SetEvent only if new incoming parameters allow it. Explain how it's supposed to work. (fhandler_disk_file::lock): Only fetch file length in SEEK_END case. Use NtQueryInformationFile(FileStandardInformation) instead of calling fstat_by_handle. Always unlock node before returning. Use fhandler's unique id to create lf_id for BSD flock locks. Rely on node lock from inode_t::get. Call del_lock_obj on removed locks here to allow explicit unlocking. Delete node if no lock exists on the file anymore. (lf_setlock): Get file handle as additional parameter. Handle the fact that lf_getblock now always opens the attached event object. Reactivate erroneously applied patch which deactivates setting thread priority. Additionally handle blocking on BSD flock locks. (lf_clearlock): Get file handle as additional parameter. (lf_getlock): Close event handle opened by lf_getblock. (lf_getblock): Open potentially blocking event object here and check its signal state if it's a BSD flock lock. (lf_wakelock): Get file handle as additional parameter. * fork.cc (frok::child): Drop call to fixup_lockf_after_fork. * ntdll.h (struct _EVENT_BASIC_INFORMATION): Define. (enum _EVENT_INFORMATION_CLASS): Define. (NtQueryEvent): Declare. * fhandler.h (fhandler_base::fs_flags): Remove. (fhandler_base::set_fs_flags): Remove. (fhandler_base::get_fs_flags): Remove. * fhandler.cc (fhandler_base::write): Check for sparse file using pc.fs_flags(). * fhandler_disk_file.cc (fhandler_disk_file::ftruncate): Ditto. The return of the volume serial number in fs_info. * fhandler.h (get_dev): New method. * fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Drop call to NtQueryVolumeInformationFile(FileFsVolumeInformation). Just use get_dev() method. * fhandler_fifo.cc (fhandler_fifo::open) Use device ID and inode number to generate fifo name. * path.h (fs_info::sernum): New member. (fs_info::serial_number): New method. (path_conv::fs_serial_number): New method. * path.cc (fs_info::update): Fetch volume serial number and store in sernum.
This commit is contained in:
Corinna Vinschen
@@ -169,6 +169,18 @@ is_volume_mountpoint (POBJECT_ATTRIBUTES attr)
|
||||
return ret;
|
||||
}
|
||||
|
||||
static inline __ino64_t
|
||||
get_ino_by_handle (HANDLE hdl)
|
||||
{
|
||||
IO_STATUS_BLOCK io;
|
||||
FILE_INTERNAL_INFORMATION pfai;
|
||||
|
||||
if (NT_SUCCESS (NtQueryInformationFile (hdl, &io, &pfai, sizeof pfai,
|
||||
FileInternalInformation)))
|
||||
return pfai.FileId.QuadPart;
|
||||
return 0;
|
||||
}
|
||||
|
||||
unsigned __stdcall
|
||||
path_conv::ndisk_links (DWORD nNumberOfLinks)
|
||||
{
|
||||
@@ -264,23 +276,10 @@ fhandler_base::fstat_by_handle (struct __stat64 *buf)
|
||||
NTSTATUS status;
|
||||
IO_STATUS_BLOCK io;
|
||||
/* The entries potentially contain a name of MAX_PATH wide characters. */
|
||||
const DWORD fvi_size = (NAME_MAX + 1) * sizeof (WCHAR)
|
||||
+ sizeof (FILE_FS_VOLUME_INFORMATION);
|
||||
const DWORD fai_size = (NAME_MAX + 1) * sizeof (WCHAR)
|
||||
+ sizeof (FILE_ALL_INFORMATION);
|
||||
|
||||
PFILE_FS_VOLUME_INFORMATION pfvi = (PFILE_FS_VOLUME_INFORMATION)
|
||||
alloca (fvi_size);
|
||||
PFILE_ALL_INFORMATION pfai = (PFILE_ALL_INFORMATION) alloca (fai_size);
|
||||
|
||||
status = NtQueryVolumeInformationFile (get_handle (), &io, pfvi, fvi_size,
|
||||
FileFsVolumeInformation);
|
||||
if (!NT_SUCCESS (status))
|
||||
{
|
||||
debug_printf ("%p = NtQueryVolumeInformationFile(%S)", status,
|
||||
pc.get_nt_native_path ());
|
||||
pfvi->VolumeSerialNumber = 0;
|
||||
}
|
||||
status = NtQueryInformationFile (get_handle (), &io, pfai, fai_size,
|
||||
FileAllInformation);
|
||||
if (NT_SUCCESS (status))
|
||||
@@ -298,7 +297,7 @@ fhandler_base::fstat_by_handle (struct __stat64 *buf)
|
||||
*(FILETIME *) &pfai->BasicInformation.LastAccessTime,
|
||||
*(FILETIME *) &pfai->BasicInformation.LastWriteTime,
|
||||
*(FILETIME *) &pfai->BasicInformation.CreationTime,
|
||||
pfvi->VolumeSerialNumber,
|
||||
get_dev (),
|
||||
pfai->StandardInformation.EndOfFile.QuadPart,
|
||||
pfai->StandardInformation.AllocationSize.QuadPart,
|
||||
pfai->InternalInformation.FileId.QuadPart,
|
||||
@@ -357,7 +356,7 @@ fhandler_base::fstat_by_name (struct __stat64 *buf)
|
||||
pfdi, fdi_size,
|
||||
FileBothDirectoryInformation,
|
||||
TRUE, &basename, TRUE)))
|
||||
FileId.QuadPart = 0; /* get_namehash is called in fstat_helper. */
|
||||
FileId.QuadPart = 0; /* get_ino is called in fstat_helper. */
|
||||
if (!NT_SUCCESS (status))
|
||||
{
|
||||
debug_printf ("%p = NtQueryDirectoryFile(%S)", status,
|
||||
@@ -491,7 +490,7 @@ fhandler_base::fstat_helper (struct __stat64 *buf,
|
||||
if (pc.isgood_inode (nFileIndex))
|
||||
buf->st_ino = (__ino64_t) nFileIndex;
|
||||
else
|
||||
buf->st_ino = get_namehash ();
|
||||
buf->st_ino = get_ino ();
|
||||
|
||||
buf->st_blksize = PREFERRED_IO_BLKSIZE;
|
||||
|
||||
@@ -1047,7 +1046,7 @@ fhandler_disk_file::ftruncate (_off64_t length, bool allow_truncate)
|
||||
/* Create sparse files only when called through ftruncate, not when
|
||||
called through posix_fallocate. */
|
||||
if (allow_truncate
|
||||
&& get_fs_flags (FILE_SUPPORTS_SPARSE_FILES)
|
||||
&& (pc.fs_flags () & FILE_SUPPORTS_SPARSE_FILES)
|
||||
&& length >= fsi.EndOfFile.QuadPart + (128 * 1024))
|
||||
{
|
||||
status = NtFsControlFile (get_handle (), NULL, NULL, NULL, &io,
|
||||
@@ -1272,7 +1271,11 @@ fhandler_base::open_fs (int flags, mode_t mode)
|
||||
return 0;
|
||||
}
|
||||
|
||||
set_fs_flags (pc.fs_flags ());
|
||||
if (pc.hasgood_inode ())
|
||||
ino = get_ino_by_handle (get_handle ());
|
||||
/* A unique ID is necessary to recognize fhandler entries which are
|
||||
duplicated by dup(2) or fork(2). */
|
||||
AllocateLocallyUniqueId ((PLUID) &unique_id);
|
||||
|
||||
out:
|
||||
syscall_printf ("%d = fhandler_disk_file::open (%S, %p)", res,
|
||||
@@ -1523,18 +1526,6 @@ free_dir:
|
||||
return res;
|
||||
}
|
||||
|
||||
static inline __ino64_t
|
||||
readdir_get_ino_by_handle (HANDLE hdl)
|
||||
{
|
||||
IO_STATUS_BLOCK io;
|
||||
FILE_INTERNAL_INFORMATION pfai;
|
||||
|
||||
if (!NtQueryInformationFile (hdl, &io, &pfai, sizeof pfai,
|
||||
FileInternalInformation))
|
||||
return pfai.FileId.QuadPart;
|
||||
return 0;
|
||||
}
|
||||
|
||||
__ino64_t __stdcall
|
||||
readdir_get_ino (const char *path, bool dot_dot)
|
||||
{
|
||||
@@ -1569,7 +1560,7 @@ readdir_get_ino (const char *path, bool dot_dot)
|
||||
| (pc.is_rep_symlink ()
|
||||
? FILE_OPEN_REPARSE_POINT : 0))))
|
||||
{
|
||||
ino = readdir_get_ino_by_handle (hdl);
|
||||
ino = get_ino_by_handle (hdl);
|
||||
NtClose (hdl);
|
||||
}
|
||||
return ino;
|
||||
@@ -1607,7 +1598,7 @@ fhandler_disk_file::readdir_helper (DIR *dir, dirent *de, DWORD w32_err,
|
||||
FILE_SHARE_VALID_FLAGS,
|
||||
FILE_OPEN_FOR_BACKUP_INTENT))))
|
||||
{
|
||||
de->d_ino = readdir_get_ino_by_handle (reph);
|
||||
de->d_ino = get_ino_by_handle (reph);
|
||||
NtClose (reph);
|
||||
}
|
||||
}
|
||||
@@ -1779,13 +1770,13 @@ go_ahead:
|
||||
|
||||
if (dir->__d_position == 0 && buf->FileNameLength == 2
|
||||
&& FileName[0] == '.')
|
||||
de->d_ino = readdir_get_ino_by_handle (get_handle ());
|
||||
de->d_ino = get_ino_by_handle (get_handle ());
|
||||
else if (dir->__d_position == 1 && buf->FileNameLength == 4
|
||||
&& FileName[0] == L'.' && FileName[1] == L'.')
|
||||
if (!(dir->__flags & dirent_isroot))
|
||||
de->d_ino = readdir_get_ino (get_name (), true);
|
||||
else
|
||||
de->d_ino = readdir_get_ino_by_handle (get_handle ());
|
||||
de->d_ino = get_ino_by_handle (get_handle ());
|
||||
else
|
||||
{
|
||||
HANDLE hdl;
|
||||
@@ -1796,7 +1787,7 @@ go_ahead:
|
||||
FILE_SHARE_VALID_FLAGS,
|
||||
FILE_OPEN_FOR_BACKUP_INTENT)))
|
||||
{
|
||||
de->d_ino = readdir_get_ino_by_handle (hdl);
|
||||
de->d_ino = get_ino_by_handle (hdl);
|
||||
NtClose (hdl);
|
||||
}
|
||||
}
|
||||
@@ -1815,7 +1806,7 @@ go_ahead:
|
||||
else if (!(dir->__flags & dirent_saw_dot))
|
||||
{
|
||||
strcpy (de->d_name , ".");
|
||||
de->d_ino = readdir_get_ino_by_handle (get_handle ());
|
||||
de->d_ino = get_ino_by_handle (get_handle ());
|
||||
dir->__d_position++;
|
||||
dir->__flags |= dirent_saw_dot;
|
||||
res = 0;
|
||||
@@ -1826,7 +1817,7 @@ go_ahead:
|
||||
if (!(dir->__flags & dirent_isroot))
|
||||
de->d_ino = readdir_get_ino (get_name (), true);
|
||||
else
|
||||
de->d_ino = readdir_get_ino_by_handle (get_handle ());
|
||||
de->d_ino = get_ino_by_handle (get_handle ());
|
||||
dir->__d_position++;
|
||||
dir->__flags |= dirent_saw_dot_dot;
|
||||
res = 0;
|
||||
|
||||
Reference in New Issue
Block a user