Thread sync possibly working

Author: martinmarinov

JavaGUI/jni/TSDRLibraryNDK.c

@@ -19,6 +19,8 @@ struct java_context {
 		jfieldID fid_height;
 		jmethodID fixSize;
 		jmethodID notifyCallbacks;
+		jint * pixels;
+		int pixelsize;
 	} typedef java_context_t;
 
 static JavaVM *jvm;
@@ -69,23 +71,14 @@ void error(JNIEnv * env, int exception_code, const char *inmsg, ...)
     (*env)->DeleteLocalRef(env, cls);
 }
 
-JNIEXPORT void JNICALL Java_martin_tempest_core_TSDRLibrary_init (JNIEnv * env, jobject obj) {
+JNIEXPORT void JNICALL Java_martin_tempest_core_TSDRLibrary_init (JNIEnv * env, jobject obj, jstring  path) {
 	(*env)->GetJavaVM(env, &jvm);
 	javaversion = (*env)->GetVersion(env);
-}
-
-JNIEXPORT void JNICALL Java_martin_tempest_core_TSDRLibrary_nativeLoadPlugin (JNIEnv * env, jobject obj, jstring  path) {
 	const char *npath = (*env)->GetStringUTFChars(env, path, 0);
 	THROW(tsdr_loadplugin(&tsdr_instance, npath));
 	(*env)->ReleaseStringUTFChars(env, path, npath);
 }
 
-JNIEXPORT void JNICALL Java_martin_tempest_core_TSDRLibrary_pluginParams (JNIEnv * env, jobject obj, jstring params) {
-	const char *nparams = (*env)->GetStringUTFChars(env, params, 0);
-	THROW(tsdr_pluginparams(&tsdr_instance, nparams));
-	(*env)->ReleaseStringUTFChars(env, params, nparams);
-}
-
 JNIEXPORT void JNICALL Java_martin_tempest_core_TSDRLibrary_setSampleRate (JNIEnv * env, jobject obj, jlong rate) {
 	THROW(tsdr_setsamplerate(&tsdr_instance, (uint32_t) rate));
 }
@@ -107,27 +100,27 @@ void read_async(float *buf, int width, int height, void *ctx) {
 	if (i_width != width || i_height != height) {
 		// fixSize(200, 200);
 		(*env)->CallVoidMethod(env, context->obj, context->fixSize, width, height);
+
+		context->pixelsize = width * height;
+		context->pixels = (jint *) realloc((void *) context->pixels, sizeof(jint) * context->pixelsize);
 	}
 
-	jintArray pixels_obj = (*env)->GetObjectField(env, context->obj, context->fid_pixels);
-	jint * pixels = (*env)->GetIntArrayElements(env,pixels_obj,0);
-	jint * data = pixels;
+	jint * data = context->pixels;
 
 	int i;
-	const int size = width * height;
-	for (i = 0; i < size; i++) {
+	for (i = 0; i < context->pixelsize; i++) {
 		const int col = (int) (*(buf++) * 255.0f);
 		*(data++) = col | (col << 8) | (col << 16);
 	}
 
 	// release elements
-	(*env)->ReleaseIntArrayElements(env,pixels_obj,pixels,0);
+	(*env)->SetIntArrayRegion(env, (*env)->GetObjectField(env, context->obj, context->fid_pixels), 0, context->pixelsize, context->pixels);
 
 	// notifyCallbacks();
 	(*env)->CallVoidMethod(env, context->obj, context->notifyCallbacks);
 }
 
-JNIEXPORT void JNICALL Java_martin_tempest_core_TSDRLibrary_nativeStart (JNIEnv * env, jobject obj) {
+JNIEXPORT void JNICALL Java_martin_tempest_core_TSDRLibrary_nativeStart (JNIEnv * env, jobject obj, jstring params) {
 
 	java_context_t * context = (java_context_t *) malloc(sizeof(java_context_t));
 
@@ -140,11 +133,22 @@ JNIEXPORT void JNICALL Java_martin_tempest_core_TSDRLibrary_nativeStart (JNIEnv
 	context->fixSize = (*env)->GetMethodID(env, context->cls, "fixSize", "(II)V");
 	context->notifyCallbacks = (*env)->GetMethodID(env, context->cls, "notifyCallbacks", "()V");
 
-	THROW(tsdr_readasync(&tsdr_instance, read_async, (void *) context));
+	jint i_width = (*env)->GetIntField(env, context->obj, context->fid_width);
+	jint i_height = (*env)->GetIntField(env, context->obj, context->fid_height);
+
+	context->pixelsize = i_width * i_height;
+	context->pixels = (jint *) malloc(sizeof(jint) * context->pixelsize);
+
+	const char *nparams = (*env)->GetStringUTFChars(env, params, 0);
 
+	THROW(tsdr_readasync(&tsdr_instance, read_async, (void *) context, nparams));
+
+
+	(*env)->ReleaseStringUTFChars(env, params, nparams);
 	(*env)->DeleteGlobalRef(env, context->obj);
 	(*env)->DeleteGlobalRef(env, context->cls);
 	free(context);
+	free(context->pixels);
 }
 
 JNIEXPORT void JNICALL Java_martin_tempest_core_TSDRLibrary_stop (JNIEnv * env, jobject obj) {

JavaGUI/jni/TSDRLibraryNDK.h

@@ -5,6 +5,7 @@
 
 	struct tsdr_lib {
 		void * plugin;
+		void * mutex_sync_unload;
 		uint32_t samplerate;
 		int width;
 		int height;
@@ -15,13 +16,12 @@
 
 	typedef void(*tsdr_readasync_function)(float *buf, int width, int height, void *ctx);
 
-	int tsdr_loadplugin(tsdr_lib_t * tsdr, char * filepath);
-	int tsdr_pluginparams(tsdr_lib_t * tsdr, char * params);
+	int tsdr_loadplugin(tsdr_lib_t * tsdr, const char * filepath);
 	int tsdr_setsamplerate(tsdr_lib_t * tsdr, uint32_t rate);
 	int tsdr_setbasefreq(tsdr_lib_t * tsdr, uint32_t freq);
 	int tsdr_stop(tsdr_lib_t * tsdr);
 	int tsdr_setgain(tsdr_lib_t * tsdr, float gain);
-	int tsdr_readasync(tsdr_lib_t * tsdr, tsdr_readasync_function cb, void *ctx);
+	int tsdr_readasync(tsdr_lib_t * tsdr, tsdr_readasync_function cb, void *, const char * params);
 	int tsdr_unloadplugin(tsdr_lib_t * tsdr);
 	int tsdr_setresolution(tsdr_lib_t * tsdr, int width, int height);
 	int tsdr_setvfreq(tsdr_lib_t * tsdr, float freq);

JavaGUI/jni/include/TSDRLibrary.h

@@ -6,6 +6,12 @@ endif
 # Flags
 CPPFLAGS=-O3
 
+# Define all of the C files here
+OBJS = TSDRLibraryNDK.o
+
+# Define all of the dependencies here
+DEPS = TSDRLibraryNDK.h include/TSDRLibrary.h include/TSDRCodes.h
+
 # Headers
 INC = "$(JAVA_HOME)/include" "$(JAVA_HOME)/include/win32"
 
@@ -44,32 +50,34 @@ endif
 # The folder that will contain the libraries
 OUTPUTFOLDER=../lib/$(OSNAME)/$(ARCHNAME)
 
+# The folder that will contain the object files
+OBJFOLDER=obj
+
+# The obj files reside in the bin/obj directory
+_OBJS = $(patsubst %,$(OBJFOLDER)/%,$(OBJS))
+
 # We want to build the library
-all : $(OUTPUTFOLDER)/TSDRLibraryNDK$(EXT)
+all : rebuildtempestsdr library
 
 # Linking
-$(OUTPUTFOLDER)/TSDRLibraryNDK$(EXT) : TSDRLibraryNDK.o rebuildtempestsdr $(OUTPUTFOLDER)
-	gcc -L../../TempestSDR/bin/$(OSNAME)/$(ARCHNAME)/ -lTSDRLibrary -Wl,--add-stdcall-alias -shared -o $@ $<
-
-# Create output dir
-$(OUTPUTFOLDER) :	
-	mkdir -p $(OUTPUTFOLDER)
+library : $(_OBJS)
+	gcc -L../../TempestSDR/bin/$(OSNAME)/$(ARCHNAME)/ -lTSDRLibrary -Wl,--add-stdcall-alias -shared -o $(OUTPUTFOLDER)/TSDRLibraryNDK$(EXT) $<
 
 # Rebuild the main library so that we have the most up-to-date version
 # The main library is assumed to be two levels below this jni folder
-rebuildtempestsdr : $(OUTPUTFOLDER)
+rebuildtempestsdr :
 	@$(MAKE) -C ../../TempestSDR all
 	@cp -f ../../TempestSDR/bin/$(OSNAME)/$(ARCHNAME)/TSDRLibrary$(EXT) $(OUTPUTFOLDER)/TSDRLibrary$(EXT)
+	mkdir -p include
+	@cp -f ../../TempestSDR/src/include/TSDRCodes.h include/
+	@cp -f ../../TempestSDR/src/include/TSDRLibrary.h include/
+	mkdir -p $(OUTPUTFOLDER)
+	mkdir -p $(OBJFOLDER)
 
 # Compile the sources to obj files
-TSDRLibraryNDK.o : TSDRLibraryNDK.c TSDRLibraryNDK.h include/TSDRLibrary.h include/TSDRCodes.h
+$(OBJFOLDER)/%.o : %.c $(DEPS)
 	gcc $(foreach d, $(INC), -I$d) $(CFLAGS) -c $< -o $@
 
-# Copy over a fresh set of library headers
-include/%.h : ../../TempestSDR/src/include/%.h
-	mkdir -p include
-	@cp -f $< $@
-
 # Generate the java header based on the class
 TSDRLibraryNDK.h : ../bin/martin/tempest/core/TSDRLibrary.class 
 	javah -classpath ../bin -o TSDRLibraryNDK.h -jni martin.tempest.core.TSDRLibrary
@@ -81,5 +89,5 @@ TSDRLibraryNDK.h : ../bin/martin/tempest/core/TSDRLibrary.class
 
 # Remove any compiled artifacts
 clean :
-	rm -f TSDRLibraryNDK.h *.o ../TSDRLibraryNDK$(EXT) ../TSDRLibrary$(EXT) include/*.h
-	rm -rf include/
+	rm -f TSDRLibraryNDK.h ../TSDRLibraryNDK$(EXT) ../TSDRLibrary$(EXT)
+	rm -rf $(OBJFOLDER)/

JavaGUI/jni/makefile

@@ -0,0 +1,11 @@
+#ifdef OS_WINDOWS
+	#define WINHEAD (1)
+#elif defined(_WIN64)
+	#define WINHEAD (1)
+#elif defined(_WIN32)
+	#define WINHEAD (1)
+#elif defined(_MSC_VER) // Microsoft compiler
+	#define WINHEAD (1)
+#else
+	#define WINHEAD (0)
+#endif

JavaGUI/jni/osdetect.h

@@ -0,0 +1,36 @@
+#include "timer.h"
+
+void timer_tick(TickTockTimer_t * timer) {
+	timer->started = 1;
+	gettimeofday(&timer->start, NULL);
+}
+
+float timer_tock(TickTockTimer_t * timer) {
+	struct timeval now;
+	struct timeval elapsed;
+
+	if (!timer->started) return -1;
+
+	gettimeofday(&now, NULL);
+	timersub(&now, &timer->start, &elapsed);
+
+	return (float) elapsed.tv_sec + (float) (elapsed.tv_usec) * (float) 1e-6;
+}
+
+float timer_ticktock(TickTockTimer_t * timer) {
+	struct timeval now;
+	struct timeval elapsed;
+
+	gettimeofday(&now, NULL);
+
+	if (!timer->started) {
+		timer->start = now;
+		timer->started = 1;
+		return 0;
+	} else {
+		timersub(&now, &timer->start, &elapsed);
+		timer->start = now;
+
+		return (float) elapsed.tv_sec + (float) (elapsed.tv_usec) * (float) 1e-6;;
+	}
+}

JavaGUI/jni/timer.c

@@ -0,0 +1,18 @@
+#ifndef TIMR_M_H
+#define TIMR_M_H
+#include "osdetect.h"
+#include <sys/time.h>
+
+typedef struct TickTockTimer TickTockTimer_t;
+
+struct TickTockTimer
+{
+	struct timeval start;
+	int started;
+};
+
+void timer_tick(TickTockTimer_t * timer);
+float timer_tock(TickTockTimer_t * timer);
+float timer_ticktock(TickTockTimer_t * timer);
+
+#endif

JavaGUI/jni/timer.h

@@ -33,15 +33,23 @@ public Main() throws TSDRException {
 		frame.setSize(WIDTH,HEIGHT);
 		frame.setVisible(true);
 
-		TSDRLibrary sdrlib = new TSDRLibrary(WIDTH, HEIGHT);
-		sdrlib.loadSource(TSDRLibrary.getAllSources()[0]);
-		sdrlib.registerFrameReadyCallback(this);
-		sdrlib.startAsync();
+		new Thread() {
+			public void run() {
+				try {
+					TSDRLibrary sdrlib = new TSDRLibrary(TSDRLibrary.getAllSources()[0], WIDTH, HEIGHT);
+					sdrlib.registerFrameReadyCallback(Main.this);
+					sdrlib.startAsync();
+				} catch (Throwable e) {e.printStackTrace();};
+				
+			};
+		}.start();
+		
 	}
 
 	@Override
 	public void onFrameReady(TSDRLibrary lib, BufferedImage frame) {
 		viz.drawImage(frame);
+		try { lib.setSampleRate(0); } catch (Exception e) {};
 	}
 
 	@Override