ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libwine: On Mac, use a more capable Mach function to map memory and avoid calling mmap() in some cases. 

Signed-off-by: Ken Thomases <ken@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Ken Thomases 2019-03-06 18:59:37 -06:00 committed by Alexandre Julliard
parent 65f30810c1
commit 91d5d56748
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libs/wine/mmap.c
View File

@ -165,23 +165,29 @@ static int try_mmap_fixed (void *addr, size_t len, int prot, int flags,
#elif defined(__APPLE__) #elif defined(__APPLE__)
#include <mach/mach_init.h> #include <mach/mach_init.h>
#include <mach/vm_map.h> #include <mach/mach_vm.h>
/* /*
* On Darwin, we can use the Mach call vm_allocate to allocate * On Darwin, we can use the Mach call mach_vm_map to allocate
* anonymous memory at the specified address, and then use mmap with * anonymous memory at the specified address and then, if necessary, use
* MAP_FIXED to replace the mapping. * mmap with MAP_FIXED to replace the mapping.
*/ */
static int try_mmap_fixed (void *addr, size_t len, int prot, int flags, static int try_mmap_fixed (void *addr, size_t len, int prot, int flags,
int fildes, off_t off) int fildes, off_t off)
{ {
vm_address_t result = (vm_address_t)addr; mach_vm_address_t result = (mach_vm_address_t)addr;
int vm_flags = VM_FLAGS_FIXED;
if (!vm_allocate(mach_task_self(),&result,len,0)) if (flags & MAP_NOCACHE)
vm_flags |= VM_FLAGS_NO_CACHE;
if (!mach_vm_map( mach_task_self(), &result, len, 0, vm_flags, MEMORY_OBJECT_NULL,
0, 0, prot, VM_PROT_ALL, VM_INHERIT_COPY ))
{ {
if (mmap( (void *)result, len, prot, flags | MAP_FIXED, fildes, off ) != MAP_FAILED) flags |= MAP_FIXED;
if (((flags & ~(MAP_NORESERVE | MAP_NOCACHE)) == (MAP_ANON | MAP_FIXED | MAP_PRIVATE)) ||
mmap( (void *)result, len, prot, flags, fildes, off ) != MAP_FAILED)
return 1; return 1;
vm_deallocate(mach_task_self(),result,len); mach_vm_deallocate(mach_task_self(),result,len);
} }
return 0; return 0;
} }