src/share/vm/memory/metaspaceCounters.cpp

Fri, 20 Sep 2013 10:53:28 +0200

author
stefank
date
Fri, 20 Sep 2013 10:53:28 +0200
changeset 5769
2c022e432e10
parent 5716
73d0d0218068
child 6198
55fb97c4c58d
permissions
-rw-r--r--

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

     1 /*
     2  * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
     3  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     4  *
     5  * This code is free software; you can redistribute it and/or modify it
     6  * under the terms of the GNU General Public License version 2 only, as
     7  * published by the Free Software Foundation.
     8  *
     9  * This code is distributed in the hope that it will be useful, but WITHOUT
    10  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    11  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    12  * version 2 for more details (a copy is included in the LICENSE file that
    13  * accompanied this code).
    14  *
    15  * You should have received a copy of the GNU General Public License version
    16  * 2 along with this work; if not, write to the Free Software Foundation,
    17  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    18  *
    19  * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    20  * or visit www.oracle.com if you need additional information or have any
    21  * questions.
    22  *
    23  */
    25 #include "precompiled.hpp"
    26 #include "memory/metaspaceCounters.hpp"
    27 #include "memory/resourceArea.hpp"
    28 #include "runtime/globals.hpp"
    29 #include "runtime/perfData.hpp"
    30 #include "utilities/exceptions.hpp"
    32 class MetaspacePerfCounters: public CHeapObj<mtInternal> {
    33   friend class VMStructs;
    34   PerfVariable*      _capacity;
    35   PerfVariable*      _used;
    36   PerfVariable*      _max_capacity;
    38   PerfVariable* create_variable(const char *ns, const char *name, size_t value, TRAPS) {
    39     const char *path = PerfDataManager::counter_name(ns, name);
    40     return PerfDataManager::create_variable(SUN_GC, path, PerfData::U_Bytes, value, THREAD);
    41   }
    43   void create_constant(const char *ns, const char *name, size_t value, TRAPS) {
    44     const char *path = PerfDataManager::counter_name(ns, name);
    45     PerfDataManager::create_constant(SUN_GC, path, PerfData::U_Bytes, value, THREAD);
    46   }
    48  public:
    49   MetaspacePerfCounters(const char* ns, size_t min_capacity, size_t curr_capacity, size_t max_capacity, size_t used) {
    50     EXCEPTION_MARK;
    51     ResourceMark rm;
    53     create_constant(ns, "minCapacity", min_capacity, THREAD);
    54     _capacity = create_variable(ns, "capacity", curr_capacity, THREAD);
    55     _max_capacity = create_variable(ns, "maxCapacity", max_capacity, THREAD);
    56     _used = create_variable(ns, "used", used, THREAD);
    57   }
    59   void update(size_t capacity, size_t max_capacity, size_t used) {
    60     _capacity->set_value(capacity);
    61     _max_capacity->set_value(max_capacity);
    62     _used->set_value(used);
    63   }
    64 };
    66 MetaspacePerfCounters* MetaspaceCounters::_perf_counters = NULL;
    68 size_t MetaspaceCounters::used() {
    69   return MetaspaceAux::allocated_used_bytes();
    70 }
    72 size_t MetaspaceCounters::capacity() {
    73   return MetaspaceAux::committed_bytes();
    74 }
    76 size_t MetaspaceCounters::max_capacity() {
    77   return MetaspaceAux::reserved_bytes();
    78 }
    80 void MetaspaceCounters::initialize_performance_counters() {
    81   if (UsePerfData) {
    82     assert(_perf_counters == NULL, "Should only be initialized once");
    84     size_t min_capacity = 0;
    85     _perf_counters = new MetaspacePerfCounters("metaspace", min_capacity,
    86                                                capacity(), max_capacity(), used());
    87   }
    88 }
    90 void MetaspaceCounters::update_performance_counters() {
    91   if (UsePerfData) {
    92     assert(_perf_counters != NULL, "Should be initialized");
    94     _perf_counters->update(capacity(), max_capacity(), used());
    95   }
    96 }
    98 MetaspacePerfCounters* CompressedClassSpaceCounters::_perf_counters = NULL;
   100 size_t CompressedClassSpaceCounters::used() {
   101   return MetaspaceAux::allocated_used_bytes(Metaspace::ClassType);
   102 }
   104 size_t CompressedClassSpaceCounters::capacity() {
   105   return MetaspaceAux::committed_bytes(Metaspace::ClassType);
   106 }
   108 size_t CompressedClassSpaceCounters::max_capacity() {
   109   return MetaspaceAux::reserved_bytes(Metaspace::ClassType);
   110 }
   112 void CompressedClassSpaceCounters::update_performance_counters() {
   113   if (UsePerfData && UseCompressedClassPointers) {
   114     assert(_perf_counters != NULL, "Should be initialized");
   116     _perf_counters->update(capacity(), max_capacity(), used());
   117   }
   118 }
   120 void CompressedClassSpaceCounters::initialize_performance_counters() {
   121   if (UsePerfData) {
   122     assert(_perf_counters == NULL, "Should only be initialized once");
   123     const char* ns = "compressedclassspace";
   125     if (UseCompressedClassPointers) {
   126       size_t min_capacity = 0;
   127       _perf_counters = new MetaspacePerfCounters(ns, min_capacity, capacity(),
   128                                                  max_capacity(), used());
   129     } else {
   130       _perf_counters = new MetaspacePerfCounters(ns, 0, 0, 0, 0);
   131     }
   132   }
   133 }

mercurial