JehanneOS
/
newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* mmap.cc (fh_disk_file): Delete as global static variable and... 

(mmap64): ...define as local pointer to make mmap thread-safe.
	Accommodate throughout.  Only initialize fh_disk_file after file could
	be opened with GENERIC_EXECUTE access.  Call fstat_by_handle instead of
	fstat to avoid overhead.
This commit is contained in:
Corinna Vinschen 2007-09-18 15:59:50 +00:00
parent d81b646dc3
commit 4090f565a8
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,11 @@
2007-09-18 Corinna Vinschen <corinna@vinschen.de>
* mmap.cc (fh_disk_file): Delete as global static variable and...
(mmap64): ...define as local pointer to make mmap thread-safe.
Accommodate throughout. Only initialize fh_disk_file after file could
be opened with GENERIC_EXECUTE access. Call fstat_by_handle instead of
fstat to avoid overhead.
2007-09-18 Corinna Vinschen <corinna@vinschen.de> 2007-09-18 Corinna Vinschen <corinna@vinschen.de>
* security.cc (set_file_sd): Open file with FILE_OPEN_FOR_BACKUP_INTENT * security.cc (set_file_sd): Open file with FILE_OPEN_FOR_BACKUP_INTENT

19
winsup/cygwin/mmap.cc
View File

@ -49,8 +49,6 @@ details. */
/* Used for anonymous mappings. */ /* Used for anonymous mappings. */
static fhandler_dev_zero fh_anonymous; static fhandler_dev_zero fh_anonymous;
/* Used for reopening a disk file when necessary. */
static fhandler_disk_file fh_disk_file;
/* Small helpers to avoid having lots of flag bit tests in the code. */ /* Small helpers to avoid having lots of flag bit tests in the code. */
static inline bool static inline bool
@ -807,6 +805,8 @@ mmap64 (void *addr, size_t len, int prot, int flags, int fd, _off64_t off)
caddr_t ret = (caddr_t) MAP_FAILED; caddr_t ret = (caddr_t) MAP_FAILED;
fhandler_base *fh = NULL; fhandler_base *fh = NULL;
fhandler_disk_file *fh_disk_file = NULL; /* Used for reopening a disk file
when necessary. */
list *map_list = NULL; list *map_list = NULL;
size_t orig_len = 0; size_t orig_len = 0;
caddr_t base = NULL; caddr_t base = NULL;
@ -816,7 +816,6 @@ mmap64 (void *addr, size_t len, int prot, int flags, int fd, _off64_t off)
fh_anonymous.set_io_handle (INVALID_HANDLE_VALUE); fh_anonymous.set_io_handle (INVALID_HANDLE_VALUE);
fh_anonymous.set_access (GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE); fh_anonymous.set_access (GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE);
fh_disk_file.set_io_handle (NULL);
SetResourceLock (LOCK_MMAP_LIST, READ_LOCK | WRITE_LOCK, "mmap"); SetResourceLock (LOCK_MMAP_LIST, READ_LOCK | WRITE_LOCK, "mmap");
@ -888,9 +887,11 @@ mmap64 (void *addr, size_t len, int prot, int flags, int fd, _off64_t off)
| FILE_OPEN_FOR_BACKUP_INTENT); | FILE_OPEN_FOR_BACKUP_INTENT);
if (NT_SUCCESS (status)) if (NT_SUCCESS (status))
{ {
fh_disk_file.set_io_handle (h); fh_disk_file = new (alloca (sizeof *fh_disk_file)) fhandler_disk_file;
fh_disk_file.set_access (fh->get_access () | GENERIC_EXECUTE); fh_disk_file->set_name (fh->pc);
fh = &fh_disk_file; fh_disk_file->set_io_handle (h);
fh_disk_file->set_access (fh->get_access () | GENERIC_EXECUTE);
fh = fh_disk_file;
} }
else if (prot & PROT_EXEC) else if (prot & PROT_EXEC)
{ {
@ -901,7 +902,7 @@ mmap64 (void *addr, size_t len, int prot, int flags, int fd, _off64_t off)
goto out; goto out;
} }
if (fh->fstat (&st)) if (fh->fstat_by_handle (&st))
{ {
__seterrno (); __seterrno ();
goto out; goto out;
@ -1074,8 +1075,8 @@ out:
ReleaseResourceLock (LOCK_MMAP_LIST, READ_LOCK | WRITE_LOCK, "mmap"); ReleaseResourceLock (LOCK_MMAP_LIST, READ_LOCK | WRITE_LOCK, "mmap");
if (fh_disk_file.get_handle ()) if (fh_disk_file)
NtClose (fh_disk_file.get_handle ()); NtClose (fh_disk_file->get_handle ());
syscall_printf ("%p = mmap() ", ret); syscall_printf ("%p = mmap() ", ret);
return ret; return ret;