changeset in /hg/pulseaudio: turned eventloop into a singleton. ...
Omair Majid
omajid at redhat.com
Fri Aug 8 08:19:50 PDT 2008
changeset 4a01f1203d48 in /hg/pulseaudio
details: http://icedtea.classpath.org/hg/pulseaudio?cmd=changeset;node=4a01f1203d48
description:
turned eventloop into a singleton. which revealed a bunch of threading issues; fixed most of the blockers
diffstat:
16 files changed, 727 insertions(+), 284 deletions(-)
makefile | 8
src/org/classpath/icedtea/pulseaudio/EventLoop.java | 43 +
src/org/classpath/icedtea/pulseaudio/PulseAudioMixer.java | 59 +-
src/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java | 1
src/org/classpath/icedtea/pulseaudio/StreamVolume.java | 11
src/org_classpath_icedtea_pulseaudio_EventLoop.c | 5
src/org_classpath_icedtea_pulseaudio_EventLoop.h | 45 -
src/org_classpath_icedtea_pulseaudio_PulseAudioSourceDataLine.h | 95 ----
src/org_classpath_icedtea_pulseaudio_PulseAudioStreamVolumeControl.h | 29 -
src/org_classpath_icedtea_pulseaudio_PulseAudioTargetDataLine.h | 69 --
src/org_classpath_icedtea_pulseaudio_PulseAudioVolumeControl.h | 13
unittests/org/classpath/icedtea/pulseaudio/OtherSoundProvidersAvailableTest.java | 105 ++++
unittests/org/classpath/icedtea/pulseaudio/PulseAudioMixerProviderTest.java | 93 ++++
unittests/org/classpath/icedtea/pulseaudio/PulseAudioMixerRawTest.java | 70 +++
unittests/org/classpath/icedtea/pulseaudio/PulseAudioMixerTest.java | 232 ++++++++++
unittests/org/classpath/icedtea/pulseaudio/PulseSourceDataLineTest.java | 133 +++++
diffs (truncated from 1289 to 500 lines):
diff -r 0caab9aa95b1 -r 4a01f1203d48 makefile
--- a/makefile Tue Aug 05 17:30:50 2008 -0400
+++ b/makefile Wed Aug 06 14:08:52 2008 -0400
@@ -35,8 +35,9 @@ lib/libpulse-java.so: \
bin/org_classpath_icedtea_pulseaudio_EventLoop.o \
bin/org_classpath_icedtea_pulseaudio_PulseAudioSourceDataLine.o \
bin/org_classpath_icedtea_pulseaudio_PulseAudioVolumeControl.o \
- bin/org_classpath_icedtea_pulseaudio_PulseAudioStreamVolumeControl.o \
+ bin/org_classpath_icedtea_pulseaudio_StreamVolume.o \
bin/jni-common.o
+# bin/org_classpath_icedtea_pulseaudio_PulseAudioStreamVolumeControl.o \
# bin/org_classpath_icedtea_pulseaudio_PulseAudioTargetDataLine.o \
gcc -g -shared -o $@ $^ /usr/lib/libpulse.so
@@ -55,6 +56,9 @@ bin/org_classpath_icedtea_pulseaudio_Pul
gcc $(CFLAGS) $(PLATFORM_FLAGS) -c -o $@ $<
bin/org_classpath_icedtea_pulseaudio_PulseAudioStreamVolumeControl.o: src/org_classpath_icedtea_pulseaudio_PulseAudioStreamVolumeControl.c src/org_classpath_icedtea_pulseaudio_PulseAudioStreamVolumeControl.h
+ gcc $(CFLAGS) $(PLATFORM_FLAGS) -c -o $@ $<
+
+bin/org_classpath_icedtea_pulseaudio_StreamVolume.o: src/org_classpath_icedtea_pulseaudio_StreamVolume.c src/org_classpath_icedtea_pulseaudio_StreamVolume.h
gcc $(CFLAGS) $(PLATFORM_FLAGS) -c -o $@ $<
bin/jni-common.o: src/jni-common.c src/jni-common.h
@@ -77,6 +81,8 @@ src/org_classpath_icedtea_pulseaudio_Pul
src/org_classpath_icedtea_pulseaudio_PulseAudioStreamVolumeControl.h: src/org/classpath/icedtea/pulseaudio/PulseAudioStreamVolumeControl.class
javah -d src -classpath src org.classpath.icedtea.pulseaudio.PulseAudioStreamVolumeControl
+src/org_classpath_icedtea_pulseaudio_StreamVolume.h: src/org/classpath/icedtea/pulseaudio/StreamVolume.class
+ javah -d src -classpath src org.classpath.icedtea.pulseaudio.StreamVolume
# Compile Java
# Actually, this is not the best thing to do; javac might do some crazy things
diff -r 0caab9aa95b1 -r 4a01f1203d48 src/org/classpath/icedtea/pulseaudio/ContextEvent$Type.class
Binary file src/org/classpath/icedtea/pulseaudio/ContextEvent$Type.class has changed
diff -r 0caab9aa95b1 -r 4a01f1203d48 src/org/classpath/icedtea/pulseaudio/ContextEvent.class
Binary file src/org/classpath/icedtea/pulseaudio/ContextEvent.class has changed
diff -r 0caab9aa95b1 -r 4a01f1203d48 src/org/classpath/icedtea/pulseaudio/ContextListener.class
Binary file src/org/classpath/icedtea/pulseaudio/ContextListener.class has changed
diff -r 0caab9aa95b1 -r 4a01f1203d48 src/org/classpath/icedtea/pulseaudio/EventLoop$1.class
Binary file src/org/classpath/icedtea/pulseaudio/EventLoop$1.class has changed
diff -r 0caab9aa95b1 -r 4a01f1203d48 src/org/classpath/icedtea/pulseaudio/EventLoop.class
Binary file src/org/classpath/icedtea/pulseaudio/EventLoop.class has changed
diff -r 0caab9aa95b1 -r 4a01f1203d48 src/org/classpath/icedtea/pulseaudio/EventLoop.java
--- a/src/org/classpath/icedtea/pulseaudio/EventLoop.java Tue Aug 05 17:30:50 2008 -0400
+++ b/src/org/classpath/icedtea/pulseaudio/EventLoop.java Wed Aug 06 14:08:52 2008 -0400
@@ -33,7 +33,7 @@ this exception to your version of the li
this exception to your version of the library, but you are not
obligated to do so. If you do not wish to do so, delete this
exception statement from your version.
-*/
+ */
package org.classpath.icedtea.pulseaudio;
@@ -60,12 +60,15 @@ public class EventLoop implements Runnab
*/
public Object threadLock = new Object();
+ private static EventLoop instance = null;
+
private List<ContextListener> contextListeners;
// private List<SourceDataLine> lines;
private String name;
private String serverString;
private int status;
+ // private boolean eventLoopIsRunning = false;
public Semaphore finished = new Semaphore(0);
@@ -88,11 +91,6 @@ public class EventLoop implements Runnab
/*
* These fields hold pointers
*
- * When going from 32 bit to 64 bit, these will have to be changed to longs,
- * but not otherwise
- *
- * Pointer sizes change from 32 bit to 64 bit, but java data types's sizes
- * dont
*
*/
@SuppressWarnings("unused")
@@ -117,8 +115,16 @@ public class EventLoop implements Runnab
}
}
- public EventLoop() {
+ private EventLoop() {
contextListeners = new ArrayList<ContextListener>();
+
+ }
+
+ synchronized public static EventLoop getEventLoop() {
+ if (instance == null) {
+ instance = new EventLoop();
+ }
+ return instance;
}
public void setAppName(String name) {
@@ -149,7 +155,6 @@ public class EventLoop implements Runnab
native_shutdown();
System.out.println(this.getClass().getName()
+ ": shutting down");
- finished.release();
return;
}
@@ -158,9 +163,15 @@ public class EventLoop implements Runnab
}
- public void addContextListener(ContextListener l) {
- synchronized (threadLock) {
- contextListeners.add(l);
+ public void addContextListener(ContextListener contextListener) {
+ synchronized (contextListeners) {
+ contextListeners.add(contextListener);
+ }
+ }
+
+ public void removeContextListener(ContextListener contextListener) {
+ synchronized (contextListeners) {
+ contextListeners.remove(contextListener);
}
}
@@ -185,6 +196,7 @@ public class EventLoop implements Runnab
case 3:
break;
case 4:
+ System.out.println(this.getClass().getName() + " is ready!");
fireEvent(new ContextEvent(Type.READY));
break;
case 5:
@@ -200,14 +212,19 @@ public class EventLoop implements Runnab
}
private void fireEvent(final ContextEvent e) {
-
+ System.out.println(this.getClass().getName() + "firing event: "
+ + e.getType().toString());
Thread th = new Thread(new Runnable() {
@Override
public void run() {
+ System.out.println("notifying listeners");
+
synchronized (contextListeners) {
+ System.out.println(contextListeners.size());
for (ContextListener listener : contextListeners) {
listener.update(e);
+ System.out.println("updating listeners");
}
}
}
@@ -215,7 +232,7 @@ public class EventLoop implements Runnab
});
th.start();
-
+
}
public void setVolume(long streamPointer, int volume) {
diff -r 0caab9aa95b1 -r 4a01f1203d48 src/org/classpath/icedtea/pulseaudio/PulseAudioMixer.java
--- a/src/org/classpath/icedtea/pulseaudio/PulseAudioMixer.java Tue Aug 05 17:30:50 2008 -0400
+++ b/src/org/classpath/icedtea/pulseaudio/PulseAudioMixer.java Wed Aug 06 14:08:52 2008 -0400
@@ -33,7 +33,7 @@ this exception to your version of the li
this exception to your version of the library, but you are not
obligated to do so. If you do not wish to do so, delete this
exception statement from your version.
-*/
+ */
package org.classpath.icedtea.pulseaudio;
@@ -218,13 +218,13 @@ public class PulseAudioMixer implements
eventLoopThread.interrupt();
try {
- eventLoop.finished.acquire();
+ eventLoopThread.join();
} catch (InterruptedException e) {
System.out.println(this.getClass().getName()
+ ": interrupted while waiting for eventloop to finish");
}
- System.out.println(this.getClass().getName() + ": closing");
+ System.out.println(this.getClass().getName() + ": closed");
this.isOpen = false;
fireEvent(new LineEvent(this, LineEvent.Type.CLOSE,
@@ -304,25 +304,29 @@ public class PulseAudioMixer implements
host = host + ":" + String.valueOf(port);
}
- eventLoop = new EventLoop();
+ eventLoop = EventLoop.getEventLoop();
eventLoop.setAppName(appName);
eventLoop.setServer(host);
final Semaphore ready = new Semaphore(0);
- eventLoop.addContextListener(new ContextListener() {
+ ContextListener initListener = new ContextListener() {
@Override
public void update(ContextEvent e) {
- System.out.println("Event detected " + e.getType().toString());
+ System.out.println(this.getClass().getName()
+ + ": Event detected " + e.getType().toString());
if (e.getType() == ContextEvent.Type.READY
|| e.getType() == ContextEvent.Type.FAILED
|| e.getType() == ContextEvent.Type.TERMINATED) {
ready.release();
+ System.out.println("realeasing semaphore ready");
}
}
- });
+ };
+
+ eventLoop.addContextListener(initListener);
eventLoopThread = new Thread(eventLoop, "PulseAudio Eventloop Thread");
@@ -333,17 +337,46 @@ public class PulseAudioMixer implements
System.out.println("waiting...");
ready.acquire();
if (eventLoop.getStatus() != 4) {
+ /*
+ * when exiting, wait for the thread to end otherwise we get one
+ * thread that inits the singletone with new data and the old
+ * thread then cleans up the singleton asserts fail all over the
+ * place
+ */
+ eventLoop.removeContextListener(initListener);
+ eventLoopThread.interrupt();
+ eventLoopThread.join();
throw new LineUnavailableException();
}
-
+ eventLoop.removeContextListener(initListener);
System.out.println("got signal");
} catch (InterruptedException e) {
- System.out.println("got interrupted");
- }
-
+ System.out.println("PROBLEM: got interrupted");
+ }
+
+ System.out.println(this.getClass().getName() + ": ready");
+
this.isOpen = true;
- fireEvent(new LineEvent(this, LineEvent.Type.OPEN,
- AudioSystem.NOT_SPECIFIED));
+
+// ContextListener eventListener = new ContextListener() {
+//
+// @Override
+// public void update(ContextEvent e) {
+// if (e.getType() == ContextEvent.Type.READY) {
+//
+// fireEvent(new LineEvent(PulseAudioMixer.this,
+// LineEvent.Type.OPEN, AudioSystem.NOT_SPECIFIED));
+// } else if (e.getType() == ContextEvent.Type.FAILED
+// || e.getType() == ContextEvent.Type.TERMINATED) {
+// fireEvent(new LineEvent(PulseAudioMixer.this,
+// LineEvent.Type.CLOSE, AudioSystem.NOT_SPECIFIED));
+// }
+//
+// }
+//
+// };
+
+// eventLoop.addContextListener(eventListener);
}
diff -r 0caab9aa95b1 -r 4a01f1203d48 src/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine$1.class
Binary file src/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine$1.class has changed
diff -r 0caab9aa95b1 -r 4a01f1203d48 src/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.class
Binary file src/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.class has changed
diff -r 0caab9aa95b1 -r 4a01f1203d48 src/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java
--- a/src/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java Tue Aug 05 17:30:50 2008 -0400
+++ b/src/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java Wed Aug 06 14:08:52 2008 -0400
@@ -45,7 +45,6 @@ import javax.sound.sampled.AudioFormat;
import javax.sound.sampled.AudioFormat;
import javax.sound.sampled.BooleanControl;
import javax.sound.sampled.Control;
-import javax.sound.sampled.FloatControl;
import javax.sound.sampled.Line;
import javax.sound.sampled.LineEvent;
import javax.sound.sampled.LineListener;
diff -r 0caab9aa95b1 -r 4a01f1203d48 src/org/classpath/icedtea/pulseaudio/PulseAudioStreamVolumeControl.class
Binary file src/org/classpath/icedtea/pulseaudio/PulseAudioStreamVolumeControl.class has changed
diff -r 0caab9aa95b1 -r 4a01f1203d48 src/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.class
Binary file src/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.class has changed
diff -r 0caab9aa95b1 -r 4a01f1203d48 src/org/classpath/icedtea/pulseaudio/PulseAudioVolumeControl.class
Binary file src/org/classpath/icedtea/pulseaudio/PulseAudioVolumeControl.class has changed
diff -r 0caab9aa95b1 -r 4a01f1203d48 src/org/classpath/icedtea/pulseaudio/StreamEvent$Type.class
Binary file src/org/classpath/icedtea/pulseaudio/StreamEvent$Type.class has changed
diff -r 0caab9aa95b1 -r 4a01f1203d48 src/org/classpath/icedtea/pulseaudio/StreamEvent.class
Binary file src/org/classpath/icedtea/pulseaudio/StreamEvent.class has changed
diff -r 0caab9aa95b1 -r 4a01f1203d48 src/org/classpath/icedtea/pulseaudio/StreamListener.class
Binary file src/org/classpath/icedtea/pulseaudio/StreamListener.class has changed
diff -r 0caab9aa95b1 -r 4a01f1203d48 src/org/classpath/icedtea/pulseaudio/StreamVolume.java
--- a/src/org/classpath/icedtea/pulseaudio/StreamVolume.java Tue Aug 05 17:30:50 2008 -0400
+++ b/src/org/classpath/icedtea/pulseaudio/StreamVolume.java Wed Aug 06 14:08:52 2008 -0400
@@ -45,7 +45,7 @@ public class StreamVolume extends FloatC
private FloatControl.Type type;
private PulseAudioSourceDataLine stream;
-
+
private static final int MIN_PULSE_VOLUME = 0x0;
private static final int MAX_PULSE_VOLUME = 0x10000;
@@ -62,8 +62,8 @@ public class StreamVolume extends FloatC
}
}
- private native void native_set_volume(int volume, long streamPointer, long contextPointer);
-
+ private native void native_set_volume(int volume, long streamPointer);
+
protected StreamVolume(PulseAudioSourceDataLine stream) {
super(FloatControl.Type.VOLUME, 0f, 100f, 0.1f, 1, 100f, "percent",
"mute", "medium", "max");
@@ -101,8 +101,9 @@ public class StreamVolume extends FloatC
*
*/
int value = (int) (newValue/100f * MAX_PULSE_VOLUME);
-// native_set_volume(value, stream.getStreamPointer());
-
+// synchronized (eventLoop.threadLock) {
+ native_set_volume(value, stream.getStreamPointer());
+// }
super.setValue(newValue);
}
diff -r 0caab9aa95b1 -r 4a01f1203d48 src/org_classpath_icedtea_pulseaudio_EventLoop.c
--- a/src/org_classpath_icedtea_pulseaudio_EventLoop.c Tue Aug 05 17:30:50 2008 -0400
+++ b/src/org_classpath_icedtea_pulseaudio_EventLoop.c Wed Aug 06 14:08:52 2008 -0400
@@ -52,6 +52,8 @@ static void context_change_callback(pa_c
assert(context);
assert(userdata == NULL);
+ printf("context state changed\n");
+
//java_context_t* java_context = (java_context_t*)userdata;
JNIEnv* env = java_context->env;
jobject obj = java_context->obj;
@@ -203,6 +205,9 @@ JNIEXPORT void JNICALL Java_org_classpat
free(java_context);
printf("native_shutdown() returning\n");
+
+ setJavaPointer(env, obj, "mainloopPointer", NULL);
+ setJavaPointer(env, obj, "contextPointer", NULL);
}
diff -r 0caab9aa95b1 -r 4a01f1203d48 src/org_classpath_icedtea_pulseaudio_EventLoop.h
--- a/src/org_classpath_icedtea_pulseaudio_EventLoop.h Tue Aug 05 17:30:50 2008 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class org_classpath_icedtea_pulseaudio_EventLoop */
-
-#ifndef _Included_org_classpath_icedtea_pulseaudio_EventLoop
-#define _Included_org_classpath_icedtea_pulseaudio_EventLoop
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class: org_classpath_icedtea_pulseaudio_EventLoop
- * Method: native_setup
- * Signature: (Ljava/lang/String;Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_org_classpath_icedtea_pulseaudio_EventLoop_native_1setup
- (JNIEnv *, jobject, jstring, jstring);
-
-/*
- * Class: org_classpath_icedtea_pulseaudio_EventLoop
- * Method: native_iterate
- * Signature: (I)I
- */
-JNIEXPORT jint JNICALL Java_org_classpath_icedtea_pulseaudio_EventLoop_native_1iterate
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: org_classpath_icedtea_pulseaudio_EventLoop
- * Method: native_shutdown
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_org_classpath_icedtea_pulseaudio_EventLoop_native_1shutdown
- (JNIEnv *, jobject);
-
-/*
- * Class: org_classpath_icedtea_pulseaudio_EventLoop
- * Method: native_set_sink_volume
- * Signature: (JI)V
- */
-JNIEXPORT void JNICALL Java_org_classpath_icedtea_pulseaudio_EventLoop_native_1set_1sink_1volume
- (JNIEnv *, jobject, jlong, jint);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff -r 0caab9aa95b1 -r 4a01f1203d48 src/org_classpath_icedtea_pulseaudio_PulseAudioSourceDataLine.h
--- a/src/org_classpath_icedtea_pulseaudio_PulseAudioSourceDataLine.h Tue Aug 05 17:30:50 2008 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class org_classpath_icedtea_pulseaudio_PulseAudioSourceDataLine */
-
-#ifndef _Included_org_classpath_icedtea_pulseaudio_PulseAudioSourceDataLine
-#define _Included_org_classpath_icedtea_pulseaudio_PulseAudioSourceDataLine
-#ifdef __cplusplus
-extern "C" {
-#endif
-#undef org_classpath_icedtea_pulseaudio_PulseAudioSourceDataLine_DEFAULT_BUFFER_SIZE
-#define org_classpath_icedtea_pulseaudio_PulseAudioSourceDataLine_DEFAULT_BUFFER_SIZE 1000L
-/*
- * Class: org_classpath_icedtea_pulseaudio_PulseAudioSourceDataLine
- * Method: native_open
- * Signature: (JLjava/lang/String;Ljava/lang/String;FIIZI)V
- */
-JNIEXPORT void JNICALL Java_org_classpath_icedtea_pulseaudio_PulseAudioSourceDataLine_native_1open
- (JNIEnv *, jobject, jlong, jstring, jstring, jfloat, jint, jint, jboolean, jint);
-
-/*
- * Class: org_classpath_icedtea_pulseaudio_PulseAudioSourceDataLine
- * Method: native_write
- * Signature: ([BII)V
- */
-JNIEXPORT void JNICALL Java_org_classpath_icedtea_pulseaudio_PulseAudioSourceDataLine_native_1write
- (JNIEnv *, jobject, jbyteArray, jint, jint);
-
-/*
- * Class: org_classpath_icedtea_pulseaudio_PulseAudioSourceDataLine
- * Method: native_get_writable_size
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_org_classpath_icedtea_pulseaudio_PulseAudioSourceDataLine_native_1get_1writable_1size
- (JNIEnv *, jobject);
-
-/*
- * Class: org_classpath_icedtea_pulseaudio_PulseAudioSourceDataLine
- * Method: native_getOperationState
- * Signature: (I)I
- */
-JNIEXPORT jint JNICALL Java_org_classpath_icedtea_pulseaudio_PulseAudioSourceDataLine_native_1getOperationState
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: org_classpath_icedtea_pulseaudio_PulseAudioSourceDataLine
- * Method: native_flush
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_org_classpath_icedtea_pulseaudio_PulseAudioSourceDataLine_native_1flush
- (JNIEnv *, jobject);
-
-/*
- * Class: org_classpath_icedtea_pulseaudio_PulseAudioSourceDataLine
- * Method: native_start
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_org_classpath_icedtea_pulseaudio_PulseAudioSourceDataLine_native_1start
- (JNIEnv *, jobject);
-
-/*
- * Class: org_classpath_icedtea_pulseaudio_PulseAudioSourceDataLine
- * Method: native_pause
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_org_classpath_icedtea_pulseaudio_PulseAudioSourceDataLine_native_1pause
- (JNIEnv *, jobject);
-
-/*
- * Class: org_classpath_icedtea_pulseaudio_PulseAudioSourceDataLine
- * Method: native_resume
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_org_classpath_icedtea_pulseaudio_PulseAudioSourceDataLine_native_1resume
- (JNIEnv *, jobject);
-
-/*
- * Class: org_classpath_icedtea_pulseaudio_PulseAudioSourceDataLine
- * Method: native_drain
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_org_classpath_icedtea_pulseaudio_PulseAudioSourceDataLine_native_1drain
- (JNIEnv *, jobject);
More information about the distro-pkg-dev
mailing list