Mercurial > hg > truffle

diff src/share/vm/memory/metaspace.hpp @ 7435:c71879335291

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8005108: NPG: MetaspaceAux::used_in_bytes(), capacity_in_bytes() and reserved_in_bytes() return inconsistent numbers Summary: Reverted the changes to these functions from JDK-8000662 Reviewed-by: brutisso, jmasa
author stefank
date Tue, 18 Dec 2012 10:40:51 +0100
parents 5fafdef522c6
children e51c9860cf66
line wrap: on
line diff
--- a/src/share/vm/memory/metaspace.hpp	Mon Dec 17 15:25:26 2012 +0100
+++ b/src/share/vm/memory/metaspace.hpp	Tue Dec 18 10:40:51 2012 +0100
@@ -156,16 +156,25 @@
 
  public:
   // Total of space allocated to metadata in all Metaspaces
-  static size_t used_in_bytes();
+  static size_t used_in_bytes() {
+    return used_in_bytes(Metaspace::ClassType) +
+           used_in_bytes(Metaspace::NonClassType);
+  }
 
   // Total of available space in all Metaspaces
   // Total of capacity allocated to all Metaspaces.  This includes
   // space in Metachunks not yet allocated and in the Metachunk
   // freelist.
-  static size_t capacity_in_bytes();
+  static size_t capacity_in_bytes() {
+    return capacity_in_bytes(Metaspace::ClassType) +
+           capacity_in_bytes(Metaspace::NonClassType);
+  }
 
   // Total space reserved in all Metaspaces
-  static size_t reserved_in_bytes();
+  static size_t reserved_in_bytes() {
+    return reserved_in_bytes(Metaspace::ClassType) +
+           reserved_in_bytes(Metaspace::NonClassType);
+  }
 
   static size_t min_chunk_size();