Skip to content
This repository was archived by the owner on Sep 2, 2022. It is now read-only.

Conversation

@mgronlun
Copy link
Contributor

@mgronlun mgronlun commented Jun 15, 2021

Greetings,

this changeset restores the diagnostic command argument descriptors that got lost as part of JDK-8265271 .

Testing: jdk_jfr, manual verification

Thanks
Markus


Progress

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

Issue

  • JDK-8268702: JFR diagnostic commands lack argument descriptors when viewed using Platform MBean Server

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 57

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 15, 2021

👋 Welcome back mgronlun! 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
Copy link

openjdk bot commented Jun 15, 2021

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

  • hotspot-jfr

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.

@openjdk openjdk bot added the hotspot-jfr hotspot-jfr-dev@openjdk.java.net label Jun 15, 2021
@mgronlun mgronlun changed the title [jdk17] RFR: 8268702: JFR diagnostic commands lack argument descriptors when viewed using Platform MBean Server 8268702: JFR diagnostic commands lack argument descriptors when viewed using Platform MBean Server Jun 15, 2021
@openjdk openjdk bot added the rfr Pull request is ready for review label Jun 15, 2021
@mlbridge
Copy link

mlbridge bot commented Jun 15, 2021

Webrevs

objArrayOop arguments = objArrayOop(result.get_oop());
assert(arguments != NULL, "invariant");
assert(arguments->is_array(), "must be array");
GrowableArray<DCmdArgumentInfo*>* const array = new GrowableArray<DCmdArgumentInfo*>();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we could assert here, making sure num_arguments match the array length

Copy link
Contributor Author

@mgronlun mgronlun Jun 16, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, Erik - yes, I tried to have just this assertion you mention. The problem is that it's tricky to call the right function, because the num_arguments() needs to be static, unfortunately, and here we are in the context of the superclass. It would require passing a string describing what type it is, and then downcasting to that type to invoke the correct num_arguments. It got a bit messy so I decided against it.

@openjdk
Copy link

openjdk bot commented Jun 16, 2021

@mgronlun 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:

8268702: JFR diagnostic commands lack argument descriptors when viewed using Platform MBean Server

Reviewed-by: egahlin

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 12 new commits pushed to the master branch:

  • 9ad19f7: 8256934: C2: assert(C->live_nodes() <= C->max_node_limit()) failed: Live Node limit exceeded limit
  • 19f5fab: 8268861: Disable Windows-Aarch64 build in GitHub Actions
  • 59de99d: 8267271: Fix gc/arguments/TestNewRatioFlag.java expectedNewSize calculation
  • 4d545a1: 8267988: C2: assert(!addp->is_AddP() || addp->in(AddPNode::Base)->is_top() || addp->in(AddPNode::Base) == n->in(AddPNode::Base)) failed: Base pointers must match (addp 1301)
  • b18de6c: 8268851: ProblemList jdk/jfr/event/gc/detailed/TestEvacuationFailedEvent.java on linux-X64
  • 10068c1: 8268830: ProblemList 3 serviceability/dcmd/framework tests with ZGC on win-x64
  • 788b309: 8268768: idea.sh has been updated in surprising and incompatible ways
  • 9ac0609: 8268828: ProblemList compiler/intrinsics/VectorizedMismatchTest.java on win-x64
  • fe7a44d: 8268723: Problem list SA core file tests on OSX when using ZGC
  • 31a055e: 8268736: Use apiNote in AutoCloseable.close javadoc
  • ... and 2 more: https://git.openjdk.java.net/jdk17/compare/35d867df1f2064e867dcf1030c498bfa23568054...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this 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.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jun 16, 2021
@mgronlun
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Jun 21, 2021

Going to push as commit f8df953.
Since your change was applied there have been 55 commits pushed to the master branch:

  • c294ae4: 8267042: bug in monitor locking/unlocking on ARM32 C1 due to uninitialized BasicObjectLock::_displaced_header
  • b358b54: 8269063: Build failure due to VerifyReceiverTypes was not declared after JDK-8268405
  • b8f073b: 8268316: Typo in JFR jdk.Deserialization event
  • b9d7337: 8268638: semaphores of AsyncLogWriter may be broken when JVM is exiting.
  • 8caeca0: 8264775: ClhsdbFindPC still fails with java.lang.RuntimeException: 'In java stack' missing from stdout/stderr
  • 7e03cf2: 8265073: XML transformation and indentation when using xml:space
  • 60389ee: 8269025: jsig/Testjsig.java doesn't check exit code
  • dab00ee: 8266518: Refactor and expand scatter/gather tests
  • f9c8c1c: 8268903: JFR: RecordingStream::dump is missing @SInCE
  • d8a0582: 8265369: [macos-aarch64] java/net/MulticastSocket/Promiscuous.java failed with "SocketException: Cannot allocate memory"
  • ... and 45 more: https://git.openjdk.java.net/jdk17/compare/35d867df1f2064e867dcf1030c498bfa23568054...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Jun 21, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jun 21, 2021
@openjdk
Copy link

openjdk bot commented Jun 21, 2021

@mgronlun Pushed as commit f8df953.

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

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

hotspot-jfr hotspot-jfr-dev@openjdk.java.net integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

2 participants