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

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

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

28
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 * reserve_area
* *
@ -225,20 +246,15 @@ void *wine_anon_mmap( void *start, size_t size, int prot, int flags )
*/ */
static void reserve_area( void *addr, void *end ) static void reserve_area( void *addr, void *end )
{ {
void *ptr;
size_t size = (char *)end - (char *)addr; size_t size = (char *)end - (char *)addr;
if (!size) return; 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 ); wine_mmap_add_reserved_area( addr, size );
return; return;
} }
else munmap( ptr, size );
}
if (size > granularity_mask + 1) if (size > granularity_mask + 1)
{ {
size_t new_size = (size / 2) & ~granularity_mask; size_t new_size = (size / 2) & ~granularity_mask;