From 6c1ec25016945b2287dec1ca9d35589ac8df6b45 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Sat, 30 Apr 2011 14:01:14 -0600 Subject: [PATCH] win32: fix page counting in memory manager --- src/racket/gc2/vm_osk.c | 3 --- src/racket/gc2/vm_win.c | 7 ++----- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/racket/gc2/vm_osk.c b/src/racket/gc2/vm_osk.c index 34e94c5e5f..e05cf81b85 100644 --- a/src/racket/gc2/vm_osk.c +++ b/src/racket/gc2/vm_osk.c @@ -18,14 +18,11 @@ inline static void *os_malloc_pages(MMU *mmu, size_t len, size_t alignment, int if (!dirty_ok) memset(p, 0, len); - mmu_memory_allocated_inc(mmu, len); - return p; } static void os_free_pages(MMU *mmu, void *p, size_t len) { - mmu_memory_allocated_dec(mmu, len); sfree(p, len); } diff --git a/src/racket/gc2/vm_win.c b/src/racket/gc2/vm_win.c index 391800966d..778f2ffe12 100644 --- a/src/racket/gc2/vm_win.c +++ b/src/racket/gc2/vm_win.c @@ -42,12 +42,10 @@ static void *os_alloc_pages(MMU *mmu, size_t len, size_t alignment, int dirty_ok } #endif - mmu_memory_allocated_inc(mmu, len); - /* VirtualAlloc MEM_COMMIT always zeros memory */ return (void *)VirtualAlloc(NULL, len, - MEM_COMMIT | MEM_RESERVE, - PAGE_READWRITE); + MEM_COMMIT | MEM_RESERVE, + PAGE_READWRITE); } static void os_free_pages(MMU *mmu, void *p, size_t len) @@ -69,7 +67,6 @@ static void os_free_pages(MMU *mmu, void *p, size_t len) } #endif - mmu_memory_allocated_dec(mmu, len); VirtualFree(p, 0, MEM_RELEASE); }