Skip to content

8334164: The fix for JDK-8322811 should use _filename.is_set() rather than strcmp() #19706

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from

Conversation

SoniaZaldana
Copy link
Member

@SoniaZaldana SoniaZaldana commented Jun 13, 2024

Hi all,

This PR addresses 8334164.

Testing:

  • Verified specifying the literal vm_memory_map_<pid>.txt as the map name does not replace <pid>.
  • Verified <pid> is still appropriately replaced if a file path is not specified.

Thanks,
Sonia


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8334164: The fix for JDK-8322811 should use _filename.is_set() rather than strcmp() (Bug - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/19706/head:pull/19706
$ git checkout pull/19706

Update a local copy of the PR:
$ git checkout pull/19706
$ git pull https://git.openjdk.org/jdk.git pull/19706/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 19706

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/19706.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 13, 2024

👋 Welcome back szaldana! 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 13, 2024

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

8334164: The fix for JDK-8322811 should use _filename.is_set() rather than strcmp()

Reviewed-by: dholmes, cjplummer

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

  • e965d70: 8333876: C2 SuperWord: regression after JDK-8325155: failed: internal connection
  • 6f860f8: 8334430: Clean up nativeInst_x86.*
  • 8bc2fbe: 8333769: Pretouching tests dont test pretouching
  • 91bd85d: 8333854: IllegalAccessError with proxies after JDK-8332457
  • e681b4e: 8332524: Instead of printing "TLSv1.3," it is showing "TLS13"
  • fa401f3: 8333805: Replaying compilation with null static final fields results in a crash
  • 472b935: 8334332: TestIOException.java fails if run by root
  • 614b99a: 8334442: Temporarily disable return type assertion to reduce noise in testing
  • d4c1373: 8334043: VerifyError when inner class is accessed in prologue
  • b42fe86: 8334097: Parallel: Obsolete HeapFirstMaximumCompactionCount
  • ... and 34 more: https://git.openjdk.org/jdk/compare/0d3a3771c3777d3dd1fec8dc8faed5fd02b06830...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@dholmes-ora, @plummercj) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk
Copy link

openjdk bot commented Jun 13, 2024

@SoniaZaldana The following labels will be automatically applied to this pull request:

  • hotspot-runtime
  • serviceability

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

@openjdk openjdk bot added serviceability serviceability-dev@openjdk.org hotspot-runtime hotspot-runtime-dev@openjdk.org labels Jun 13, 2024
@SoniaZaldana SoniaZaldana marked this pull request as ready for review June 14, 2024 13:05
@openjdk openjdk bot added the rfr Pull request is ready for review label Jun 14, 2024
@mlbridge
Copy link

mlbridge bot commented Jun 14, 2024

Webrevs

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

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

Seems fine. Thanks

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jun 17, 2024
@kevinjwalls
Copy link
Contributor

Yes is_set should be used to find out if a filename was given, and not strcmp. But if you provided "my_filename.txt" you might be happy that pid became the actual pid? But that expansion only happens if you gave that exact filename, so it seems like a mistake.

For users, a better pattern for optionally inserting the actual PID would be if it used %p like we do when -XX:OnError handling uses Arguments::copy_expand_pid().

There are a few dcmds that take names of files to create, so ideally all of these would support %p which lets you insert the PID.

I expect we should go ahead with this change now, and consider a further update to enable all dcmds that take filenames to replace %p.

@SoniaZaldana
Copy link
Member Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jun 17, 2024
@openjdk
Copy link

openjdk bot commented Jun 17, 2024

@SoniaZaldana
Your change (at version 207ec2e) is now ready to be sponsored by a Committer.

@jerboaa
Copy link
Contributor

jerboaa commented Jun 20, 2024

/sponsor

@openjdk
Copy link

openjdk bot commented Jun 20, 2024

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

  • d7dad50: 8334544: C2: wrong control assigned in PhaseIdealLoop::clone_assertion_predicate_for_unswitched_loops()
  • ff30240: 8334239: Introduce macro for ubsan method/function exclusions
  • 2d4185f: 8332717: ZGC: Division by zero in heuristics
  • fad6644: 8333754: Add a Test against ECDSA and ECDH NIST Test vector
  • b211929: 8334570: Problem list gc/TestAlwaysPreTouchBehavior.java
  • 4e58d8c: 8309821: Link to hidden classes section in Class specification for Class::isHidden
  • 78682fe: 8329288: Update Visual Studio visibility support for POSIX functions
  • bcf4bb4: 8333344: JMX attaching of Subject does not work when security manager not allowed
  • 856931d: 8304732: jdk/jfr/api/consumer/recordingstream/TestStop.java failed again with "Expected outer stream to have 3 events"
  • 01ee424: 8294960: Convert java.base/java.lang.invoke package to use the Classfile API to generate lambdas and method handles
  • ... and 51 more: https://git.openjdk.org/jdk/compare/0d3a3771c3777d3dd1fec8dc8faed5fd02b06830...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jun 20, 2024
@openjdk openjdk bot closed this Jun 20, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Jun 20, 2024
@openjdk
Copy link

openjdk bot commented Jun 20, 2024

@jerboaa @SoniaZaldana Pushed as commit cabd104.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated serviceability serviceability-dev@openjdk.org
Development

Successfully merging this pull request may close these issues.

5 participants