From a998dd705576606f85e3598e5a38ea8d3805f798 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Mon, 24 Mar 2008 14:48:58 +0000 Subject: * fhandler.cc (fhandler_base::dup): Drop setting flags in the parent. Implement advisory file locking. * cygheap.h (struct init_cygheap): Add inode_list member. * cygwin.din (lockf): Export. * dcrt0.cc (child_info_spawn::handle_spawn): Call fixup_lockf_after_exec. * dtable.h (class dtable): Add fhandler_disk_file as friend class. * fhandler.cc (fhandler_base::close): Call del_my_locks if node is set. (fhandler_base::fhandler_base): Initialize node to NULL. (fhandler_base::fixup_after_fork): Ditto. * fhandler.h (class fhandler_base): Add member node. * fhandler_disk_file.cc (fhandler_disk_file::lock): Delete. * flock.cc: Implement all advisory file locking here. (fhandler_disk_file::lock): Implement here. (flock): Call fcntl with F_FLOCK bit set. Remove test main function. (lockf): New function. * fork.cc (frok::child): Call fixup_lockf_after_fork. * ntdll.h (DIRECTORY_ALL_ACCESS): Define. (struct _OBJECT_BASIC_INFORMATION): Define. (enum _EVENT_TYPE): Define. (NtCreateDirectoryObject): Declare. (NtCreateEvent): Declare. (NtCreateMutant): Declare. (NtOpenEvent): Declare. (NtOpenMutant): Declare. * include/cygwin/version.h: Bump API minor number. --- winsup/cygwin/cygheap.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'winsup/cygwin/cygheap.h') diff --git a/winsup/cygwin/cygheap.h b/winsup/cygwin/cygheap.h index d1bc5cc..b181584 100644 --- a/winsup/cygwin/cygheap.h +++ b/winsup/cygwin/cygheap.h @@ -295,6 +295,9 @@ struct init_cygheap size_t sthreads; pid_t pid; /* my pid */ HANDLE pid_handle; /* handle for my pid */ + struct { /* Equivalent to using LIST_HEAD. */ + struct inode_t *lh_first; + } inode_list; /* Global inode pointer for adv. locking. */ hook_chain hooks; void close_ctty (); int manage_console_count (const char *, int, bool = false) __attribute__ ((regparm (3))); -- cgit v1.1