Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/memory/metaspaceCounters.cpp	Wed Sep 11 18:47:54 2013 +0200
     1.2 +++ b/src/share/vm/memory/metaspaceCounters.cpp	Thu Sep 12 10:15:30 2013 +0200
     1.3 @@ -71,7 +71,7 @@
     1.4    //   2) unused space at the end of each Metachunk
     1.5    //   3) space in the freelist
     1.6    size_t total_capacity = MetaspaceAux::allocated_capacity_bytes()
     1.7 -    + MetaspaceAux::free_bytes() + MetaspaceAux::free_chunks_total_in_bytes();
     1.8 +    + MetaspaceAux::free_bytes() + MetaspaceAux::free_chunks_total_bytes();
     1.9    return total_capacity;
    1.10  }
    1.11  
    1.12 @@ -79,9 +79,9 @@
    1.13    if (UsePerfData) {
    1.14      assert(_perf_counters == NULL, "Should only be initialized once");
    1.15  
    1.16 -    size_t min_capacity = MetaspaceAux::min_chunk_size();
    1.17 +    size_t min_capacity = MetaspaceAux::min_chunk_size_bytes();
    1.18      size_t capacity = calculate_capacity();
    1.19 -    size_t max_capacity = MetaspaceAux::reserved_in_bytes();
    1.20 +    size_t max_capacity = MetaspaceAux::reserved_bytes();
    1.21      size_t used = MetaspaceAux::allocated_used_bytes();
    1.22  
    1.23      _perf_counters = new MetaspacePerfCounters("metaspace", min_capacity, capacity, max_capacity, used);
    1.24 @@ -93,7 +93,7 @@
    1.25      assert(_perf_counters != NULL, "Should be initialized");
    1.26  
    1.27      size_t capacity = calculate_capacity();
    1.28 -    size_t max_capacity = MetaspaceAux::reserved_in_bytes();
    1.29 +    size_t max_capacity = MetaspaceAux::reserved_bytes();
    1.30      size_t used = MetaspaceAux::allocated_used_bytes();
    1.31  
    1.32      _perf_counters->update(capacity, max_capacity, used);
    1.33 @@ -105,7 +105,7 @@
    1.34  size_t CompressedClassSpaceCounters::calculate_capacity() {
    1.35      return MetaspaceAux::allocated_capacity_bytes(_class_type) +
    1.36             MetaspaceAux::free_bytes(_class_type) +
    1.37 -           MetaspaceAux::free_chunks_total_in_bytes(_class_type);
    1.38 +           MetaspaceAux::free_chunks_total_bytes(_class_type);
    1.39  }
    1.40  
    1.41  void CompressedClassSpaceCounters::update_performance_counters() {
    1.42 @@ -113,7 +113,7 @@
    1.43      assert(_perf_counters != NULL, "Should be initialized");
    1.44  
    1.45      size_t capacity = calculate_capacity();
    1.46 -    size_t max_capacity = MetaspaceAux::reserved_in_bytes(_class_type);
    1.47 +    size_t max_capacity = MetaspaceAux::reserved_bytes(_class_type);
    1.48      size_t used = MetaspaceAux::allocated_used_bytes(_class_type);
    1.49  
    1.50      _perf_counters->update(capacity, max_capacity, used);
    1.51 @@ -126,9 +126,9 @@
    1.52      const char* ns = "compressedclassspace";
    1.53  
    1.54      if (UseCompressedClassPointers) {
    1.55 -      size_t min_capacity = MetaspaceAux::min_chunk_size();
    1.56 +      size_t min_capacity = MetaspaceAux::min_chunk_size_bytes();
    1.57        size_t capacity = calculate_capacity();
    1.58 -      size_t max_capacity = MetaspaceAux::reserved_in_bytes(_class_type);
    1.59 +      size_t max_capacity = MetaspaceAux::reserved_bytes(_class_type);
    1.60        size_t used = MetaspaceAux::allocated_used_bytes(_class_type);
    1.61  
    1.62        _perf_counters = new MetaspacePerfCounters(ns, min_capacity, capacity, max_capacity, used);