Mercurial > hg > graal-compiler
annotate agent/src/share/classes/sun/jvm/hotspot/runtime/win32_amd64/Win32AMD64JavaThreadPDAccess.java @ 7974:43badbe2717a
8000973: SA on windows thread inspection is broken
Summary: After bug 7161732, On Windows SA could not find correct address of thread_id of OSThread since _thread_id moved to end of the class . The presupposition of the address is following thread handle no longer stands. Fix by adding thread_id field to OSThread and getting the address directly from OSThread.
Reviewed-by: nloodin, sspitsyn
Contributed-by: yumin.qi@oracle.com
author | minqi |
---|---|
date | Thu, 31 Jan 2013 17:43:01 -0800 |
parents | f6f3bb0ee072 |
children |
rev | line source |
---|---|
0 | 1 /* |
7974 | 2 * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. |
0 | 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * | |
5 * This code is free software; you can redistribute it and/or modify it | |
6 * under the terms of the GNU General Public License version 2 only, as | |
7 * published by the Free Software Foundation. | |
8 * | |
9 * This code is distributed in the hope that it will be useful, but WITHOUT | |
10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
12 * version 2 for more details (a copy is included in the LICENSE file that | |
13 * accompanied this code). | |
14 * | |
15 * You should have received a copy of the GNU General Public License version | |
16 * 2 along with this work; if not, write to the Free Software Foundation, | |
17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | |
18 * | |
1552
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
0
diff
changeset
|
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
0
diff
changeset
|
20 * or visit www.oracle.com if you need additional information or have any |
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
0
diff
changeset
|
21 * questions. |
0 | 22 * |
23 */ | |
24 | |
25 package sun.jvm.hotspot.runtime.win32_amd64; | |
26 | |
27 import java.io.*; | |
28 import java.util.*; | |
29 import sun.jvm.hotspot.debugger.*; | |
30 import sun.jvm.hotspot.debugger.amd64.*; | |
31 import sun.jvm.hotspot.runtime.*; | |
32 import sun.jvm.hotspot.runtime.amd64.*; | |
3908
7588156f5cf9
7051798: SA-JDI: NPE in Frame.addressOfStackSlot(Frame.java:244)
never
parents:
1552
diff
changeset
|
33 import sun.jvm.hotspot.runtime.x86.*; |
0 | 34 import sun.jvm.hotspot.types.*; |
35 import sun.jvm.hotspot.utilities.*; | |
36 | |
37 /** This class is only public to allow using the VMObjectFactory to | |
38 instantiate these. | |
39 */ | |
40 | |
41 public class Win32AMD64JavaThreadPDAccess implements JavaThreadPDAccess { | |
42 private static AddressField lastJavaFPField; | |
43 private static AddressField osThreadField; | |
44 | |
45 // Field from OSThread | |
7974 | 46 private static Field osThreadThreadIdField; |
0 | 47 |
48 // This is currently unneeded but is being kept in case we change | |
49 // the currentFrameGuess algorithm | |
50 private static final long GUESS_SCAN_RANGE = 128 * 1024; | |
51 | |
52 static { | |
53 VM.registerVMInitializedObserver(new Observer() { | |
54 public void update(Observable o, Object data) { | |
55 initialize(VM.getVM().getTypeDataBase()); | |
56 } | |
57 }); | |
58 } | |
59 | |
60 private static synchronized void initialize(TypeDataBase db) { | |
61 Type type = db.lookupType("JavaThread"); | |
62 Type anchorType = db.lookupType("JavaFrameAnchor"); | |
63 lastJavaFPField = anchorType.getAddressField("_last_Java_fp"); | |
64 osThreadField = type.getAddressField("_osthread"); | |
65 | |
66 type = db.lookupType("OSThread"); | |
7974 | 67 osThreadThreadIdField = type.getField("_thread_id"); |
0 | 68 } |
69 | |
70 public Address getLastJavaFP(Address addr) { | |
71 return lastJavaFPField.getValue(addr.addOffsetTo(sun.jvm.hotspot.runtime.JavaThread.getAnchorField().getOffset())); | |
72 } | |
73 | |
74 public Address getLastJavaPC(Address addr) { | |
75 return null; | |
76 } | |
77 | |
78 public Address getBaseOfStackPointer(Address addr) { | |
79 return null; | |
80 } | |
81 | |
82 public Frame getLastFramePD(JavaThread thread, Address addr) { | |
83 Address fp = thread.getLastJavaFP(); | |
84 if (fp == null) { | |
85 return null; // no information | |
86 } | |
87 Address pc = thread.getLastJavaPC(); | |
88 if ( pc != null ) { | |
3908
7588156f5cf9
7051798: SA-JDI: NPE in Frame.addressOfStackSlot(Frame.java:244)
never
parents:
1552
diff
changeset
|
89 return new X86Frame(thread.getLastJavaSP(), fp, pc); |
0 | 90 } else { |
3908
7588156f5cf9
7051798: SA-JDI: NPE in Frame.addressOfStackSlot(Frame.java:244)
never
parents:
1552
diff
changeset
|
91 return new X86Frame(thread.getLastJavaSP(), fp); |
0 | 92 } |
93 } | |
94 | |
95 public RegisterMap newRegisterMap(JavaThread thread, boolean updateMap) { | |
3908
7588156f5cf9
7051798: SA-JDI: NPE in Frame.addressOfStackSlot(Frame.java:244)
never
parents:
1552
diff
changeset
|
96 return new X86RegisterMap(thread, updateMap); |
0 | 97 } |
98 | |
99 public Frame getCurrentFrameGuess(JavaThread thread, Address addr) { | |
100 ThreadProxy t = getThreadProxy(addr); | |
101 AMD64ThreadContext context = (AMD64ThreadContext) t.getContext(); | |
102 AMD64CurrentFrameGuess guesser = new AMD64CurrentFrameGuess(context, thread); | |
103 if (!guesser.run(GUESS_SCAN_RANGE)) { | |
104 return null; | |
105 } | |
106 if (guesser.getPC() == null) { | |
3908
7588156f5cf9
7051798: SA-JDI: NPE in Frame.addressOfStackSlot(Frame.java:244)
never
parents:
1552
diff
changeset
|
107 return new X86Frame(guesser.getSP(), guesser.getFP()); |
0 | 108 } else { |
3908
7588156f5cf9
7051798: SA-JDI: NPE in Frame.addressOfStackSlot(Frame.java:244)
never
parents:
1552
diff
changeset
|
109 return new X86Frame(guesser.getSP(), guesser.getFP(), guesser.getPC()); |
0 | 110 } |
111 } | |
112 | |
113 public void printThreadIDOn(Address addr, PrintStream tty) { | |
114 tty.print(getThreadProxy(addr)); | |
115 } | |
116 | |
117 public void printInfoOn(Address threadAddr, PrintStream tty) { | |
118 } | |
119 | |
120 public Address getLastSP(Address addr) { | |
121 ThreadProxy t = getThreadProxy(addr); | |
122 AMD64ThreadContext context = (AMD64ThreadContext) t.getContext(); | |
123 return context.getRegisterAsAddress(AMD64ThreadContext.RSP); | |
124 } | |
125 | |
126 public ThreadProxy getThreadProxy(Address addr) { | |
127 // Addr is the address of the JavaThread. | |
128 // Fetch the OSThread (for now and for simplicity, not making a | |
129 // separate "OSThread" class in this package) | |
130 Address osThreadAddr = osThreadField.getValue(addr); | |
7974 | 131 // Get the address of the thread_id within the OSThread |
132 Address threadIdAddr = | |
133 osThreadAddr.addOffsetTo(osThreadThreadIdField.getOffset()); | |
0 | 134 JVMDebugger debugger = VM.getVM().getDebugger(); |
7974 | 135 return debugger.getThreadForIdentifierAddress(threadIdAddr); |
0 | 136 } |
137 } |