-
Notifications
You must be signed in to change notification settings - Fork 738
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1987 from Ailloviee/DDRCommands_v1
Add new DDR commands for modularity__Command 1 and 2
- Loading branch information
Showing
6 changed files
with
374 additions
and
51 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
56 changes: 56 additions & 0 deletions
56
debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/JavaVersionHelper.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2018, 2018 IBM Corp. and others | ||
| * | ||
| * This program and the accompanying materials are made available under | ||
| * the terms of the Eclipse Public License 2.0 which accompanies this | ||
| * distribution and is available at https://www.eclipse.org/legal/epl-2.0/ | ||
| * or the Apache License, Version 2.0 which accompanies this distribution and | ||
| * is available at https://www.apache.org/licenses/LICENSE-2.0. | ||
| * | ||
| * This Source Code may also be made available under the following | ||
| * Secondary Licenses when the conditions for such availability set | ||
| * forth in the Eclipse Public License, v. 2.0 are satisfied: GNU | ||
| * General Public License, version 2 with the GNU Classpath | ||
| * Exception [1] and GNU General Public License, version 2 with the | ||
| * OpenJDK Assembly Exception [2]. | ||
| * | ||
| * [1] https://www.gnu.org/software/classpath/license.html | ||
| * [2] http://openjdk.java.net/legal/assembly-exception.html | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception | ||
| *******************************************************************************/ | ||
| package com.ibm.j9ddr.vm29.tools.ddrinteractive; | ||
|
|
||
| import java.io.PrintStream; | ||
|
|
||
| import com.ibm.j9ddr.CorruptDataException; | ||
| import com.ibm.j9ddr.vm29.pointer.generated.J9JavaVMPointer; | ||
| import com.ibm.j9ddr.vm29.types.UDATA; | ||
|
|
||
| /** | ||
| * JavaVersionHelper helps check if the JVM version is new enough | ||
| */ | ||
| public class JavaVersionHelper | ||
| { | ||
| public final static int J2SE_SERVICE_RELEASE_MASK = 0xFFFF; | ||
| public final static int J2SE_19 = 9; | ||
| public final static int J2SE_JAVA_SPEC_VERSION_SHIFT = 8; | ||
|
|
||
| /** | ||
| * Returns true if the Java version is Java9 and up. | ||
| * @param vm J9JavaVMPointer | ||
| * @param out The output print stream | ||
| * @return if the Java version is Java9 and up or not. | ||
| * @throws CorruptDataException | ||
| */ | ||
| public static boolean ensureJava9AndUp(J9JavaVMPointer vm, PrintStream out) throws CorruptDataException | ||
| { | ||
| int javaVersion = vm.j2seVersion().bitAnd(J2SE_SERVICE_RELEASE_MASK).intValue() >> J2SE_JAVA_SPEC_VERSION_SHIFT; | ||
| if (javaVersion < J2SE_19) { | ||
| out.printf("This command only works with core file created by VM with Java version 9 or higher%n" | ||
| + "The current VM Java version is: %s%n", javaVersion); | ||
| return false; | ||
| } | ||
| return true; | ||
| } | ||
| } |
93 changes: 93 additions & 0 deletions
93
...ls/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/FindAllModulesCommand.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2018, 2018 IBM Corp. and others | ||
| * | ||
| * This program and the accompanying materials are made available under | ||
| * the terms of the Eclipse Public License 2.0 which accompanies this | ||
| * distribution and is available at https://www.eclipse.org/legal/epl-2.0/ | ||
| * or the Apache License, Version 2.0 which accompanies this distribution and | ||
| * is available at https://www.apache.org/licenses/LICENSE-2.0. | ||
| * | ||
| * This Source Code may also be made available under the following | ||
| * Secondary Licenses when the conditions for such availability set | ||
| * forth in the Eclipse Public License, v. 2.0 are satisfied: GNU | ||
| * General Public License, version 2 with the GNU Classpath | ||
| * Exception [1] and GNU General Public License, version 2 with the | ||
| * OpenJDK Assembly Exception [2]. | ||
| * | ||
| * [1] https://www.gnu.org/software/classpath/license.html | ||
| * [2] http://openjdk.java.net/legal/assembly-exception.html | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception | ||
| *******************************************************************************/ | ||
| package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; | ||
|
|
||
| import java.io.PrintStream; | ||
|
|
||
| import com.ibm.j9ddr.CorruptDataException; | ||
| import com.ibm.j9ddr.tools.ddrinteractive.Command; | ||
| import com.ibm.j9ddr.tools.ddrinteractive.Context; | ||
| import com.ibm.j9ddr.tools.ddrinteractive.DDRInteractiveCommandException; | ||
| import com.ibm.j9ddr.vm29.j9.DataType; | ||
| import com.ibm.j9ddr.vm29.j9.ObjectModel; | ||
| import com.ibm.j9ddr.vm29.j9.Pool; | ||
| import com.ibm.j9ddr.vm29.j9.SlotIterator; | ||
| import com.ibm.j9ddr.vm29.pointer.generated.J9JavaVMPointer; | ||
| import com.ibm.j9ddr.vm29.pointer.generated.J9ModulePointer; | ||
| import com.ibm.j9ddr.vm29.pointer.generated.J9ObjectPointer; | ||
| import com.ibm.j9ddr.vm29.pointer.generated.J9PoolPointer; | ||
| import com.ibm.j9ddr.vm29.pointer.helper.J9ObjectHelper; | ||
| import com.ibm.j9ddr.vm29.pointer.helper.J9RASHelper; | ||
| import com.ibm.j9ddr.vm29.tools.ddrinteractive.JavaVersionHelper; | ||
|
|
||
| /** | ||
| * FindAllModules command displays all the modules loaded by the runtime | ||
| * | ||
| * Example: | ||
| * !findallmodules | ||
| * Example output: | ||
| * jdk.javadoc !j9module 0x000001305F474498 | ||
| * jdk.attach !j9module 0x000001305F478798 | ||
| * java.prefs !j9module 0x000001305F478928 | ||
| * .....(A list of every module loaded by the runtime) | ||
| */ | ||
| public class FindAllModulesCommand extends Command | ||
| { | ||
| public FindAllModulesCommand() | ||
| { | ||
| addCommand("findallmodules", "", "Outputs all the modules loaded by the runtime"); | ||
| } | ||
|
|
||
| public void run(String command, String[] args, Context context, PrintStream out) throws DDRInteractiveCommandException | ||
| { | ||
| try { | ||
| J9JavaVMPointer vm = J9RASHelper.getVM(DataType.getJ9RASPointer()); | ||
| if (JavaVersionHelper.ensureJava9AndUp(vm, out)) { | ||
| J9PoolPointer pool = vm.modularityPool(); | ||
| Pool<J9ModulePointer> modulePool = Pool.fromJ9Pool(pool, J9ModulePointer.class); | ||
| SlotIterator<J9ModulePointer> poolIterator = modulePool.iterator(); | ||
| J9ModulePointer modulePtr = null; | ||
| J9ObjectPointer moduleNameObjPtr = null; | ||
| while (poolIterator.hasNext()) { | ||
| modulePtr = poolIterator.next(); | ||
| moduleNameObjPtr = modulePtr.moduleName(); | ||
| /* | ||
| * Since both packages and modules could be in the pool, the | ||
| * iterator checks on the region and make sure that it is | ||
| * pointing to a module. (For modules, the first field must | ||
| * be in heap since it is an object while for j9package it | ||
| * is a J9UTF8.) | ||
| */ | ||
| if (ObjectModel.isPointerInHeap(vm, moduleNameObjPtr)) { | ||
| String moduleName = J9ObjectHelper.stringValue(moduleNameObjPtr); | ||
| String hexAddress = modulePtr.getHexAddress(); | ||
| out.printf("%-30s !j9module %s%n", moduleName, hexAddress); | ||
| } | ||
| } | ||
| } | ||
| } catch (CorruptDataException e) { | ||
| throw new DDRInteractiveCommandException(e); | ||
| } | ||
|
|
||
| } | ||
| } | ||
|
|
Oops, something went wrong.