8315462: [REDO] runtime/NMT/SummarySanityCheck.java failed with "Total committed (MMMMMM) did not match the summarized committed (NNNNNN)" #16262

afshin-zafari · 2023-10-19T08:13:38Z

This is a PR for the original PR.

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-8315462: [REDO] runtime/NMT/SummarySanityCheck.java failed with "Total committed (MMMMMM) did not match the summarized committed (NNNNNN)" (Bug - P4)

Reviewers

Gerard Ziemski (@gerard-ziemski - Committer) ⚠️ Review applies to b71a424d
Thomas Stuefe (@tstuefe - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 16262

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

Using diff file

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

Webrev

Link to Webrev Comment

…l committed (MMMMMM) did not match the summarized committed (NNNNNN)"

bridgekeeper · 2023-10-19T08:14:48Z

👋 Welcome back azafari! 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 · 2023-10-19T08:16:14Z

@afshin-zafari 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.

mlbridge · 2023-10-19T08:20:47Z

Webrevs

tstuefe · 2023-11-07T11:42:37Z

src/hotspot/share/nmt/mallocTracker.cpp

+void MallocMemorySnapshot::copy_to(MallocMemorySnapshot* s) {
+  // Need to make sure that mtChunks don't get deallocated while the
+  // copy is going on, because their size is adjusted using this
+  // buffer in make_adjustment().


Since you are moving this, could you change the comment a bit to make clear it only refers to the ThreadCritical, not the rest of the function? E.g. "Need to lock to make sure...."

tstuefe · 2023-11-07T11:49:14Z

src/hotspot/share/nmt/mallocTracker.hpp

+  inline size_t thread_count() const {
+    MallocMemorySnapshot* s = const_cast<MallocMemorySnapshot*>(this);
+    return s->by_type(mtThreadStack)->malloc_count();
+  }


Why is this needed?

It came after merge, added in JDK-8315362.

Yes, JDK-8315362 threw this out. IIRC we removed the awkward mechanism of counting threads by number of thread stacks. Hence my question, why the re-introduction? Merge glitch?

It's a merge glitch.

gerard-ziemski

Looks nice and clean!

(still need to remove the merge introduced code as Thomas pointed out though)

Thank you for fixing this!

… ___8315462

openjdk · 2023-11-17T13:09:41Z

⚠️ @afshin-zafari This pull request contains merges that bring in commits not present in the target repository. Since this is not a "merge style" pull request, these changes will be squashed when this pull request in integrated. If this is your intention, then please ignore this message. If you want to preserve the commit structure, you must change the title of this pull request to Merge <project>:<branch> where <project> is the name of another project in the OpenJDK organization (for example Merge jdk:master).

afshin-zafari · 2023-12-15T08:23:04Z

@tstuefe, any more comments on this?

tstuefe · 2023-12-15T11:01:53Z

src/hotspot/share/nmt/mallocTracker.hpp

@@ -55,6 +55,8 @@ class MemoryCounter {
 public:
  MemoryCounter() : _count(0), _size(0), _peak_count(0), _peak_size(0) {}

+  inline void set_size_and_count(size_t size, size_t count) { _size = size; _count = count; }


It occurred to me that this invalidates the peak counter. You need to update that too, e.g.

void set_size_and_count(size_t size, size_t count) { _size = size; _count = count; update_peak(size, count); }

… ___8315462

tstuefe

Okay

openjdk · 2023-12-18T11:29:19Z

@afshin-zafari 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:

8315462: [REDO] runtime/NMT/SummarySanityCheck.java failed with "Total committed (MMMMMM) did not match the summarized committed (NNNNNN)"

Reviewed-by: gziemski, stuefe

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

ecff9c1: 8315040: Remove redundant check in WorkerPolicy::parallel_worker_threads
a247d0c: 8322209: RISC-V: Enable some tests related to MD5 instrinsic
341b4e0: 8321975: Print when add_reserved_region fails even in product mode
f696796: 8280087: G1: Handle out-of-mark stack situations during reference processing more gracefully
413dbf8: 8322205: Parallel: Remove unused arg in PSCardTable::pre_scavenge
f553819: 8317007: Add bulk removal of dead nmethods during class unloading

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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.

afshin-zafari · 2023-12-18T16:51:30Z

Thanks for your review @tstuefe and @gerard-ziemski.

/integrate

openjdk · 2023-12-18T16:52:38Z

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

a5122d7: 8314029: Add file name parameter to Compiler.perfmap
c0a3b76: 8316197: Make tracing of inline cache available in unified logging
7e1d26d: 8322287: Parallel: Remove unused arg in adjust_eden_for_pause_time and adjust_eden_for_minor_pause_time
5584ba3: 8322097: Serial: Refactor CardTableRS::find_first_clean_card
75d382d: 8322204: Parallel: Remove unused _collection_cost_margin_fraction
febf8af: 8322089: Parallel: Remove PSAdaptiveSizePolicy::set_survivor_size
10335f6: 7001133: OutOfMemoryError by CustomMediaSizeName implementation
ecff9c1: 8315040: Remove redundant check in WorkerPolicy::parallel_worker_threads
a247d0c: 8322209: RISC-V: Enable some tests related to MD5 instrinsic
341b4e0: 8321975: Print when add_reserved_region fails even in product mode
... and 3 more: https://git.openjdk.org/jdk/compare/34351b7a7950a3b563748f40f2619374f62f9b16...master

Your commit was automatically rebased without conflicts.

openjdk · 2023-12-18T16:52:43Z

@afshin-zafari Pushed as commit 66aeb89.

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

afshin-zafari · 2023-12-18T17:09:08Z

/sponsor

openjdk · 2023-12-18T17:11:05Z

@afshin-zafari The command sponsor can only be used in open pull requests.

8315462: [REDO] runtime/NMT/SummarySanityCheck.java failed with "Tota…

7be4376

…l committed (MMMMMM) did not match the summarized committed (NNNNNN)"

afshin-zafari mentioned this pull request Oct 19, 2023

8315462: [REDO] runtime/NMT/SummarySanityCheck.java failed with "Total committed (MMMMMM) did not match the summarized committed (NNNNNN)" #16237

Closed

3 tasks

openjdk bot added the rfr label Oct 19, 2023

openjdk bot added the hotspot-runtime label Oct 19, 2023

Merge branch 'origin/master' into ___8315462

fd8478a

tstuefe reviewed Nov 7, 2023

View reviewed changes

Comments improved.

b71a424

gerard-ziemski approved these changes Nov 15, 2023

View reviewed changes

afshin-zafari added 3 commits November 17, 2023 14:05

Removed he code that brought by merge.

da478aa

Removed the code that brought by merge.

4f30d66

Merge branch '___8315462' of http://github.com/afshin-zafari/jdk into…

71a159c

… ___8315462

tstuefe suggested changes Dec 15, 2023

View reviewed changes

afshin-zafari added 4 commits December 18, 2023 09:25

Merge branch 'openjdk:master' into ___8315462

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

GPG key ID: 4AEE18F83AFDEB23
Expired

Verified
Learn about vigilant mode

2c003f1

Merge remote-tracking branch 'origin/master' into ___8315462

db7e0ed

size and count peaks updated.

2de40e1

Merge branch '___8315462' of http://github.com/afshin-zafari/jdk into…

45bf4c6

… ___8315462

tstuefe approved these changes Dec 18, 2023

View reviewed changes

openjdk bot added the ready label Dec 18, 2023

openjdk bot added the integrated label Dec 18, 2023

openjdk bot closed this Dec 18, 2023

openjdk bot removed ready rfr labels Dec 18, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8315462: [REDO] runtime/NMT/SummarySanityCheck.java failed with "Total committed (MMMMMM) did not match the summarized committed (NNNNNN)" #16262

8315462: [REDO] runtime/NMT/SummarySanityCheck.java failed with "Total committed (MMMMMM) did not match the summarized committed (NNNNNN)" #16262

afshin-zafari commented Oct 19, 2023 •

edited by openjdk bot

Loading

bridgekeeper bot commented Oct 19, 2023

openjdk bot commented Oct 19, 2023

mlbridge bot commented Oct 19, 2023 •

edited

Loading

tstuefe Nov 7, 2023

afshin-zafari Nov 7, 2023

tstuefe Nov 7, 2023

afshin-zafari Nov 7, 2023 •

edited

Loading

tstuefe Nov 7, 2023

afshin-zafari Nov 8, 2023

gerard-ziemski left a comment

openjdk bot commented Nov 17, 2023

afshin-zafari commented Dec 15, 2023

tstuefe Dec 15, 2023

tstuefe left a comment

openjdk bot commented Dec 18, 2023

afshin-zafari commented Dec 18, 2023

openjdk bot commented Dec 18, 2023

openjdk bot commented Dec 18, 2023

afshin-zafari commented Dec 18, 2023

openjdk bot commented Dec 18, 2023

8315462: [REDO] runtime/NMT/SummarySanityCheck.java failed with "Total committed (MMMMMM) did not match the summarized committed (NNNNNN)" #16262

8315462: [REDO] runtime/NMT/SummarySanityCheck.java failed with "Total committed (MMMMMM) did not match the summarized committed (NNNNNN)" #16262

Conversation

afshin-zafari commented Oct 19, 2023 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

Webrev

bridgekeeper bot commented Oct 19, 2023

openjdk bot commented Oct 19, 2023

mlbridge bot commented Oct 19, 2023 • edited Loading

Webrevs

tstuefe Nov 7, 2023

Choose a reason for hiding this comment

afshin-zafari Nov 7, 2023

Choose a reason for hiding this comment

tstuefe Nov 7, 2023

Choose a reason for hiding this comment

afshin-zafari Nov 7, 2023 • edited Loading

Choose a reason for hiding this comment

tstuefe Nov 7, 2023

Choose a reason for hiding this comment

afshin-zafari Nov 8, 2023

Choose a reason for hiding this comment

gerard-ziemski left a comment

Choose a reason for hiding this comment

openjdk bot commented Nov 17, 2023

afshin-zafari commented Dec 15, 2023

tstuefe Dec 15, 2023

Choose a reason for hiding this comment

tstuefe left a comment

Choose a reason for hiding this comment

openjdk bot commented Dec 18, 2023

afshin-zafari commented Dec 18, 2023

openjdk bot commented Dec 18, 2023

openjdk bot commented Dec 18, 2023

afshin-zafari commented Dec 18, 2023

openjdk bot commented Dec 18, 2023

afshin-zafari commented Oct 19, 2023 •

edited by openjdk bot

Loading

mlbridge bot commented Oct 19, 2023 •

edited

Loading

afshin-zafari Nov 7, 2023 •

edited

Loading