From 6d11044c633bc7aca545c5409327ef023646205b Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Fri, 25 Feb 2005 21:23:15 +0000 Subject: * fhandler.h (class fhandler_base): Declare fixup_mmap_after_fork with additional flags parameter. Change offset parameter to _off64_t. (class fhandler_disk_file): Ditto. (class fhandler_dev_mem): Ditto. * fhandler_mem.cc (fhandler_dev_mem::fixup_mmap_after_fork): Accomodate new parameters. * mmap.cc: Include ntdll.h. (class mmap_record): Add flags member. (mmap_record::mmap_record): Add flags parameter. (mmap_record::get_flags): New method. (class map): Add next_anon_addr member to store next anonymous mapping address suggestion. (map::get_next_anon_addr): New method. (map::set_next_anon_addr): New method. (mmap64): Don't align offset and length to granularity in case of MAP_ANONYMOUS on NT. Check for already existing mapping only on 9x. Call mmap_record::mmap_record with additional flags argument. (fhandler_base::fixup_mmap_after_fork): Accomodate new parameters. (fhandler_disk_file::mmap): Use NtMapViewOfSection with AT_ROUND_TO_PAGE flag for anonymous mappings on NT. If addr is NULL, try to map adjacent to previous mapping. (fhandler_disk_file::fixup_mmap_after_fork): Add flags argument. Change offset parameter to _off64_t. Use NtMapViewOfSection to re-create anonymous mappings on NT. (fixup_mmaps_after_fork): Accomodate new parameters when calling fhandler's fixup_mmaps_after_fork function. * ntdll.h (AT_ROUND_TO_PAGE): New define. --- winsup/cygwin/fhandler.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'winsup/cygwin/fhandler.h') diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h index d3250d1b2..2d9aa5f7f 100644 --- a/winsup/cygwin/fhandler.h +++ b/winsup/cygwin/fhandler.h @@ -285,8 +285,9 @@ class fhandler_base int flags, _off64_t off); virtual int munmap (HANDLE h, caddr_t addr, size_t len); virtual int msync (HANDLE h, caddr_t addr, size_t len, int flags); - virtual bool fixup_mmap_after_fork (HANDLE h, DWORD access, DWORD offset, - DWORD size, void *address); + virtual bool fixup_mmap_after_fork (HANDLE h, DWORD access, int flags, + _off64_t offset, DWORD size, + void *address); void *operator new (size_t, void *p) {return p;} @@ -633,8 +634,8 @@ class fhandler_disk_file: public fhandler_base HANDLE mmap (caddr_t *addr, size_t len, DWORD access, int flags, _off64_t off); int munmap (HANDLE h, caddr_t addr, size_t len); int msync (HANDLE h, caddr_t addr, size_t len, int flags); - bool fixup_mmap_after_fork (HANDLE h, DWORD access, DWORD offset, - DWORD size, void *address); + bool fixup_mmap_after_fork (HANDLE h, DWORD access, int flags, + _off64_t offset, DWORD size, void *address); DIR *opendir (); struct dirent *readdir (DIR *); _off64_t telldir (DIR *); @@ -1055,8 +1056,8 @@ class fhandler_dev_mem: public fhandler_base HANDLE mmap (caddr_t *addr, size_t len, DWORD access, int flags, _off64_t off); int munmap (HANDLE h, caddr_t addr, size_t len); int msync (HANDLE h, caddr_t addr, size_t len, int flags); - bool fixup_mmap_after_fork (HANDLE h, DWORD access, DWORD offset, - DWORD size, void *address); + bool fixup_mmap_after_fork (HANDLE h, DWORD access, int flags, + _off64_t offset, DWORD size, void *address); void dump (); } ; -- cgit v1.2.3