Mercurial > hg > truffle
view src/share/vm/services/psMemoryPool.cpp @ 12301:2c022e432e10
8024974: Incorrect use of GC_locker::is_active()
Summary: SymbolTable and StringTable can make calls to GC_locker::is_active() outside a safepoint. This isn't safe because the GC_locker active state (lock count) is only updated at a safepoint and only remains valid as long as _needs_gc is true. However, outside a safepoint_needs_gc can change to false at any time, which makes it impossible to do a correct call to is_active() in that context. In this case these calls can just be removed since the input argument to basic_add() should never be on the heap and so there's no need to check the GC_locker state. This change also adjusts the assert() in is_active() to makes sure all calls to this function are always done under a safepoint.
Reviewed-by: brutisso, dcubed
Contributed-by: per.liden@oracle.com
author | stefank |
---|---|
date | Fri, 20 Sep 2013 10:53:28 +0200 |
parents | da91efe96a93 |
children |
line wrap: on
line source
/* * Copyright (c) 2007, 2012, 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. * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. * */ #include "precompiled.hpp" #include "classfile/systemDictionary.hpp" #include "classfile/vmSymbols.hpp" #include "oops/oop.inline.hpp" #include "runtime/handles.inline.hpp" #include "runtime/javaCalls.hpp" #include "services/lowMemoryDetector.hpp" #include "services/management.hpp" #include "services/memoryManager.hpp" #include "services/psMemoryPool.hpp" PSGenerationPool::PSGenerationPool(PSOldGen* gen, const char* name, PoolType type, bool support_usage_threshold) : CollectedMemoryPool(name, type, gen->capacity_in_bytes(), gen->reserved().byte_size(), support_usage_threshold), _gen(gen) { } MemoryUsage PSGenerationPool::get_memory_usage() { size_t maxSize = (available_for_allocation() ? max_size() : 0); size_t used = used_in_bytes(); size_t committed = _gen->capacity_in_bytes(); return MemoryUsage(initial_size(), used, committed, maxSize); } // The max size of EdenMutableSpacePool = // max size of the PSYoungGen - capacity of two survivor spaces // // Max size of PS eden space is changing due to ergonomic. // PSYoungGen, PSOldGen, Eden, Survivor spaces are all resizable. // EdenMutableSpacePool::EdenMutableSpacePool(PSYoungGen* gen, MutableSpace* space, const char* name, PoolType type, bool support_usage_threshold) : CollectedMemoryPool(name, type, space->capacity_in_bytes(), (gen->max_size() - gen->from_space()->capacity_in_bytes() - gen->to_space()->capacity_in_bytes()), support_usage_threshold), _gen(gen), _space(space) { } MemoryUsage EdenMutableSpacePool::get_memory_usage() { size_t maxSize = (available_for_allocation() ? max_size() : 0); size_t used = used_in_bytes(); size_t committed = _space->capacity_in_bytes(); return MemoryUsage(initial_size(), used, committed, maxSize); } // The max size of SurvivorMutableSpacePool = // current capacity of the from-space // // PS from and to survivor spaces could have different sizes. // SurvivorMutableSpacePool::SurvivorMutableSpacePool(PSYoungGen* gen, const char* name, PoolType type, bool support_usage_threshold) : CollectedMemoryPool(name, type, gen->from_space()->capacity_in_bytes(), gen->from_space()->capacity_in_bytes(), support_usage_threshold), _gen(gen) { } MemoryUsage SurvivorMutableSpacePool::get_memory_usage() { size_t maxSize = (available_for_allocation() ? max_size() : 0); size_t used = used_in_bytes(); size_t committed = committed_in_bytes(); return MemoryUsage(initial_size(), used, committed, maxSize); }