8244669: convert clhsdb "mem" command from javascript to java #6902

plummercj · 2021-12-21T01:26:07Z

clhsdb lost support for the "mem" command when javascript support was removed from SA. This PR is re-adding it by implementing it in Java. The description of the CR contains all the details.

Regarding the clhsdb.html changes for the "examine" command, they are just correctly specifying the existing syntax. No change was actually made to the syntax.

The changes made to the "examine" command are part of a consolidation effort to better share code between "examine" and "mem". "examine" has no functional changes.

Progress

Change must not contain extraneous whitespace
Commit message must refer to an issue
Change must be properly reviewed

Issue

JDK-8244669: convert clhsdb "mem" command from javascript to java

Reviewers

Serguei Spitsyn (@sspitsyn - Reviewer) ⚠️ Review applies to ed4ce4d
Kevin Walls (@kevinjwalls - Committer) ⚠️ Review applies to ed4ce4d
Poonam Bajaj (@poonamparhar - Committer) ⚠️ Review applies to ed4ce4d

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/6902/head:pull/6902
$ git checkout pull/6902

Update a local copy of the PR:
$ git checkout pull/6902
$ git pull https://git.openjdk.java.net/jdk pull/6902/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 6902

View PR using the GUI difftool:
$ git pr show -t 6902

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/6902.diff

bridgekeeper · 2021-12-21T01:26:15Z

👋 Welcome back cjplummer! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

openjdk · 2021-12-21T01:28:11Z

@plummercj The following label will be automatically applied to this pull request:

serviceability

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

mlbridge · 2021-12-21T01:32:38Z

Webrevs

…ys allowed some extra lower case letters at the end of the pattern that just get ignored. I removed support for this since sometimes it resulted in bad address ranges producing an exception rather than a usage() message.

src/jdk.hotspot.agent/doc/clhsdb.html

sspitsyn · 2021-12-21T21:27:24Z

src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/CommandProcessor.java

+                        }
+                    } else {
+                        out.println();
+                    }


I wonder if it is possible to simplify the above fragment at 549-560 with something like:
if (verbose) {
// If we know what this is a pointer to, then print additional information.
PointerLocation loc = PointerFinder.find(val);
if (!loc.isUnknown()) {
out.print(" ");
loc.printOn(out, false, false); // make it print without line end or ignore there is an extra end?
}
}
out.println();

printOn() always prints a newline. It's hard to make it not do that since it relies on other print APIs, some of which print newlines and some of which don't (in which case printOn() will print a newline). So I can't easily just create a printOn() variant that doesn't print newlines, and printing two newlines would introduce a bunch of blank lines in the output, which wouldn't look good.

Okay, thanks.

sspitsyn · 2021-12-21T21:28:43Z

test/hotspot/jtreg/serviceability/sa/ClhsdbFindPC.java

+                                          /* The following is from a field in the Method object. */
+                                          "In interpreter codelet: method entry point"));
+            runTest(withCore, cmds, expStrMap);
+


Is there a test case for another variant of range: Address,Address ?

No. We really never had any specific test cases for examine. ClhsdbFindPC does make use of it, but not for the addr,addr variant, so it was also omitted for mem. I did consider adding a test case for it and still can. I started down that path, but adding an incremental value to a hex String was getting a bit ugly, so I abandoned it.

openjdk · 2021-12-21T23:07:55Z

@plummercj this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout 8244669-mem
git fetch https://git.openjdk.java.net/jdk master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

poonamparhar

Looks good to me.

openjdk · 2021-12-22T18:10:50Z

@plummercj This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8244669: convert clhsdb "mem" command from javascript to java

Reviewed-by: sspitsyn, kevinw, poonam

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

plummercj · 2021-12-22T23:01:23Z

/integrate

openjdk · 2021-12-22T23:02:48Z

Going to push as commit eaefb1a.
Since your change was applied there has been 1 commit pushed to the master branch:

d64820d: 8209398: sun/security/pkcs11/KeyStore/SecretKeysBasic.sh failed with "PKCS11Exception: CKR_ATTRIBUTE_SENSITIVE"

Your commit was automatically rebased without conflicts.

openjdk · 2021-12-22T23:03:06Z

@plummercj Pushed as commit eaefb1a.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Add support for clhsdb 'mem' command.

5fd9e19

openjdk bot added the rfr Pull request is ready for review label Dec 21, 2021

openjdk bot added the serviceability serviceability-dev@openjdk.org label Dec 21, 2021

plummercj added 3 commits December 21, 2021 07:12

Change output string we look for so it passes on all platforms.

15a447b

Fix missing return after calling usage()

8df7907

sspitsyn reviewed Dec 21, 2021

View reviewed changes

src/jdk.hotspot.agent/doc/clhsdb.html Outdated Show resolved Hide resolved

sspitsyn reviewed Dec 21, 2021

View reviewed changes

src/jdk.hotspot.agent/doc/clhsdb.html Outdated Show resolved Hide resolved

sspitsyn reviewed Dec 21, 2021

View reviewed changes

Minor improvements to help text for mem and examine.

ed4ce4d

openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Dec 21, 2021

sspitsyn approved these changes Dec 21, 2021

View reviewed changes

kevinjwalls approved these changes Dec 22, 2021

View reviewed changes

poonamparhar approved these changes Dec 22, 2021

View reviewed changes

Merge

7363727

openjdk bot added ready Pull request is ready to be integrated and removed merge-conflict Pull request has merge conflict with target branch labels Dec 22, 2021

openjdk bot added the integrated Pull request has been integrated label Dec 22, 2021

openjdk bot closed this Dec 22, 2021

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Dec 22, 2021

plummercj mentioned this pull request Dec 23, 2021

8279194: Add Annotated Memory Viewer feature to SA's HSDB #6923

Closed

3 tasks

plummercj deleted the 8244669-mem branch January 26, 2022 05:52

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8244669: convert clhsdb "mem" command from javascript to java #6902

8244669: convert clhsdb "mem" command from javascript to java #6902

plummercj commented Dec 21, 2021 •

edited by openjdk bot

Loading

bridgekeeper bot commented Dec 21, 2021

openjdk bot commented Dec 21, 2021

mlbridge bot commented Dec 21, 2021 •

edited

Loading

sspitsyn Dec 21, 2021

plummercj Dec 21, 2021

sspitsyn Dec 21, 2021

sspitsyn Dec 21, 2021

plummercj Dec 21, 2021

openjdk bot commented Dec 21, 2021

poonamparhar left a comment

openjdk bot commented Dec 22, 2021

plummercj commented Dec 22, 2021

openjdk bot commented Dec 22, 2021

openjdk bot commented Dec 22, 2021

8244669: convert clhsdb "mem" command from javascript to java #6902

8244669: convert clhsdb "mem" command from javascript to java #6902

Conversation

plummercj commented Dec 21, 2021 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Dec 21, 2021

openjdk bot commented Dec 21, 2021

mlbridge bot commented Dec 21, 2021 • edited Loading

Webrevs

sspitsyn Dec 21, 2021

Choose a reason for hiding this comment

plummercj Dec 21, 2021

Choose a reason for hiding this comment

sspitsyn Dec 21, 2021

Choose a reason for hiding this comment

sspitsyn Dec 21, 2021

Choose a reason for hiding this comment

plummercj Dec 21, 2021

Choose a reason for hiding this comment

openjdk bot commented Dec 21, 2021

poonamparhar left a comment

Choose a reason for hiding this comment

openjdk bot commented Dec 22, 2021

plummercj commented Dec 22, 2021

openjdk bot commented Dec 22, 2021

openjdk bot commented Dec 22, 2021

plummercj commented Dec 21, 2021 •

edited by openjdk bot

Loading

mlbridge bot commented Dec 21, 2021 •

edited

Loading