src/os/windows/vm/perfMemory_windows.cpp
Index Unified diffs Context diffs Sdiffs Wdiffs Patch New Old Previous File Next File
*** old/src/os/windows/vm/perfMemory_windows.cpp	Tue Jun  4 09:59:34 2013
--- new/src/os/windows/vm/perfMemory_windows.cpp	Tue Jun  4 09:59:33 2013

*** 1,7 **** --- 1,7 ---- /* ! * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved. ! * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation.
*** 1496,1507 **** --- 1496,1506 ---- // clear the shared memory region (void)memset(mapAddress, '\0', size); // it does not go through os api, the operation has to record from here ! MemTracker::record_virtual_memory_reserve((address)mapAddress, size, mtInternal, CURRENT_PC); MemTracker::record_virtual_memory_type((address)mapAddress, mtInternal); return (char*) mapAddress; } // this method deletes the file mapping object.
*** 1679,1690 **** --- 1678,1688 ---- THROW_MSG(vmSymbols::java_lang_OutOfMemoryError(), "Could not map PerfMemory"); } // it does not go through os api, the operation has to record from here ! MemTracker::record_virtual_memory_reserve((address)mapAddress, size, mtInternal, CURRENT_PC); MemTracker::record_virtual_memory_type((address)mapAddress, mtInternal); *addrp = (char*)mapAddress; *sizep = size;
*** 1834,1846 **** --- 1832,1845 ---- if (PerfMemory::contains(addr) || PerfMemory::contains(addr + bytes - 1)) { // prevent accidental detachment of this process's PerfMemory region return; } + MemTracker::Tracker tkr = MemTracker::get_virtual_memory_release_tracker(); remove_file_mapping(addr); // it does not go through os api, the operation has to record from here ! MemTracker::record_virtual_memory_release((address)addr, bytes); ! tkr.record((address)addr, bytes); } char* PerfMemory::backing_store_filename() { return sharedmem_fileName; }

src/os/windows/vm/perfMemory_windows.cpp
Index Unified diffs Context diffs Sdiffs Wdiffs Patch New Old Previous File Next File