1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8359053

Browse Source
This commit is contained in:
prrace 2025-06-12 15:16:41 -07:00
parent af967ded87
commit 0e921237d2
3 changed files with 224 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/java.desktop/share/classes/javax/swing/JComponent.java
View File

@ -4679,7 +4679,7 @@ public abstract class JComponent extends Container implements Serializable,
/**
* Returns the top-level ancestor of this component (either the
* Returns the top-level ancestor of this component (the
* containing <code>Window</code>)
* or <code>null</code> if this component has not
* been added to any container.

128
test/jdk/javax/sound/sampled/Clip/AutoCloseTimeCheck.java Normal file
View File

@ -0,0 +1,128 @@
/*
* Copyright (c) 2018, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Files;
import java.util.concurrent.TimeUnit;
import javax.sound.SoundClip;
import javax.sound.sampled.AudioFileFormat.Type;
import javax.sound.sampled.AudioFormat;
import javax.sound.sampled.AudioInputStream;
import javax.sound.sampled.AudioSystem;
import static javax.sound.sampled.AudioFormat.Encoding.PCM_SIGNED;
import static javax.sound.sampled.AudioSystem.NOT_SPECIFIED;
/**
* @test
* @bug 8202264
*/
public final class AutoCloseTimeCheck {
public static void main(final String[] args) throws Exception {
// Prepare the audio file
File file = new File("audio.wav");
try {
AudioFormat format =
new AudioFormat(PCM_SIGNED, 44100, 8, 1, 1, 44100, false);
AudioSystem.write(getStream(format), Type.WAVE, file);
} catch (final Exception ignored) {
return; // the test is not applicable
}
try {
testSmallDelay(file);
testBigDelay(file);
} finally {
Files.delete(file.toPath());
}
}
/**
* Checks that after a big period of non-activity the clip will be closed
* and the "Direct Clip" thread will stop.
*/
private static void testBigDelay(final File file) throws Exception {
SoundClip clip = SoundClip.createSoundClip(file);
clip.loop();
clip.stop();
sleep(20000); // 20 sec for slow systems
if (count() != 0) {
throw new RuntimeException("Thread was found");
}
}
/**
* Checks that after small period of non-activity the clip will not be
* closed and the "Direct Clip" thread will alive.
*/
private static void testSmallDelay(final File file) throws IOException {
SoundClip clip = SoundClip.createSoundClip(file);
long threadID = 0;
// Will run the test no more than 15 seconds
long endtime = System.nanoTime() + TimeUnit.SECONDS.toNanos(15);
while (endtime - System.nanoTime() > 0) {
clip.loop();
sleep(500);
long data = count();
if (data != threadID) {
System.out.println("Playing on new thread: " + data + " at "
+ new java.util.Date());
if (threadID == 0) {
threadID = data;
} else {
throw new RuntimeException("Thread was changed");
}
}
clip.stop();
sleep(500);
}
}
private static void sleep(int millis) {
try {
Thread.sleep(millis);
} catch (InterruptedException ignored) {
}
}
private static long count() {
for (final Thread t : Thread.getAllStackTraces().keySet()) {
if (t.getName().equals("Direct Clip")) {
return t.getId();
}
}
return 0;
}
private static AudioInputStream getStream(final AudioFormat format) {
final int dataSize = 5000 * format.getFrameSize();
final InputStream in = new ByteArrayInputStream(new byte[dataSize]);
return new AudioInputStream(in, format, NOT_SPECIFIED);
}
}

95
test/jdk/javax/sound/sampled/Clip/DataPusherThreadCheck.java Normal file
View File

@ -0,0 +1,95 @@
/*
* Copyright (c) 2022, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
import static javax.sound.sampled.AudioFormat.Encoding.PCM_SIGNED;
import static javax.sound.sampled.AudioSystem.NOT_SPECIFIED;
import javax.sound.sampled.AudioFileFormat;
import javax.sound.sampled.AudioFormat;
import javax.sound.sampled.AudioInputStream;
import javax.sound.sampled.AudioSystem;
import javax.sound.sampled.Clip;
import javax.sound.sampled.DataLine;
import javax.sound.SoundClip;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.InputStream;
import java.nio.file.Files;
/*
* @test
* @key headful
* @bug 8279673
* @summary Verify no NPE creating threads
* @run main/othervm DataPusherThreadCheck
*/
public class DataPusherThreadCheck {
public static void main(String[] args) throws Exception {
// Prepare the audio file
File file = new File("audio.wav");
try {
AudioFormat format =
new AudioFormat(PCM_SIGNED, 44100, 8, 1, 1, 44100, false);
DataLine.Info info = new DataLine.Info(Clip.class, format);
if (!(AudioSystem.isLineSupported(info)) ) {
return; // the test is not applicable
}
int dataSize = 6000*1000 * format.getFrameSize();
InputStream in = new ByteArrayInputStream(new byte[dataSize]);
AudioInputStream audioStream = new AudioInputStream(in, format, NOT_SPECIFIED);
AudioSystem.write(audioStream, AudioFileFormat.Type.WAVE, file);
} catch (Exception ignored) {
return; // the test is not applicable
}
try {
checkThread(file);
} finally {
Files.delete(file.toPath());
}
}
private static void checkThread(File file) throws Exception {
SoundClip clip = SoundClip.createSoundClip(file);
clip.loop();
try {
Thread.sleep(2000);
} catch (InterruptedException ignored) {
}
boolean found = isDataPushedThreadExist();
clip.stop();
if (!found) {
throw new RuntimeException("Thread 'DataPusher' isn't found");
}
}
private static boolean isDataPushedThreadExist() {
for (Thread t : Thread.getAllStackTraces().keySet()) {
if (t.getName().equals("DataPusher")) {
return true;
}
}
return false;
}
}