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

8146986: JDI: Signature lookups for unprepared classes can take a long time

Browse Source 
Do not cache classes if signature is not provided

Reviewed-by: sspitsyn, jcbeyler
This commit is contained in:
Serguei Spitsyn 2019-03-25 19:16:58 -07:00
parent 799f744311
commit c7d102070b
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/jdk.jdi/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java
View File

@ -33,10 +33,11 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.TreeSet;
import java.util.Set;
import com.sun.jdi.BooleanType;
import com.sun.jdi.BooleanValue;
@ -110,7 +111,7 @@ class VirtualMachineImpl extends MirrorImpl
// tested unsynchronized (since once true, it stays true), but must
// be set synchronously
private Map<Long, ReferenceType> typesByID;
private TreeSet<ReferenceType> typesBySignature;
private Set<ReferenceType> typesBySignature;
private boolean retrievedAllTypes = false;
private Map<Long, ModuleReference> modulesByID;
@ -843,14 +844,9 @@ class VirtualMachineImpl extends MirrorImpl
throw new InternalException("Invalid reference type tag");
}
/*
* If a signature was specified, make sure to set it ASAP, to
* prevent any needless JDWP command to retrieve it. (for example,
* typesBySignature.add needs the signature, to maintain proper
* ordering.
*/
if (signature != null) {
type.setSignature(signature);
if (signature == null && retrievedAllTypes) {
// do not cache if signature is not provided
return type;
}
typesByID.put(id, type);
@ -920,7 +916,7 @@ class VirtualMachineImpl extends MirrorImpl
private void initReferenceTypes() {
typesByID = new HashMap<>(300);
typesBySignature = new TreeSet<>();
typesBySignature = new HashSet<>();
}
ReferenceTypeImpl referenceType(long ref, byte tag) {
@ -969,6 +965,9 @@ class VirtualMachineImpl extends MirrorImpl
if (retType == null) {
retType = addReferenceType(id, tag, signature);
}
if (signature != null) {
retType.setSignature(signature);
}
}
return retType;
}