infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-28 12:09:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

8373025: test/hotspot/jtreg/gc/cslocker/TestCSLocker.java may deadlock

Browse Source 
Reviewed-by: ayang, tschatzl, stefank
This commit is contained in:
Axel Boldt-Christmas 2025-12-09 10:04:25 +00:00
parent 1f49edd978
commit 0a557890a5
3 changed files with 20 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/hotspot/jtreg/ProblemList.txt
View File

@ -94,7 +94,6 @@ gc/shenandoah/TestEvilSyncBug.java#generational 8345501 generic-all
gc/shenandoah/TestRetainObjects.java#no-tlab 8361099 generic-all
gc/shenandoah/TestSieveObjects.java#no-tlab 8361099 generic-all
gc/shenandoah/TestSieveObjects.java#no-tlab-genshen 8361099 generic-all
gc/cslocker/TestCSLocker.java 8373025 generic-all
#############################################################################

24
test/hotspot/jtreg/gc/cslocker/TestCSLocker.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -33,18 +33,11 @@ import static gc.testlibrary.Allocation.blackHole;
* @summary completely in JNI CS, while other is trying to allocate memory
* @summary provoking GC. OOM means FAIL, deadlock means PASS.
*
* @comment This test assumes that no allocation happens during the sleep loop,
* which is something that we can't guarantee. With ZGC we see test
* timeouts because the main thread allocates and waits for the GC,
* which waits for the CSLocker, which waits for the main thread.
* @requires vm.gc != "Z"
*
* @run main/native/othervm -Xmx256m gc.cslocker.TestCSLocker
*/
public class TestCSLocker extends Thread
{
static int timeoutMillis = 5000;
public static void main(String args[]) throws Exception {
// start garbage producer thread
GarbageProducer garbageProducer = new GarbageProducer(1000000, 10);
@ -53,15 +46,9 @@ public class TestCSLocker extends Thread
// start CS locker thread
CSLocker csLocker = new CSLocker();
csLocker.start();
// After the CSLocker thread has started, any operation such as an allocation,
// which could rely on the GC to make progress, will cause a deadlock that will
// make the test time out. That includes printing. Please don't use any such
// code until unlock() is called below.
// check timeout to success deadlocking
sleep(timeoutMillis);
csLocker.unlock();
// Wait for the csLocker thread to finish its critical section
csLocker.join();
garbageProducer.interrupt();
}
}
@ -97,11 +84,10 @@ class CSLocker extends Thread
public void run() {
int[] a = new int[10];
a[0] = 1;
if (!lock(a)) {
if (!criticalSection(a)) {
throw new RuntimeException("failed to acquire CSLock");
}
}
native boolean lock(int[] array);
native void unlock();
native boolean criticalSection(int[] array);
}

26
test/hotspot/jtreg/gc/cslocker/libTestCSLocker.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -23,9 +23,15 @@
#include <jni.h>
#ifdef WINDOWS
#include <windows.h>
#else
#include <unistd.h>
#endif
static volatile int release_critical = 0;
JNIEXPORT jboolean JNICALL Java_gc_cslocker_CSLocker_lock
JNIEXPORT jboolean JNICALL Java_gc_cslocker_CSLocker_criticalSection
(JNIEnv *env, jobject obj, jintArray array)
{
jboolean retval = JNI_TRUE;
@ -33,17 +39,15 @@ JNIEXPORT jboolean JNICALL Java_gc_cslocker_CSLocker_lock
if (nativeArray == NULL) {
retval = JNI_FALSE;
} else {
// Wait for 5 seconds
#ifdef WINDOWS
Sleep(5000);
#else
sleep(5);
#endif
}
// deadblock
while (!release_critical) /* empty */;
(*env)->ReleasePrimitiveArrayCritical(env, array, nativeArray, 0);
return retval;
}
JNIEXPORT void JNICALL Java_gc_cslocker_CSLocker_unlock
(JNIEnv *env, jobject obj)
{
release_critical = 1;
}