Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/src/share/vm/gc_implementation/shared/gcHeapSummary.hpp	Thu Apr 10 15:11:37 2014 -0700
     1.2 +++ b/src/share/vm/gc_implementation/shared/gcHeapSummary.hpp	Wed Mar 26 14:15:02 2014 +0100
     1.3 @@ -62,16 +62,16 @@
     1.4  };
     1.5  
     1.6  class MetaspaceSizes : public StackObj {
     1.7 -  size_t _capacity;
     1.8 +  size_t _committed;
     1.9    size_t _used;
    1.10    size_t _reserved;
    1.11  
    1.12   public:
    1.13 -  MetaspaceSizes() : _capacity(0), _used(0), _reserved(0) {}
    1.14 -  MetaspaceSizes(size_t capacity, size_t used, size_t reserved) :
    1.15 -    _capacity(capacity), _used(used), _reserved(reserved) {}
    1.16 +  MetaspaceSizes() : _committed(0), _used(0), _reserved(0) {}
    1.17 +  MetaspaceSizes(size_t committed, size_t used, size_t reserved) :
    1.18 +    _committed(committed), _used(used), _reserved(reserved) {}
    1.19  
    1.20 -  size_t capacity() const { return _capacity; }
    1.21 +  size_t committed() const { return _committed; }
    1.22    size_t used() const { return _used; }
    1.23    size_t reserved() const { return _reserved; }
    1.24  };

     2.1 --- a/src/share/vm/gc_implementation/shared/gcTraceSend.cpp	Thu Apr 10 15:11:37 2014 -0700
     2.2 +++ b/src/share/vm/gc_implementation/shared/gcTraceSend.cpp	Wed Mar 26 14:15:02 2014 +0100
     2.3 @@ -258,7 +258,7 @@
     2.4  static TraceStructMetaspaceSizes to_trace_struct(const MetaspaceSizes& sizes) {
     2.5    TraceStructMetaspaceSizes meta_sizes;
     2.6  
     2.7 -  meta_sizes.set_capacity(sizes.capacity());
     2.8 +  meta_sizes.set_committed(sizes.committed());
     2.9    meta_sizes.set_used(sizes.used());
    2.10    meta_sizes.set_reserved(sizes.reserved());
    2.11  

     3.1 --- a/src/share/vm/gc_interface/collectedHeap.cpp	Thu Apr 10 15:11:37 2014 -0700
     3.2 +++ b/src/share/vm/gc_interface/collectedHeap.cpp	Wed Mar 26 14:15:02 2014 +0100
     3.3 @@ -85,15 +85,15 @@
     3.4  
     3.5  MetaspaceSummary CollectedHeap::create_metaspace_summary() {
     3.6    const MetaspaceSizes meta_space(
     3.7 -      MetaspaceAux::allocated_capacity_bytes(),
     3.8 +      MetaspaceAux::committed_bytes(),
     3.9        MetaspaceAux::allocated_used_bytes(),
    3.10        MetaspaceAux::reserved_bytes());
    3.11    const MetaspaceSizes data_space(
    3.12 -      MetaspaceAux::allocated_capacity_bytes(Metaspace::NonClassType),
    3.13 +      MetaspaceAux::committed_bytes(Metaspace::NonClassType),
    3.14        MetaspaceAux::allocated_used_bytes(Metaspace::NonClassType),
    3.15        MetaspaceAux::reserved_bytes(Metaspace::NonClassType));
    3.16    const MetaspaceSizes class_space(
    3.17 -      MetaspaceAux::allocated_capacity_bytes(Metaspace::ClassType),
    3.18 +      MetaspaceAux::committed_bytes(Metaspace::ClassType),
    3.19        MetaspaceAux::allocated_used_bytes(Metaspace::ClassType),
    3.20        MetaspaceAux::reserved_bytes(Metaspace::ClassType));
    3.21  

     4.1 --- a/src/share/vm/trace/trace.xml	Thu Apr 10 15:11:37 2014 -0700
     4.2 +++ b/src/share/vm/trace/trace.xml	Wed Mar 26 14:15:02 2014 +0100
     4.3 @@ -185,7 +185,7 @@
     4.4      </event>
     4.5  
     4.6      <struct id="MetaspaceSizes">
     4.7 -      <value type="BYTES64" field="capacity" label="Capacity" description="Total available memory to allocate in" />
     4.8 +      <value type="BYTES64" field="committed" label="Committed" description="Committed memory for this space" />
     4.9        <value type="BYTES64" field="used" label="Used" description="Bytes allocated by objects in the space" />
    4.10        <value type="BYTES64" field="reserved" label="Reserved" description="Reserved memory for this space" />
    4.11      </struct>