Module: wine Branch: master Commit: a184ce483bfe70e9fa8fb95f6a6f2a2062842ab7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a184ce483bfe70e9fa8fb95f6...
Author: Alexandre Julliard julliard@winehq.org Date: Mon Apr 8 19:34:09 2019 +0200
ntdll: Avoid using DPRINTF().
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/ntdll/heap.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index bdadc79..cccaaee 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -340,13 +340,13 @@ static void HEAP_Dump( HEAP *heap ) SUBHEAP *subheap; char *ptr;
- DPRINTF( "Heap: %p\n", heap ); - DPRINTF( "Next: %p Sub-heaps:", LIST_ENTRY( heap->entry.next, HEAP, entry ) ); - LIST_FOR_EACH_ENTRY( subheap, &heap->subheap_list, SUBHEAP, entry ) DPRINTF( " %p", subheap ); + TRACE( "Heap: %p\n", heap ); + TRACE( "Next: %p Sub-heaps:", LIST_ENTRY( heap->entry.next, HEAP, entry ) ); + LIST_FOR_EACH_ENTRY( subheap, &heap->subheap_list, SUBHEAP, entry ) TRACE( " %p", subheap );
- DPRINTF( "\nFree lists:\n Block Stat Size Id\n" ); + TRACE( "\nFree lists:\n Block Stat Size Id\n" ); for (i = 0; i < HEAP_NB_FREE_LISTS; i++) - DPRINTF( "%p free %08lx prev=%p next=%p\n", + TRACE( "%p free %08lx prev=%p next=%p\n", &heap->freeList[i].arena, i < HEAP_NB_SMALL_FREE_LISTS ? HEAP_MIN_ARENA_SIZE + i * ALIGNMENT : HEAP_freeListSizes[i - HEAP_NB_SMALL_FREE_LISTS], LIST_ENTRY( heap->freeList[i].arena.entry.prev, ARENA_FREE, entry ), @@ -355,17 +355,17 @@ static void HEAP_Dump( HEAP *heap ) LIST_FOR_EACH_ENTRY( subheap, &heap->subheap_list, SUBHEAP, entry ) { SIZE_T freeSize = 0, usedSize = 0, arenaSize = subheap->headerSize; - DPRINTF( "\n\nSub-heap %p: base=%p size=%08lx committed=%08lx\n", + TRACE( "\n\nSub-heap %p: base=%p size=%08lx committed=%08lx\n", subheap, subheap->base, subheap->size, subheap->commitSize );
- DPRINTF( "\n Block Arena Stat Size Id\n" ); + TRACE( "\n Block Arena Stat Size Id\n" ); ptr = (char *)subheap->base + subheap->headerSize; while (ptr < (char *)subheap->base + subheap->size) { if (*(DWORD *)ptr & ARENA_FLAG_FREE) { ARENA_FREE *pArena = (ARENA_FREE *)ptr; - DPRINTF( "%p %08x free %08x prev=%p next=%p\n", + TRACE( "%p %08x free %08x prev=%p next=%p\n", pArena, pArena->magic, pArena->size & ARENA_SIZE_MASK, LIST_ENTRY( pArena->entry.prev, ARENA_FREE, entry ), @@ -377,7 +377,7 @@ static void HEAP_Dump( HEAP *heap ) else if (*(DWORD *)ptr & ARENA_FLAG_PREV_FREE) { ARENA_INUSE *pArena = (ARENA_INUSE *)ptr; - DPRINTF( "%p %08x Used %08x back=%p\n", + TRACE( "%p %08x Used %08x back=%p\n", pArena, pArena->magic, pArena->size & ARENA_SIZE_MASK, *((ARENA_FREE **)pArena - 1) ); ptr += sizeof(*pArena) + (pArena->size & ARENA_SIZE_MASK); arenaSize += sizeof(ARENA_INUSE); @@ -386,7 +386,7 @@ static void HEAP_Dump( HEAP *heap ) else { ARENA_INUSE *pArena = (ARENA_INUSE *)ptr; - DPRINTF( "%p %08x %s %08x\n", + TRACE( "%p %08x %s %08x\n", pArena, pArena->magic, pArena->magic == ARENA_INUSE_MAGIC ? "used" : "pend", pArena->size & ARENA_SIZE_MASK ); ptr += sizeof(*pArena) + (pArena->size & ARENA_SIZE_MASK); @@ -394,7 +394,7 @@ static void HEAP_Dump( HEAP *heap ) usedSize += pArena->size & ARENA_SIZE_MASK; } } - DPRINTF( "\nTotal: Size=%08lx Committed=%08lx Free=%08lx Used=%08lx Arenas=%08lx (%ld%%)\n\n", + TRACE( "\nTotal: Size=%08lx Committed=%08lx Free=%08lx Used=%08lx Arenas=%08lx (%ld%%)\n\n", subheap->size, subheap->commitSize, freeSize, usedSize, arenaSize, (arenaSize * 100) / subheap->size ); }