OpenJDK / portola / portola
changeset 35484:b6cbeec1b48b
Merge
author | jiangli |
---|---|
date | Wed, 13 Jan 2016 01:45:14 +0100 |
parents | cedc2e709ac8 d9cf65a7fd2d |
children | b8d9cabc184d |
files | |
diffstat | 1 files changed, 9 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/hotspot/src/share/vm/services/virtualMemoryTracker.cpp Tue Jan 12 22:50:57 2016 +0000 +++ b/hotspot/src/share/vm/services/virtualMemoryTracker.cpp Wed Jan 13 01:45:14 2016 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2016, 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 @@ -416,6 +416,14 @@ return false; } + if (reserved_rgn->flag() == mtClassShared && + reserved_rgn->contain_region(addr, size) && + !reserved_rgn->same_region(addr, size)) { + // This is an unmapped CDS region, which is part of the reserved shared + // memory region. + // See special handling in VirtualMemoryTracker::add_reserved_region also. + return true; + } VirtualMemorySummary::record_released_memory(size, reserved_rgn->flag());