stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Daniel D. Daugherty 2010-05-17 03:53:55 -07:00
commit e453a8780a
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/CMSBitMap.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
* Copyright 2007-2010 Sun Microsystems, Inc. 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
@ -78,9 +78,8 @@ public class CMSBitMap extends VMObject {
}
public BitMap bm() {
BitMap bitMap = new BitMap((int) (bmWordSize() >> (shifter() + 3) ));
BitMap bitMap = new BitMap((int) (bmWordSize() >> shifter() ));
VirtualSpace vs = virtualSpace();
//bitMap.set_size((int)vs.committedSize());
bitMap.set_map(vs.low());
return bitMap;
}

10
hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/JavaThread.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 Sun Microsystems, Inc. All Rights Reserved.
* Copyright 2000-2010 Sun Microsystems, Inc. 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
@ -326,7 +326,13 @@ public class JavaThread extends Thread {
/** Gets the Java-side thread object for this JavaThread */
public Oop getThreadObj() {
return VM.getVM().getObjectHeap().newOop(threadObjField.getValue(addr));
Oop obj = null;
try {
obj = VM.getVM().getObjectHeap().newOop(threadObjField.getValue(addr));
} catch (Exception e) {
e.printStackTrace();
}
return obj;
}
/** Get the Java-side name of this thread */