jdk-sandbox: comparison jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java

equal deleted inserted replaced

-:043f1af70518
+:9d0388c6b336
 /*
-* Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1998, 2016, 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
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.  Oracle designates this
 */
 package com.sun.tools.jdi;
 import com.sun.jdi.*;
+import com.sun.jdi.ModuleReference;
 import com.sun.jdi.connect.spi.Connection;
 import com.sun.jdi.request.EventRequestManager;
 import com.sun.jdi.request.EventRequest;
 import com.sun.jdi.request.BreakpointRequest;
 import com.sun.jdi.event.EventQueue;
 public final int sizeofFieldRef;
 public final int sizeofMethodRef;
 public final int sizeofObjectRef;
 public final int sizeofClassRef;
 public final int sizeofFrameRef;
+public final int sizeofModuleRef;
 final int sequenceNumber;
 private final TargetVM target;
 private final EventQueueImpl eventQueue;
 // tested unsynchronized (since once true, it stays true), but must
 // be set synchronously
 private Map<Long, ReferenceType> typesByID;
 private TreeSet<ReferenceType> typesBySignature;
 private boolean retrievedAllTypes = false;
+private Map<Long, ModuleReference> modulesByID;
 // For other languages support
 private String defaultStratum = null;
 // ObjectReference cache
 sizeofFieldRef  = idSizes.fieldIDSize;
 sizeofMethodRef = idSizes.methodIDSize;
 sizeofObjectRef = idSizes.objectIDSize;
 sizeofClassRef = idSizes.referenceTypeIDSize;
 sizeofFrameRef  = idSizes.frameIDSize;
+sizeofModuleRef = idSizes.objectIDSize;
 /**
 * Set up requests needed by internal event handler.
 * Make sure they are distinguished by creating them with
 * an internal event request manager.
 return this == obj;
 }
 public int hashCode() {
 return System.identityHashCode(this);
+}
+public List<ModuleReference> allModules() {
+validateVM();
+List<ModuleReference> modules = retrieveAllModules();
+return Collections.unmodifiableList(modules);
 }
 public List<ReferenceType> classesByName(String className) {
 validateVM();
 String signature = JNITypeParser.typeNameToSignature(className);
 }
 return versionInfo;
 } catch (JDWPException exc) {
 throw exc.toJDIException();
 }
 }
 public String description() {
 validateVM();
 return MessageFormat.format(vmManager.getString("version_format"),
 "" + vmManager.majorInterfaceVersion(),
 public boolean canGetMethodReturnValues() {
 return versionInfo().jdwpMajor > 1 ||
 versionInfo().jdwpMinor >= 6;
 }
 public boolean canGetInstanceInfo() {
-if (versionInfo().jdwpMajor < 1 ||
+if (versionInfo().jdwpMajor > 1 ||
-versionInfo().jdwpMinor < 6) {
+versionInfo().jdwpMinor >= 6) {
+validateVM();
+return hasNewCapabilities() &&
+capabilitiesNew().canGetInstanceInfo;
+} else {
 return false;
 }
-validateVM();
-return hasNewCapabilities() &&
-capabilitiesNew().canGetInstanceInfo;
 }
 public boolean canUseSourceNameFilters() {
-if (versionInfo().jdwpMajor < 1 ||
+return versionInfo().jdwpMajor > 1 ||
-versionInfo().jdwpMinor < 6) {
+versionInfo().jdwpMinor >= 6;
-return false;
-}
-return true;
 }
 public boolean canForceEarlyReturn() {
 validateVM();
 return hasNewCapabilities() &&
 capabilitiesNew().canForceEarlyReturn;
 validateVM();
 return hasNewCapabilities() &&
 capabilitiesNew().canGetSourceDebugExtension;
 }
 public boolean canGetClassFileVersion() {
-if ( versionInfo().jdwpMajor < 1 &&
+return versionInfo().jdwpMajor > 1 ||
-versionInfo().jdwpMinor  < 6) {
+versionInfo().jdwpMinor >= 6;
-return false;
-} else {
-return true;
-}
 }
 public boolean canGetConstantPool() {
 validateVM();
 return hasNewCapabilities() &&
 capabilitiesNew().canGetConstantPool;
 }
 public boolean canGetMonitorFrameInfo() {
 validateVM();
 return hasNewCapabilities() &&
 capabilitiesNew().canGetMonitorFrameInfo;
+}
+public boolean canGetModuleInfo() {
+validateVM();
+return versionInfo().jdwpMajor >= 9;
 }
 public void setDebugTraceMode(int traceFlags) {
 validateVM();
 this.traceFlags = traceFlags;
 } catch (JDWPException exc) {
 throw exc.toJDIException();
 }
 }
 return capabilitiesNew;
+}
+private synchronized ModuleReference addModule(long id) {
+if (modulesByID == null) {
+modulesByID = new HashMap<Long, ModuleReference>(77);
+}
+ModuleReference module = new ModuleReferenceImpl(vm, id);
+modulesByID.put(id, module);
+return module;
+}
+ModuleReference getModule(long id) {
+if (id == 0) {
+return null;
+} else {
+ModuleReference module = null;
+synchronized (this) {
+if (modulesByID != null) {
+module = modulesByID.get(id);
+}
+if (module == null) {
+module = addModule(id);
+}
+}
+return module;
+}
+}
+private synchronized List<ModuleReference> retrieveAllModules() {
+ModuleReferenceImpl[] reqModules;
+try {
+reqModules = JDWP.VirtualMachine.AllModules.process(vm).modules;
+} catch (JDWPException exc) {
+throw exc.toJDIException();
+}
+ArrayList<ModuleReference> modules = new ArrayList<>();
+for (int i = 0; i < reqModules.length; i++) {
+long moduleRef = reqModules[i].ref();
+ModuleReference module = getModule(moduleRef);
+modules.add(module);
+}
+return modules;
 }
 private List<ReferenceType> retrieveClassesBySignature(String signature) {
 if ((vm.traceFlags & VirtualMachine.TRACE_REFTYPES) != 0) {
 vm.printTrace("Retrieving matching ReferenceTypes, sig=" + signature);
 ClassObjectReferenceImpl classObjectMirror(long id) {
 return (ClassObjectReferenceImpl)objectMirror(id,
 JDWP.Tag.CLASS_OBJECT);
 }
+ModuleReferenceImpl moduleMirror(long id) {
+return (ModuleReferenceImpl)getModule(id);
+}
 /*
 * Implementation of PathSearchingVirtualMachine
 */
 private JDWP.VirtualMachine.ClassPaths getClasspath() {
 if (pathInfo == null) {

changeset 36511	9d0388c6b336
parent 33835	8cfbdfc35f82
child 38332	95dd1e0f418f