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

ntdll: Use VALGRIND_RESIZEINPLACE_BLOCK when available.

Browse Source
This commit is contained in:
Maarten Lankhorst 2011-11-11 22:12:25 +01:00 committed by Alexandre Julliard
parent 5fc25686a4
commit d9889cfd63
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dlls/ntdll/heap.c
View File

@ -263,6 +263,13 @@ static inline void notify_free( void const *ptr )
#endif #endif
} }
static inline void notify_realloc( void const *ptr, SIZE_T size_old, SIZE_T size_new )
{
#ifdef VALGRIND_RESIZEINPLACE_BLOCK
VALGRIND_RESIZEINPLACE_BLOCK( ptr, size_old, size_new, 0 );
#endif
}
static void subheap_notify_free_all(SUBHEAP const *subheap) static void subheap_notify_free_all(SUBHEAP const *subheap)
{ {
#ifdef VALGRIND_FREELIKE_BLOCK #ifdef VALGRIND_FREELIKE_BLOCK
@ -753,6 +760,11 @@ static void *realloc_large_block( HEAP *heap, DWORD flags, void *ptr, SIZE_T siz
SIZE_T unused = arena->block_size - sizeof(*arena) - size; SIZE_T unused = arena->block_size - sizeof(*arena) - size;
/* FIXME: we could remap zero-pages instead */ /* FIXME: we could remap zero-pages instead */
#ifdef VALGRIND_RESIZEINPLACE_BLOCK
if (RUNNING_ON_VALGRIND)
notify_realloc( arena + 1, arena->data_size, size );
else
#endif
if (size > arena->data_size) if (size > arena->data_size)
initialize_block( (char *)ptr + arena->data_size, size - arena->data_size, unused, flags ); initialize_block( (char *)ptr + arena->data_size, size - arena->data_size, unused, flags );
else else
@ -1844,11 +1856,8 @@ PVOID WINAPI RtlReAllocateHeap( HANDLE heap, ULONG flags, PVOID ptr, SIZE_T size
list_remove( &pFree->entry ); list_remove( &pFree->entry );
pArena->size += (pFree->size & ARENA_SIZE_MASK) + sizeof(*pFree); pArena->size += (pFree->size & ARENA_SIZE_MASK) + sizeof(*pFree);
if (!HEAP_Commit( subheap, pArena, rounded_size )) goto oom; if (!HEAP_Commit( subheap, pArena, rounded_size )) goto oom;
notify_free( pArena + 1 ); notify_realloc( pArena + 1, oldActualSize, size );
HEAP_ShrinkBlock( subheap, pArena, rounded_size ); HEAP_ShrinkBlock( subheap, pArena, rounded_size );
notify_alloc( pArena + 1, size, FALSE );
/* FIXME: this is wrong as we may lose old VBits settings */
mark_block_initialized( pArena + 1, oldActualSize );
} }
else /* Do it the hard way */ else /* Do it the hard way */
{ {
@ -1883,12 +1892,8 @@ PVOID WINAPI RtlReAllocateHeap( HANDLE heap, ULONG flags, PVOID ptr, SIZE_T size
} }
else else
{ {
/* Shrink the block */
notify_free( pArena + 1 );
HEAP_ShrinkBlock( subheap, pArena, rounded_size ); HEAP_ShrinkBlock( subheap, pArena, rounded_size );
notify_alloc( pArena + 1, size, FALSE ); notify_realloc( pArena + 1, oldActualSize, size );
/* FIXME: this is wrong as we may lose old VBits settings */
mark_block_initialized( pArena + 1, size );
} }
pArena->unused_bytes = (pArena->size & ARENA_SIZE_MASK) - size; pArena->unused_bytes = (pArena->size & ARENA_SIZE_MASK) - size;