/hg/icedtea6: 3 new changesets
dlila at icedtea.classpath.org
dlila at icedtea.classpath.org
Thu Jun 16 09:58:45 PDT 2011
changeset 5c6d4ea2f55d in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=5c6d4ea2f55d
author: Denis Lila <dlila at redhat.com>
date: Thu Jun 16 10:58:30 2011 -0400
Replace pulse audio enums with static longs.
changeset 2eef438960e4 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=2eef438960e4
author: Denis Lila <dlila at redhat.com>
date: Thu Jun 16 11:11:35 2011 -0400
Fix a few concurrency problems in pulse audio.
changeset 9dbcfded2579 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=9dbcfded2579
author: Denis Lila <dlila at redhat.com>
date: Thu Jun 16 12:57:43 2011 -0400
merge
diffstat:
ChangeLog | 90 ++++++++++
Makefile.am | 11 +-
patches/jtreg-FileMap.patch | 23 ++
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/ContextEvent.java | 58 +++++-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/EventLoop.java | 58 +-----
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Operation.java | 44 ++--
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java | 14 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixer.java | 17 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java | 17 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Stream.java | 59 ++++--
pulseaudio/src/native/jni-common.h | 13 +-
pulseaudio/src/native/org_classpath_icedtea_pulseaudio_ContextEvent.c | 61 ++++++
pulseaudio/src/native/org_classpath_icedtea_pulseaudio_EventLoop.c | 4 +-
pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Operation.c | 21 ++-
pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream.c | 19 ++-
15 files changed, 369 insertions(+), 140 deletions(-)
diffs (truncated from 919 to 500 lines):
diff -r 830e2c11d9f3 -r 9dbcfded2579 ChangeLog
--- a/ChangeLog Wed Jun 15 15:29:46 2011 -0400
+++ b/ChangeLog Thu Jun 16 12:57:43 2011 -0400
@@ -1,3 +1,93 @@
+2011-06-16 Denis Lila <dlila at redhat.com>
+
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java
+ (addStreamListeners): Remove this.notifyAll() from
+ openCloseListener.update; change this.notifyAll() to
+ PulseAudioDataLine.this.notifyAll() in startedListener.update.
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java
+ (read): Put fragmentBuffer null check in the synchronized block.
+ (flush): Make it synchronized to avoid race condition with read().
+
+2011-06-16 Denis Lila <dlila at redhat.com>
+
+ * Makefile.am: Add ContextEvent to the list of pulse audio classes that
+ need javah run on them.
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/ContextEvent.java
+ (Type): Remove and replace with...
+ (UNCONNECTED, CONNECTING, AUTHORIZING, SETTING_NAME, READY, FAILED,
+ TERMINATED): New static long variables replacing enum Type.
+ (init_constants): New native method to initialize the above variables.
+ (checkNativeEnumReturn): Make sure that the input is one of the longs
+ representing the type of ContextEvent.
+ (type): Change type from Type to long.
+ (ContextEvent): Take a long argument, instead of a Type.
+ (getType): Return a long, not a Type.
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/EventLoop.java
+ (status): Change from int to long.
+ (native_set_sink_volume): Remove. It was unimplemented in the JNI side.
+ (getStatus): Return long instead of int.
+ (update): Replace int argument with long argument. Remove the switch
+ statement.
+ (setVolume): Remove. Unused.
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Operation.java
+ (State): Remove and replace with...
+ (Running, Done, Cancelled): Static longs, enumerating the possible
+ operation states.
+ (init_constants): New native method to initialize the above variables.
+ (checkNativeOperationState): Make sure that the input is one of the longs
+ representing the operation state.
+ (native_get_state): Change return type from int to long.
+ (getState): Change return type to long; remove switch.
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java
+ Remove the names of enums from the names of constants since most of them
+ were changed to static longs.
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixer.java
+ Same changes as in PulseAudioDataLine.java.
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Stream.java
+ (State): Remove and replace with...
+ (UNCONNECTED, CREATING, READY, FAILED, TERMINATED): New static long variables
+ replacing enum Type.
+ (init_constants): New native method to initialize the above variables.
+ (checkNativeStreamState): Make sure that the input is one of the longs
+ representing the kind of StreamState.
+ (native_pa_stream_get_state): Change the return from int to long.
+ (getState): Remove the switch.
+ * pulseaudio/src/native/jni-common.h
+ (SET_JAVA_STATIC_LONG_FIELD_TO_PA_ENUM): Macro that sets one of the java
+ static longs to the corresponding pa_constant.
+ * pulseaudio/src/native/org_classpath_icedtea_pulseaudio_ContextEvent.c
+ New file.
+ (SET_CONTEXT_ENUM): Macro that sets the ContextEvent types.
+ (Java_org_classpath_icedtea_pulseaudio_ContextEvent_init_1constants):
+ Implementation of ContextEvent.init_constants.
+ * pulseaudio/src/native/org_classpath_icedtea_pulseaudio_EventLoop.c
+ (context_change_callback): Change the fourth argument of GetMethodID
+ to "(J)V" to reflect the change in the signature of EventLoop.update.
+ * pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Operation.c
+ (SET_OP_ENUM): Macro that sets the operation types.
+ (Java_org_classpath_icedtea_pulseaudio_Operation_init_1constants):
+ Implementation of Operation.init_constants.
+ (Java_org_classpath_icedtea_pulseaudio_Operation_native_1get_1state):
+ Change return type to jlong.
+ * pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream.c
+ (SET_STREAM_ENUM): Macro that sets the stream states.
+ (Java_org_classpath_icedtea_pulseaudio_Stream_init_1constants):
+ Implementation of Stream.init_constants.
+ (Java_org_classpath_icedtea_pulseaudio_Stream_native_1pa_1stream_1get_1state):
+ Change return type to jlong.
+
+2011-06-16 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * Makefile.am: fixed indentation (spaces2tabs)
+
+2011-06-16 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * Makefile.am: added new patch
+ * patches/jtreg-FileMap.patch:
+ Make sure that the regression test
+ openjdk/jdk/test/sun/net/www/protocol/file/FileMap.java
+ deletes all its work files.
+
2011-06-15 Danesh Dadachanji <ddadacha at redhat.com>
* AUTHORS: Added myself.
diff -r 830e2c11d9f3 -r 9dbcfded2579 Makefile.am
--- a/Makefile.am Wed Jun 15 15:29:46 2011 -0400
+++ b/Makefile.am Thu Jun 16 12:57:43 2011 -0400
@@ -218,9 +218,9 @@
patches/openjdk/6748082-isDisplayLocal.patch \
patches/openjdk/6633275-shaped_translucent_windows.patch \
patches/openjdk/6769607-modal-hangs.patch \
- patches/openjdk/6791612-opengl-jni-fix.patch \
- patches/openjdk/6755274-glgetstring-crash.patch \
- patches/openjdk/6984543-onscreen_rendering_resize_test.patch \
+ patches/openjdk/6791612-opengl-jni-fix.patch \
+ patches/openjdk/6755274-glgetstring-crash.patch \
+ patches/openjdk/6984543-onscreen_rendering_resize_test.patch \
patches/openjdk/6693253-security_warning.patch \
patches/openjdk/6444769-windowwithwarningtest.patch \
patches/notice-safepoints.patch \
@@ -356,7 +356,8 @@
patches/jtreg-ChangeDir.patch \
patches/jtreg-TempBuffer.patch \
patches/jtreg-EncodedMultiByteChar.patch \
- patches/jtreg-FileLoaderTest.patch
+ patches/jtreg-FileLoaderTest.patch \
+ patches/jtreg-FileMap.patch
if WITH_ALT_HSBUILD
ICEDTEA_PATCHES += \
@@ -1773,6 +1774,8 @@
-J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.PulseAudioSourcePort ; \
$(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
-J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.PulseAudioTargetPort ; \
+ $(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
+ -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.ContextEvent; \
mkdir -p stamps
touch stamps/pulse-java-headers.stamp
diff -r 830e2c11d9f3 -r 9dbcfded2579 patches/jtreg-FileMap.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/jtreg-FileMap.patch Thu Jun 16 12:57:43 2011 -0400
@@ -0,0 +1,24 @@
+--- openjdk.orig/jdk/test/sun/net/www/protocol/file/FileMap.java 2011-02-28 17:07:06.000000000 +0100
++++ openjdk/jdk/test/sun/net/www/protocol/file/FileMap.java 2011-06-16 11:30:19.000000000 +0200
+@@ -32,8 +32,9 @@
+
+ public class FileMap {
+ public static void main(String[] args) {
++ File f = null;
+ try {
+- File f = File.createTempFile("test", null);
++ f = File.createTempFile("test", null);
+ f.deleteOnExit();
+ String s = f.getAbsolutePath();
+ s = s.startsWith("/") ? s : "/" + s;
+@@ -48,5 +49,10 @@
+ } catch (Exception ex) {
+ throw new RuntimeException("Unexpected exception: " + ex);
+ }
++ finally {
++ if ( f != null ) {
++ f.delete();
++ }
++ }
+ }
+ }
diff -r 830e2c11d9f3 -r 9dbcfded2579 pulseaudio/src/java/org/classpath/icedtea/pulseaudio/ContextEvent.java
--- a/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/ContextEvent.java Wed Jun 15 15:29:46 2011 -0400
+++ b/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/ContextEvent.java Thu Jun 16 12:57:43 2011 -0400
@@ -37,32 +37,68 @@
package org.classpath.icedtea.pulseaudio;
+import java.util.Arrays;
+
/**
* This class encapsulates a change in the PulseAudio's connection context.
*
* When this event is fired, something has happened to the connection of this
* program to the PulseAudio server.
- *
*/
+class ContextEvent {
+ // There are certain enumerations from pulse audio that we need to use in
+ // the java side. For all of these, we declare static longs in the proper
+ // java classes and we use static native methods to initialize them to
+ // the values used by pulse audio. This makes us immune to changes in
+ // the integer values of the enum symbols in pulse audio.
+ /**
+ * Basically, what is the new state of the context
+ * These will be initialized to the proper values in the JNI.
+ */
+ static long UNCONNECTED = -1,
+ CONNECTING = -1,
+ AUTHORIZING = -1,
+ SETTING_NAME = -1,
+ READY = -1,
+ FAILED = -1,
+ TERMINATED = -1;
-class ContextEvent {
+ private static native void init_constants();
+
+ static {
+ SecurityWrapper.loadNativeLibrary();
+ init_constants();
+ }
/**
- * Basically, what is the new state of the context
- *
+ * Throws an IllegalStateException if value is not one of the above
+ * context events. We do this for all pulse audio enumerations that
+ * we need to use in the java side. If pulse audio decides to add
+ * new events/states, we need to add them to the classes. The exception
+ * will let us know.
+ * return the input if there is no error
+ *
+ * @param value is the context event to be checked against one of the known
+ * events.
+ * @return value if it is a known event. Otherwise throw an exception.
*/
- public static enum Type {
- UNCONNECTED, CONNECTING, AUTHORIZING, SETTING_NAME, READY, FAILED, TERMINATED
+ public static long checkNativeEnumReturn(long value) {
+ if (!Arrays.asList(
+ UNCONNECTED, CONNECTING, AUTHORIZING, SETTING_NAME,
+ READY, FAILED, TERMINATED
+ ).contains(value)) {
+ throw new IllegalStateException("Illegal constant for ContextEvent: " + value);
+ }
+ return value;
}
- private Type type;
+ private long type;
- public ContextEvent(Type type) {
- this.type = type;
+ public ContextEvent(long type) {
+ this.type = checkNativeEnumReturn(type);
}
- public Type getType() {
+ public long getType() {
return type;
}
-
}
diff -r 830e2c11d9f3 -r 9dbcfded2579 pulseaudio/src/java/org/classpath/icedtea/pulseaudio/EventLoop.java
--- a/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/EventLoop.java Wed Jun 15 15:29:46 2011 -0400
+++ b/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/EventLoop.java Thu Jun 16 12:57:43 2011 -0400
@@ -40,14 +40,12 @@
import java.util.ArrayList;
import java.util.List;
-import org.classpath.icedtea.pulseaudio.ContextEvent.Type;
+import org.classpath.icedtea.pulseaudio.ContextEvent;
import org.classpath.icedtea.pulseaudio.Debug.DebugLevel;
/**
* This class wraps pulseaudio's event loop. It also holds the lock used in the
* rest of pulse-java
- *
- *
*/
final class EventLoop implements Runnable {
@@ -70,7 +68,7 @@
private String appName;
private String serverString;
- private int status;
+ private long status;
// private boolean eventLoopIsRunning = false;
private List<String> targetPortNameList = new ArrayList<String>();
@@ -89,18 +87,12 @@
private native void native_shutdown();
- private native void native_set_sink_volume(byte[] streamPointer, int volume);
-
/*
* These fields hold pointers
*/
private byte[] contextPointer;
private byte[] mainloopPointer;
- /*
- *
- */
-
static {
SecurityWrapper.loadNativeLibrary();
}
@@ -171,42 +163,21 @@
}
}
- int getStatus() {
+ long getStatus() {
return this.status;
}
- void update(int status) {
+ void update(long status) {
synchronized (threadLock) {
// System.out.println(this.getClass().getName()
// + ".update() called! status = " + status);
this.status = status;
- switch (status) {
- case 0:
- fireEvent(new ContextEvent(Type.UNCONNECTED));
- break;
- case 1:
- fireEvent(new ContextEvent(Type.CONNECTING));
- break;
- case 2:
- // no op
- break;
- case 3:
- // no op
- break;
- case 4:
- fireEvent(new ContextEvent(Type.READY));
- break;
- case 5:
- fireEvent(new ContextEvent(Type.FAILED));
- Debug.println(DebugLevel.Warning,
- "EventLoop.update(): Context failed");
- break;
- case 6:
- fireEvent(new ContextEvent(Type.TERMINATED));
- break;
- default:
+ fireEvent(new ContextEvent(status));
+ }
- }
+ if (status == ContextEvent.FAILED) {
+ Debug.println(DebugLevel.Warning,
+ "EventLoop.update(): Context failed");
}
}
@@ -223,12 +194,6 @@
}
- void setVolume(byte[] streamPointer, int volume) {
- synchronized (threadLock) {
- native_set_sink_volume(streamPointer, volume);
- }
- }
-
byte[] getContextPointer() {
return contextPointer;
}
@@ -250,7 +215,7 @@
op.waitForCompletion();
- assert (op.getState() == Operation.State.Done);
+ assert (op.getState() == Operation.DONE);
op.releaseReference();
return targetPortNameList;
@@ -265,7 +230,7 @@
op.waitForCompletion();
- assert (op.getState() == Operation.State.Done);
+ assert (op.getState() == Operation.DONE);
op.releaseReference();
return sourcePortNameList;
@@ -278,5 +243,4 @@
public void sink_callback(String name) {
targetPortNameList.add(name);
}
-
}
diff -r 830e2c11d9f3 -r 9dbcfded2579 pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Operation.java
--- a/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Operation.java Wed Jun 15 15:29:46 2011 -0400
+++ b/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Operation.java Thu Jun 16 12:57:43 2011 -0400
@@ -37,6 +37,8 @@
package org.classpath.icedtea.pulseaudio;
+import java.util.Arrays;
+
/**
* Encapsulates a pa_operation object
*
@@ -57,19 +59,33 @@
private byte[] operationPointer;
private EventLoop eventLoop;
- public enum State {
- Running, Done, Cancelled,
- }
+ // These should never be written to in java. They will be initialized
+ // properly in native code.
+ public static long RUNNING = -1,
+ DONE = -1,
+ CANCELLED = -1;
+
+ private static native void init_constants();
static {
SecurityWrapper.loadNativeLibrary();
+ init_constants();
+ }
+
+ // If value is not one of RUNNING, DONE, CANCELLED, throw an
+ // IllegalStateException. Otherwise return the input.
+ private static long checkNativeOperationState(long value) {
+ if (!Arrays.asList(RUNNING, DONE, CANCELLED).contains(value)) {
+ throw new IllegalStateException("Unknown operation state: " + value);
+ }
+ return value;
}
private native void native_ref();
private native void native_unref();
- private native int native_get_state();
+ private native long native_get_state();
Operation(byte[] operationPointer) {
assert (operationPointer != null);
@@ -113,23 +129,11 @@
return false;
}
- State getState() {
+ long getState() {
assert (operationPointer != null);
- int state;
synchronized (eventLoop.threadLock) {
- state = native_get_state();
+ return checkNativeOperationState(native_get_state());
}
- switch (state) {
- case 0:
- return State.Running;
- case 1:
- return State.Done;
- case 2:
- return State.Cancelled;
- default:
- throw new IllegalStateException("Invalid operation State");
- }
-
}
/**
@@ -142,7 +146,7 @@
boolean interrupted = false;
do {
synchronized (eventLoop.threadLock) {
- if (getState() == Operation.State.Done) {
+ if (getState() == DONE) {
return;
}
try {
@@ -152,7 +156,7 @@
interrupted = true;
}
}
- } while (getState() != State.Done);
+ } while (getState() != DONE);
// let the caller know about the interrupt
if (interrupted) {
diff -r 830e2c11d9f3 -r 9dbcfded2579 pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java
--- a/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java Wed Jun 15 15:29:46 2011 -0400
+++ b/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java Thu Jun 16 12:57:43 2011 -0400
@@ -170,7 +170,7 @@
* the listener is guaranteed to have run
*/
- if (stream.getState() == Stream.State.READY) {
+ if (stream.getState() == Stream.READY) {
if (sendEvents) {
fireLineEvent(new LineEvent(
PulseAudioDataLine.this,
@@ -178,18 +178,14 @@
}
semaphore.release();
- } else if (stream.getState() == Stream.State.TERMINATED
- || stream.getState() == Stream.State.FAILED) {
+ } else if (stream.getState() == Stream.TERMINATED
+ || stream.getState() == Stream.FAILED) {
if (sendEvents) {
fireLineEvent((new LineEvent(
PulseAudioDataLine.this,
LineEvent.Type.CLOSE, framesSinceOpen)));
}
- synchronized (this) {
- this.notifyAll();
- }
semaphore.release();
More information about the distro-pkg-dev
mailing list