Skip to content
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

8318474: Fix memory reporter for thread_count #16255

Closed
wants to merge 1 commit into from

Conversation

jdksjolen
Copy link
Contributor

@jdksjolen jdksjolen commented Oct 18, 2023

Hi,

JDK-8315362 did the right thing and always updated the _thread_count regardless of the 'mode' that we are in, but we forgot about this assert. So, let's get rid of the assert.

@tstuefe, @gerard-ziemski, I was wondering if we can't actually just use the _thread_count on AIX now when printing the thread count, shouldn't that be correct now? Regardless, let's not have this assert, as it breaks NMT tests on AIX.

@MBaesken, would you mind trying this patch out? It's on top of current master, so you can check it out directly.


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-8318474: Fix memory reporter for thread_count (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 16255

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 18, 2023

👋 Welcome back jsjolen! 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 openjdk bot added the rfr Pull request is ready for review label Oct 18, 2023
@openjdk
Copy link

openjdk bot commented Oct 18, 2023

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

  • hotspot-runtime

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-runtime hotspot-runtime-dev@openjdk.org label Oct 18, 2023
@mlbridge
Copy link

mlbridge bot commented Oct 18, 2023

Webrevs

@tstuefe
Copy link
Member

tstuefe commented Oct 19, 2023

I think this is fine. What do you expect @MBaesken to see though? All you do is remove an assert 😀

@jdksjolen
Copy link
Contributor Author

I think this is fine. What do you expect @MBaesken to see though? All you do is remove an assert 😀

Hehe :), Matthias saw test failures on AIX because the tests would hit that assert and fail, so now I want to ensure that the tests do pass as the assert doesn't stop execution anymore.

Copy link
Member

@MBaesken MBaesken left a comment

Choose a reason for hiding this comment

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

With this fix, the runtime/NMT tests run nicely again on AIX .

@openjdk
Copy link

openjdk bot commented Oct 20, 2023

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

8318474: Fix memory reporter for thread_count

Reviewed-by: mbaesken, azafari

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

  • 4a16d11: 8318455: Fix the compiler/sharedstubs/SharedTrampolineTest.java and SharedStubToInterpTest.java
  • a644670: 8318609: Upcall stubs should be smaller
  • e6f23a9: 8315024: Vector API FP reduction tests should not test for exact equality
  • fd332da: 8317289: javadoc fails with -sourcepath if module-info.java contains import statements
  • 6d3cb45: 8318591: avoid leaks in loadlib_aix.cpp reload_table()
  • cb383c0: 8318587: refresh libraries cache on AIX in print_vm_info
  • 4bfe226: 8310031: Parallel: Implement better work distribution for large object arrays in old gen
  • 08f7914: 8305753: Allow JIT compilation for -Xshare:dump
  • 728b858: 8318130: SocksSocketImpl needlessly encodes hostname for IPv6 addresses
  • eb59167: 8318691: runtime/CompressedOops/CompressedClassPointersEncodingScheme.java fails with release VMs
  • ... and 71 more: https://git.openjdk.org/jdk/compare/e25a49a993f270c33f7929e629fb3075a11fdec9...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 Oct 20, 2023
Copy link
Contributor

@afshin-zafari afshin-zafari left a comment

Choose a reason for hiding this comment

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

Looks good to me.
Thank you.

@jdksjolen
Copy link
Contributor Author

Thank you!

/integrate

@openjdk
Copy link

openjdk bot commented Oct 24, 2023

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

  • 4a16d11: 8318455: Fix the compiler/sharedstubs/SharedTrampolineTest.java and SharedStubToInterpTest.java
  • a644670: 8318609: Upcall stubs should be smaller
  • e6f23a9: 8315024: Vector API FP reduction tests should not test for exact equality
  • fd332da: 8317289: javadoc fails with -sourcepath if module-info.java contains import statements
  • 6d3cb45: 8318591: avoid leaks in loadlib_aix.cpp reload_table()
  • cb383c0: 8318587: refresh libraries cache on AIX in print_vm_info
  • 4bfe226: 8310031: Parallel: Implement better work distribution for large object arrays in old gen
  • 08f7914: 8305753: Allow JIT compilation for -Xshare:dump
  • 728b858: 8318130: SocksSocketImpl needlessly encodes hostname for IPv6 addresses
  • eb59167: 8318691: runtime/CompressedOops/CompressedClassPointersEncodingScheme.java fails with release VMs
  • ... and 71 more: https://git.openjdk.org/jdk/compare/e25a49a993f270c33f7929e629fb3075a11fdec9...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Oct 24, 2023
@openjdk openjdk bot closed this Oct 24, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Oct 24, 2023
@openjdk
Copy link

openjdk bot commented Oct 24, 2023

@jdksjolen Pushed as commit 0baa9ec.

💡 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
4 participants