Skip to content

8313081: MonitoringSupport_lock should be unconditionally initialized after 8304074 #393

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.

Sign up for GitHub

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

Closed
wants to merge 3 commits into from
Closed

8313081: MonitoringSupport_lock should be unconditionally initialized after 8304074 #393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1dd7da9
Backport a9d21c61fb12a11e18c6bb8aa903e5a8e42473f1
phohensee Jul 28, 2023
5e31240
Merge branch 'backport-8304074' into backport-8313081
phohensee Nov 21, 2023
e3d0461
Merge branch 'backport-8304074' into backport-8313081
phohensee Nov 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions hotspot/src/share/vm/runtime/mutexLocker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,9 +209,9 @@ void mutex_init() {

def(StringDedupQueue_lock , Monitor, leaf, true );
def(StringDedupTable_lock , Mutex , leaf, true );

def(MonitoringSupport_lock , Mutex , leaf, true ); // used for serviceability monitoring support
}
def(MonitoringSupport_lock , Mutex , leaf, true ); // used for serviceability monitoring support

def(ParGCRareEvent_lock , Mutex , leaf , true );
def(DerivedPointerTableGC_lock , Mutex, leaf, true );
def(CodeCache_lock , Mutex , special, true );
Expand Down
1 change: 1 addition & 0 deletions hotspot/src/share/vm/services/management.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2248,6 +2248,7 @@ JVM_ENTRY(jlong, jmm_GetTotalThreadAllocatedMemory(JNIEnv *env))
}

{
assert(MonitoringSupport_lock != NULL, "Must be");
MutexLockerEx ml(MonitoringSupport_lock, Mutex::_no_safepoint_check_flag);
if (result < high_water_result) {
// Result wrapped to a negative value, in which case it's
Expand Down
15 changes: 12 additions & 3 deletions jdk/test/com/sun/management/ThreadMXBean/ThreadAllocatedMemory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,19 @@
*/

/*
* @test
* @bug 6173675 8231209 8304074
* @test id=G1
* @bug 6173675 8231209 8304074 8313081
* @summary Basic test of ThreadMXBean.getThreadAllocatedBytes
* @author Paul Hohensee
* @requires vm.gc == "G1"
* @run main/othervm -XX:+UseG1GC ThreadAllocatedMemory
*/

/*
* @test id=Serial
* @bug 6173675 8231209 8304074 8313081
* @summary Basic test of ThreadMXBean.getThreadAllocatedBytes
* @requires vm.gc == "Serial"
* @run main/othervm -XX:+UseSerialGC ThreadAllocatedMemory
*/

import java.lang.management.*;
Expand Down