8348536: Remove remain SIZE_FORMAT usage after JDK-8347990#23290
8348536: Remove remain SIZE_FORMAT usage after JDK-8347990#23290sendaoYan wants to merge 4 commits intoopenjdk:masterfrom
Conversation
|
👋 Welcome back syan! A progress list of the required criteria for merging this PR into |
|
@sendaoYan 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: 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 349 new commits pushed to the
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 |
|
@sendaoYan The following label will be automatically applied to this pull request:
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. |
Webrevs
|
|
@sendaoYan This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration! |
|
Hi, can anyone take look this PR. |
Most of the use of |
dholmes-ora
left a comment
There was a problem hiding this comment.
Okay. I am still seeing a number of other uses in the gtests so I guess @coleenp missed a few others.
There are no longer definitions of Presumably the uses being looked at here (which appear to be all of the remaining residue) were overlooked Running |
The way that macro is being used, I don't think it's intended to be globally enabled like that. It's definition is typically For example, I think the LOG_PLEASE and LOG_HERE in runtime/test_os_reserve_between.cpp should either comment Maybe the changes related to LOG_PLEASE definitions ought to be removed and examined as a separate issue? |
The LOG_PLEASE definition has been removed by this PR, and I create a new issue JDK-8350584 to record this issue. |
coleenp
left a comment
There was a problem hiding this comment.
I didn't see these with the final grep and now I see they're conditionally compiled out. There are a couple others here. Can you get these too?
gtest/nmt/test_nmt_totals.cpp: LOG("Deviation: n=" SSIZE_FORMAT ", s=" SSIZE_FORMAT ", ovrh=" SSIZE_FORMAT, \
gtest/runtime/test_virtualMemoryTracker.cpp: LOG("In reserved region " PTR_FORMAT ", size " SIZE_FORMAT_HEX ":", p2i(rmr->base()), rmr->size());
gtest/runtime/test_virtualMemoryTracker.cpp: LOG(" committed region: " PTR_FORMAT ", size " SIZE_FORMAT_HEX, p2i(region->base()), region->size());
Do you mean I should replace |
|
Yes, replace SSIZE_FORMAT with %zd. I see that the SIZE_FORMAT_HEX was the one I kept, so that should not be replaced. Sorry for the confusion. PTR_FORMAT should not be replaced. Edit. I'm the one suffering from confusion. I don't see any SIZE_FORMAT_HEX, just SIZE_FORMAT_X_0. Can you fix that one too? |
|
|
Okay so this is no longer about LOG_PLEASE but just the leftover SIZE_FORMAT.
I don't see why not, but I will take that up in the other PR. |
|
Thanks @kimbarrett @coleenp @dholmes-ora for the suggestions and reviews. /integrate |
|
Going to push as commit e1081cf.
Your commit was automatically rebased without conflicts. |
|
@sendaoYan Pushed as commit e1081cf. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
|
I requested since you were doing this, that you should fix SIZE_FORMAT_HEX in test/hotspot/gtest/runtime/test_virtualMemoryTracker.cpp too. |
Sorry, I did not got your request exately. Do you mean the |
|
From the test_globalDefinitions.cpp, this seems like a good format for that. If you want to make a trivial change. |
I have create a new PR #23778 to fix remain SIZE_FORMAT_HEX macro undefined issue since this PR has been integrated. |
Hi all,
This is complement implement PR of JDK-8347990, which fix make fails with extra flags '-DLOG_PLEASE'.
Change has been verified locally, test-fix only, risk is low.
Progress
Issue
Reviewers
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/23290/head:pull/23290$ git checkout pull/23290Update a local copy of the PR:
$ git checkout pull/23290$ git pull https://git.openjdk.org/jdk.git pull/23290/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 23290View PR using the GUI difftool:
$ git pr show -t 23290Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/23290.diff
Using Webrev
Link to Webrev Comment