diff agent/src/share/classes/sun/jvm/hotspot/ci/ciInstanceKlass.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 f6f3bb0ee072
children bd7a7ce2e264
line wrap: on
line diff
--- a/agent/src/share/classes/sun/jvm/hotspot/ci/ciInstanceKlass.java	Fri Aug 31 16:39:35 2012 -0700
+++ b/agent/src/share/classes/sun/jvm/hotspot/ci/ciInstanceKlass.java	Sat Sep 01 13:25:18 2012 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
@@ -47,8 +47,8 @@
     Type type      = db.lookupType("ciInstanceKlass");
     initStateField = new CIntField(type.getCIntegerField("_init_state"), 0);
     isSharedField = new CIntField(type.getCIntegerField("_is_shared"), 0);
-    CLASS_STATE_LINKED = db.lookupIntConstant("instanceKlass::linked").intValue();
-    CLASS_STATE_FULLY_INITIALIZED = db.lookupIntConstant("instanceKlass::fully_initialized").intValue();
+    CLASS_STATE_LINKED = db.lookupIntConstant("InstanceKlass::linked").intValue();
+    CLASS_STATE_FULLY_INITIALIZED = db.lookupIntConstant("InstanceKlass::fully_initialized").intValue();
   }
 
   private static CIntField initStateField;
@@ -63,7 +63,7 @@
   public int initState() {
     int initState = (int)initStateField.getValue(getAddress());
     if (isShared() && initState < CLASS_STATE_LINKED) {
-      InstanceKlass ik = (InstanceKlass)getOop();
+      InstanceKlass ik = (InstanceKlass)getMetadata();
       initState = ik.getInitStateAsInt();
     }
     return initState;