system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-06 18:27:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

libwine: Only try to mmap the exact address when reserving memory.

Browse source 
This should avoid some extra work on platforms that need the
try_mmap_fixed function.
This commit is contained in:
Alexandre Julliard 2006-04-13 21:55:33 +02:00
parent b7d5b31cf1
commit e814b24e6d
1 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
libs/wine/mmap.c
View file

@ -217,6 +217,27 @@ void *wine_anon_mmap( void *start, size_t size, int prot, int flags )
}
/***********************************************************************
* mmap_reserve
*
* mmap wrapper used for reservations, only maps the specified address
*/
static inline int mmap_reserve( void *addr, size_t size )
{
void *ptr;
int flags = MAP_PRIVATE | MAP_ANON | MAP_NORESERVE;
#ifdef MAP_TRYFIXED
flags |= MAP_TRYFIXED;
#elif defined(__svr4__) || defined(__NetBSD__) || defined(__APPLE__)
return try_mmap_fixed( addr, size, PROT_NONE, flags, get_fdzero(), 0 );
#endif
ptr = mmap( addr, size, PROT_NONE, flags, get_fdzero(), 0 );
if (ptr != addr && ptr != (void *)-1) munmap( ptr, size );
return (ptr == addr);
}
/***********************************************************************
* reserve_area
*
@ -225,19 +246,14 @@ void *wine_anon_mmap( void *start, size_t size, int prot, int flags )
*/
static void reserve_area( void *addr, void *end )
{
void *ptr;
size_t size = (char *)end - (char *)addr;
if (!size) return;
if ((ptr = wine_anon_mmap( addr, size, PROT_NONE, MAP_NORESERVE )) != (void *)-1)
if (mmap_reserve( addr, size ))
{
if (ptr == addr)
{
wine_mmap_add_reserved_area( addr, size );
return;
}
else munmap( ptr, size );
wine_mmap_add_reserved_area( addr, size );
return;
}
if (size > granularity_mask + 1)
{