Skip to content

Commit

Permalink
8281460: Let ObjectMonitor have its own NMT category
Browse files Browse the repository at this point in the history
Reviewed-by: dholmes, dcubed, shade
  • Loading branch information
tstuefe committed Feb 11, 2022
1 parent 65831eb commit a037b3c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions src/hotspot/share/memory/allocation.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ class AllocatedObj {
f(mtServiceability, "Serviceability") \
f(mtMetaspace, "Metaspace") \
f(mtStringDedup, "String Deduplication") \
f(mtObjectMonitor, "Object Monitors") \
f(mtNone, "Unknown") \
//end

Expand Down
2 changes: 1 addition & 1 deletion src/hotspot/share/runtime/objectMonitor.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ class ObjectWaiter : public StackObj {
#define OM_CACHE_LINE_SIZE DEFAULT_CACHE_LINE_SIZE
#endif

class ObjectMonitor : public CHeapObj<mtInternal> {
class ObjectMonitor : public CHeapObj<mtObjectMonitor> {
friend class ObjectSynchronizer;
friend class ObjectWaiter;
friend class VMStructs;
Expand Down

3 comments on commit a037b3c

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

@tstuefe
Copy link
Member Author

Choose a reason for hiding this comment

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

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on a037b3c Feb 16, 2022

Choose a reason for hiding this comment

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

@tstuefe the backport was successfully created on the branch tstuefe-backport-a037b3c3 in my personal fork of openjdk/jdk17u-dev. To create a pull request with this backport targeting openjdk/jdk17u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit a037b3c3 from the openjdk/jdk repository.

The commit being backported was authored by Thomas Stuefe on 11 Feb 2022 and was reviewed by David Holmes, Daniel D. Daugherty and Aleksey Shipilev.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u-dev:

$ git fetch https://github.com/openjdk-bots/jdk17u-dev tstuefe-backport-a037b3c3:tstuefe-backport-a037b3c3
$ git checkout tstuefe-backport-a037b3c3
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev tstuefe-backport-a037b3c3

Please sign in to comment.