Skip to content

Commit

Permalink
8318089: Class space not marked as such with NMT when CDS is off
Browse files Browse the repository at this point in the history
Reviewed-by: mli, dholmes
  • Loading branch information
tstuefe committed Oct 19, 2023
1 parent 24bc5bd commit c0e154c
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions src/hotspot/share/memory/metaspace.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -569,12 +569,6 @@ void Metaspace::initialize_class_space(ReservedSpace rs) {
"wrong alignment");

MetaspaceContext::initialize_class_space_context(rs);

// This does currently not work because rs may be the result of a split
// operation and NMT seems not to be able to handle splits.
// Will be fixed with JDK-8243535.
// MemTracker::record_virtual_memory_type((address)rs.base(), mtClass);

}

// Returns true if class space has been setup (initialize_class_space).
Expand Down Expand Up @@ -804,6 +798,9 @@ void Metaspace::global_initialize() {
CompressedClassSpaceSize));
}

// Mark class space as such
MemTracker::record_virtual_memory_type((address)rs.base(), mtClass);

// Initialize space
Metaspace::initialize_class_space(rs);

Expand Down

5 comments on commit c0e154c

@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 jdk21u

@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 c0e154c Oct 20, 2023

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-c0e154c8 in my personal fork of openjdk/jdk21u. To create a pull request with this backport targeting openjdk/jdk21u: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 c0e154c8 from the openjdk/jdk repository.

The commit being backported was authored by Thomas Stuefe on 19 Oct 2023 and was reviewed by Hamlin Li and David Holmes.

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/jdk21u:

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

@openjdk
Copy link

@openjdk openjdk bot commented on c0e154c Oct 20, 2023

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-c0e154c8 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 c0e154c8 from the openjdk/jdk repository.

The commit being backported was authored by Thomas Stuefe on 19 Oct 2023 and was reviewed by Hamlin Li and David Holmes.

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.git tstuefe-backport-c0e154c8:tstuefe-backport-c0e154c8
$ git checkout tstuefe-backport-c0e154c8
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev.git tstuefe-backport-c0e154c8

Please sign in to comment.