Stubs, plugin loading and error handling

Author: martinmarinov

JavaGUI/jni/TSDRLibraryNDK.c

@@ -2,8 +2,87 @@
 #include <stdio.h>
 #include "TSDRLibraryNDK.h"
 #include "include\TSDRLibrary.h"
+#include "include\TSDRCodes.h"
+#include <string.h>
 
-JNIEXPORT void JNICALL Java_martin_tempest_core_TSDRLibrary_test(JNIEnv *env, jobject thisObj)
+tsdr_lib_t tsdr;
+
+#define THROW(x) error(env, x, "")
+
+void error_translate (int exception_code, char * exceptionclass) {
+	switch (exception_code) {
+		case TSDR_OK:
+			return;
+		case TSDR_ERR_PLUGIN:
+			strcpy(exceptionclass, "martin/tempest/core/exceptions/TSDRLoadPluginException");
+			return;
+		case TSDR_NOT_IMPLEMENTED:
+			strcpy(exceptionclass, "martin/tempest/core/exceptions/TSDRFunctionNotImplemented");
+			return;
+		default:
+			strcpy(exceptionclass, "java/lang/Exception");
+			return;
+		}
+}
+
+void error(JNIEnv * env, int exception_code, const char *inmsg, ...)
 {
-   test();
+	if (exception_code == TSDR_OK) return;
+
+	char exceptionclass[256];
+	error_translate(exception_code, exceptionclass);
+
+	JavaVM* jvm;
+	char msg[256];
+
+	va_list argptr;
+	va_start(argptr, inmsg);
+	vsprintf(msg, inmsg, argptr);
+	va_end(argptr);
+
+    jclass cls = (*env)->FindClass(env, exceptionclass);
+    /* if cls is NULL, an exception has already been thrown */
+    if (cls != NULL) {
+        (*env)->ThrowNew(env, cls, msg);
+    }
+    /* free the local ref */
+    (*env)->DeleteLocalRef(env, cls);
+}
+
+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, npath));
+	(*env)->ReleaseStringUTFChars(env, path, npath);
+}
+
+JNIEXPORT void JNICALL Java_martin_tempest_core_TSDRLibrary_pluginParams (JNIEnv * env, jobject obj, jstring params) {
+	error(env, TSDR_NOT_IMPLEMENTED, "%s not implemented", "pluginParams");
+}
+
+JNIEXPORT void JNICALL Java_martin_tempest_core_TSDRLibrary_setSampleRate (JNIEnv * env, jobject obj, jlong rate) {
+	error(env, TSDR_NOT_IMPLEMENTED, "%s not implemented", "setSampleRate");
+}
+
+JNIEXPORT void JNICALL Java_martin_tempest_core_TSDRLibrary_setBaseFreq (JNIEnv * env, jobject obj, jlong freq) {
+	error(env, TSDR_NOT_IMPLEMENTED, "%s not implemented", "setBaseFreq");
+}
+
+JNIEXPORT void JNICALL Java_martin_tempest_core_TSDRLibrary_start (JNIEnv * env, jobject obj) {
+	error(env, TSDR_NOT_IMPLEMENTED, "%s not implemented", "start");
+}
+
+JNIEXPORT void JNICALL Java_martin_tempest_core_TSDRLibrary_stop (JNIEnv * env, jobject obj) {
+	error(env, TSDR_NOT_IMPLEMENTED, "%s not implemented", "stop");
+}
+
+JNIEXPORT void JNICALL Java_martin_tempest_core_TSDRLibrary_setGain (JNIEnv * env, jobject obj, jfloat gain) {
+	error(env, TSDR_NOT_IMPLEMENTED, "%s not implemented", "setGain");
+}
+
+JNIEXPORT void JNICALL Java_martin_tempest_core_TSDRLibrary_readAsync (JNIEnv * env, jobject obj) {
+	error(env, TSDR_NOT_IMPLEMENTED, "%s not implemented", "readAsync");
+}
+
+JNIEXPORT void JNICALL Java_martin_tempest_core_TSDRLibrary_unloadPlugin (JNIEnv * env, jobject obj) {
+	error(env, TSDR_NOT_IMPLEMENTED, "%s not implemented", "unloadPlugin");
 }

JavaGUI/jni/TSDRLibraryNDK.h

@@ -0,0 +1,8 @@
+#ifndef _TSDRCodes
+#define _TSDRCodes
+
+	#define TSDR_OK (0)
+	#define TSDR_ERR_PLUGIN (1)
+	#define TSDR_NOT_IMPLEMENTED (404)
+
+#endif

JavaGUI/jni/include/TSDRCodes.h

@@ -0,0 +1,22 @@
+#ifndef _TSDRLibrary
+#define _TSDRLibrary
+
+	#include <stdint.h>
+
+	struct tsdr_lib {
+		void * plugin;
+	} typedef tsdr_lib_t;
+
+	typedef void(*tsdr_readasync_function)(unsigned char *buf, uint32_t len, void *ctx);
+
+	int tsdr_loadplugin(tsdr_lib_t * tsdr, char * filepath);
+	int tsdr_pluginparams(tsdr_lib_t * tsdr, char * params);
+	int tsdr_setsamplerate(tsdr_lib_t * tsdr, uint32_t rate);
+	int tsdr_setbasefreq(tsdr_lib_t * tsdr, uint32_t freq);
+	int tsdr_start(tsdr_lib_t * tsdr);
+	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, uint32_t buf_num, uint32_t buf_len);
+	int tsdr_unloadplugin(tsdr_lib_t * tsdr);
+
+#endif

JavaGUI/jni/include/TSDRLibrary.h

@@ -59,11 +59,11 @@ rebuildtempestsdr : $(OUTPUTFOLDER)
 	@cp -f ../../TempestSDR/bin/$(OSNAME)/$(ARCHNAME)/TSDRLibrary$(EXT) $(OUTPUTFOLDER)/TSDRLibrary$(EXT)
 
 # Compile the sources to obj files
-TSDRLibraryNDK.o : TSDRLibraryNDK.c TSDRLibraryNDK.h include/TSDRLibrary.h
+TSDRLibraryNDK.o : TSDRLibraryNDK.c TSDRLibraryNDK.h include/TSDRLibrary.h include/TSDRCodes.h
 	gcc $(foreach d, $(INC), -I$d) -c $< -o $@
 
 # Copy over a fresh set of library headers
-include/TSDRLibrary.h : ../../TempestSDR/src/include/TSDRLibrary.h
+include/%.h : ../../TempestSDR/src/include/%.h
 	mkdir -p include
 	@cp -f $< $@
 

JavaGUI/jni/makefile

@@ -81,12 +81,9 @@ jnilib : plugins
 	@$(MAKE) -C jni/ all JAVA_HOME=$(JAVA_HOME)
 
 # Recompile each plugin and copy its shared library over to the java directory
-plugins : $(OUTPUTFOLDER)
-	$(foreach pdir, $(PLUGINS_DIRS), $(MAKE) -C $(pdir) all; cp -f $(pdir)/bin/$(OSNAME)/$(ARCHNAME)/*$(EXT) $(OUTPUTFOLDER)/;)
-
-# Create output dir
-$(OUTPUTFOLDER) :	
+plugins :
 	mkdir -p $(OUTPUTFOLDER)
+	$(foreach pdir, $(PLUGINS_DIRS), $(MAKE) -C $(pdir) all; cp -f $(pdir)/bin/$(OSNAME)/$(ARCHNAME)/*$(EXT) $(OUTPUTFOLDER)/;)
 
 # Clean the jni stuff
 cleanjni: cleanplugins

JavaGUI/makefile

@@ -7,9 +7,11 @@ public class Main {
 	public static void main(String[] args) {
 		try {
 			TSDRLibrary sdrlib = new TSDRLibrary();
-			sdrlib.test();
+			sdrlib.loadSource(TSDRLibrary.getAllSources()[0]);
+			sdrlib.setBaseFreq(0);
 		} catch(Exception e) {
-			System.out.println("Cannot load! Reason: "+e.getLocalizedMessage());
+			System.err.println("Cannot load! Reason: "+e.getLocalizedMessage());
+			e.printStackTrace();
 		}
 	}
 

JavaGUI/src/martin/tempest/Main.java

@@ -7,6 +7,9 @@
 import java.io.IOException;
 import java.io.InputStream;
 
+import martin.tempest.core.exceptions.TSDRException;
+import martin.tempest.core.exceptions.TSDRLibraryNotCompatible;
+
 /**
  * This is a Java wrapper library for TSDRLibrary
  * 
@@ -15,16 +18,18 @@
  */
 public class TSDRLibrary {
 
+	private static TSDRSource[] PLUGINS = new TSDRSource[] {new TSDRSource("TSDRPlugin_RawFile")};
+	
 	// If the binaries weren't loaded, this will go off
-	private static Exception m_e = null;
+	private static TSDRLibraryNotCompatible m_e = null;
 
 	/**
 	 * Extracts a library to a temporary path and prays for the OS to delete it after the app closes.
 	 * @param name
 	 * @return
 	 * @throws IOException
 	 */
-	static final File extractLibrary(final String name) throws IOException {
+	static final File extractLibrary(final String name) throws TSDRLibraryNotCompatible {
 		final String rawOSNAME = System.getProperty("os.name").toLowerCase();
 		final String rawARCHNAME = System.getProperty("os.arch").toLowerCase();
 
@@ -49,7 +54,7 @@ else if (rawARCHNAME.contains("64"))
 			ARCHNAME = "X86";
 
 		if (OSNAME == null || EXT == null || ARCHNAME == null)
-			throw new RuntimeException("Your OS or CPU is not yet supported, sorry.");
+			throw new TSDRLibraryNotCompatible("Your OS or CPU is not yet supported, sorry.");
 
 		final String relative_path = "lib/"+OSNAME+"/"+ARCHNAME+"/"+name+EXT;
 
@@ -60,21 +65,25 @@ else if (rawARCHNAME.contains("64"))
 				in = new FileInputStream(relative_path);
 			} catch (FileNotFoundException e) {}
 
-		if (in == null) throw new RuntimeException("The library has not been compiled for your OS/Architecture yet ("+OSNAME+"/"+ARCHNAME+").");
-
-
-		byte[] buffer = new byte[in.available()];
+		if (in == null) throw new TSDRLibraryNotCompatible("The library has not been compiled for your OS/Architecture yet ("+OSNAME+"/"+ARCHNAME+").");
 
-		int read = -1;
-		final File temp = new File(System.getProperty("java.io.tmpdir"), name+EXT);
-		temp.deleteOnExit();
-		final FileOutputStream fos = new FileOutputStream(temp);
-
-		while((read = in.read(buffer)) != -1) {
-			fos.write(buffer, 0, read);
+		File temp;
+		try {
+			byte[] buffer = new byte[in.available()];
+
+			int read = -1;
+			temp = new File(System.getProperty("java.io.tmpdir"), name+EXT);
+			temp.deleteOnExit();
+			final FileOutputStream fos = new FileOutputStream(temp);
+
+			while((read = in.read(buffer)) != -1) {
+				fos.write(buffer, 0, read);
+			}
+			fos.close();
+			in.close();
+		} catch (IOException e) {
+			throw new TSDRLibraryNotCompatible(e);
 		}
-		fos.close();
-		in.close();
 
 		return temp;
 	}
@@ -84,7 +93,7 @@ else if (rawARCHNAME.contains("64"))
 	 * @param name
 	 * @throws IOException 
 	 */
-	static final void loadLibrary(final String name) throws IOException {
+	static final void loadLibrary(final String name) throws TSDRLibraryNotCompatible {
 		try {
 			// try traditional method
 			System.loadLibrary(name); 
@@ -102,15 +111,32 @@ static final void loadLibrary(final String name) throws IOException {
 		try {
 			loadLibrary("TSDRLibrary");
 			loadLibrary("TSDRLibraryNDK");
-			extractLibrary("TSDRPlugin_RawFile");
-		} catch (IOException e) {
+			
+		} catch (TSDRLibraryNotCompatible e) {
 			m_e = e;
 		} 
 	}
 
-	public TSDRLibrary() throws Exception {
+	public TSDRLibrary() throws TSDRLibraryNotCompatible {
 		if (m_e != null) throw m_e;
 	}
 
-	public native void test();
+	private native void nativeLoadPlugin(String filepath) throws TSDRException;
+	public native void pluginParams(String params) throws TSDRException;
+	public native void setSampleRate(long rate) throws TSDRException;
+	public native void setBaseFreq(long freq) throws TSDRException;
+	public native void start() throws TSDRException;
+	public native void stop() throws TSDRException;
+	public native void setGain(float gain) throws TSDRException;
+	public native void readAsync() throws TSDRException;
+	public native void unloadPlugin() throws TSDRException;
+	
+	public void loadSource(final TSDRSource plugin) throws TSDRException {
+		nativeLoadPlugin(extractLibrary(plugin.libname).getAbsolutePath());
+	}
+	
+	public static TSDRSource[] getAllSources() {
+		return PLUGINS;
+	}
+	
 }

JavaGUI/src/martin/tempest/core/TSDRLibrary.java

@@ -0,0 +1,9 @@
+package martin.tempest.core;
+
+public class TSDRSource {
+	final String libname;
+	
+	public TSDRSource(final String libname) {
+		this.libname = libname;
+	}
+}