diff agent/src/share/classes/sun/jvm/hotspot/utilities/ReversePtrsAnalysis.java @ 6725:da91efe96a93

6964458: Reimplement class meta-data storage to use native memory Summary: Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland Contributed-by: jmasa <jon.masamitsu@oracle.com>, stefank <stefan.karlsson@oracle.com>, mgerdin <mikael.gerdin@oracle.com>, never <tom.rodriguez@oracle.com>
author coleenp
date Sat, 01 Sep 2012 13:25:18 -0400
parents 63997f575155
children
line wrap: on
line diff
--- a/agent/src/share/classes/sun/jvm/hotspot/utilities/ReversePtrsAnalysis.java	Fri Aug 31 16:39:35 2012 -0700
+++ b/agent/src/share/classes/sun/jvm/hotspot/utilities/ReversePtrsAnalysis.java	Sat Sep 01 13:25:18 2012 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -112,20 +112,22 @@
     doJNIHandleBlock(handles.weakGlobalHandles(),
                      new RootVisitor("Weak global JNI handle root"));
 
-    // Do Java-level static fields in perm gen
-    heap.iteratePerm(new DefaultHeapVisitor() {
-        public boolean doObj(Oop obj) {
-          if (obj instanceof InstanceKlass) {
-            final InstanceKlass ik = (InstanceKlass) obj;
+    // Do Java-level static fields
+    SystemDictionary sysDict = VM.getVM().getSystemDictionary();
+    sysDict.allClassesDo(new SystemDictionary.ClassVisitor() {
+
+            public void visit(Klass k) {
+                if (k instanceof InstanceKlass) {
+                    final InstanceKlass ik = (InstanceKlass)k;
             ik.iterateStaticFields(
                new DefaultOopVisitor() {
                    public void doOop(OopField field, boolean isVMField) {
                      Oop next = field.getValue(getObj());
-                     LivenessPathElement lp = new LivenessPathElement(null,
-                             new NamedFieldIdentifier("Static field \"" +
+                                                   NamedFieldIdentifier nfi = new NamedFieldIdentifier("Static field \"" +
                                                 field.getID().getName() +
                                                 "\" in class \"" +
-                                                ik.getName().asString() + "\""));
+                                                                                                       ik.getName().asString() + "\"");
+                                                   LivenessPathElement lp = new LivenessPathElement(null, nfi);
                      rp.put(lp, next);
                      try {
                        markAndTraverse(next);
@@ -144,7 +146,6 @@
                    }
                  });
           }
-                  return false;
         }
       });