Fixed the nasty ExtIO crashing which had nothing to do with ExtIO

Author: martinmarinov

JavaGUI/jni/TSDRLibraryNDK.c

@@ -99,10 +99,10 @@ void read_async(float *buf, int width, int height, void *ctx) {
 		(*jvm)->AttachCurrentThread(jvm, (void **) &env, 0);
 
 	if (context->pic_width != width || context->pic_height != height) {
-		(*env)->DeleteLocalRef(env, context->obj_pixels);
 
-		(*env)->CallVoidMethod(env, context->obj, context->fixSize, width, height);
+		if (context->obj_pixels != NULL) (*env)->DeleteLocalRef(env, context->obj_pixels);
 
+		(*env)->CallVoidMethod(env, context->obj, context->fixSize, width, height);
 		context->obj_pixels = (*env)->GetObjectField(env, context->obj, context->fid_pixels);
 
 		context->pixelsize = width * height;
@@ -147,13 +147,21 @@ JNIEXPORT void JNICALL Java_martin_tempest_core_TSDRLibrary_nativeStart (JNIEnv
 	context->fid_pixels = (*env)->GetFieldID(env, context->cls, "pixels", "[I");
 	context->fixSize = (*env)->GetMethodID(env, context->cls, "fixSize", "(II)V");
 	context->notifyCallbacks = (*env)->GetMethodID(env, context->cls, "notifyCallbacks", "()V");
+	context->obj_pixels = NULL;
 
 	context->pic_width = 0;
 	context->pic_height = 0;
 	context->pixelsize = 1;
 	context->pixels = (jint *) malloc(sizeof(jint) * context->pixelsize);
 
-	THROW(tsdr_readasync(&tsdr_instance, read_async, (void *) context));
+	(*jvm)->DetachCurrentThread(jvm);
+
+	int status = tsdr_readasync(&tsdr_instance, read_async, (void *) context);
+
+	if ((*jvm)->GetEnv(jvm, (void **)&env, javaversion) == JNI_EDETACHED)
+		(*jvm)->AttachCurrentThread(jvm, (void **) &env, 0);
+
+	THROW(status);
 
 	(*env)->DeleteGlobalRef(env, context->obj);
 	(*env)->DeleteGlobalRef(env, context->cls);

TSDRPlugin_ExtIO/src/ExtIOPluginLoader.c

@@ -2,6 +2,7 @@
 #include "TSDRCodes.h"
 
 #include <stdlib.h>
+#include <stdio.h>
 
 // A platform independent dynamic library loader
 

TSDRPlugin_ExtIO/src/TSDRPlugin_ExtIO.c

@@ -122,7 +122,10 @@ void callback(int cnt, int status, float IQoffs, void *IQdata) {
 	tsdr_cb(outbuf, cntvalues, tsdr_ctx, 0);
 }
 
+char test[200];
 int tsdrplugin_init(const char * params) {
+	strcpy(test, params);
+
 	if (outbuf == NULL) {
 		outbuf = malloc(sizeof(float));
 		outbuf_size = 1;
@@ -147,7 +150,9 @@ int tsdrplugin_init(const char * params) {
 			}
 
 			if (source->OpenHW()) {
-				printf("Opened %s model %s!\n", name, model); fflush(stdout);
+				//printf("Opened %s model %s!\n", name, model); fflush(stdout);
+
+				//if (source->ShowGUI != NULL) source->ShowGUI();
 
 				// list attenuators
 				if (source->GetAttenuators != NULL) {

TempestSDR/src/TSDRLibrary.c

@@ -354,8 +354,6 @@ void unloadplugin(tsdr_lib_t * tsdr) {
 		tsdrplug_close((pluginsource_t *)(tsdr->plugin));
 		free(tsdr->plugin);
 		tsdr->plugin = NULL;
-		printf("Unloaded plugin\n"); fflush(stdout);
-
 	}
 }
 
@@ -374,7 +372,7 @@ int tsdr_loadplugin(tsdr_lib_t * tsdr, const char * pluginfilepath, const char *
 
 	tsdr->plugin = malloc(sizeof(pluginsource_t));
 	int status = tsdrplug_load((pluginsource_t *)(tsdr->plugin), pluginfilepath);
-	printf("Loaded plugin\n"); fflush(stdout);
+
 	if (status != TSDR_OK) {
 		unloadplugin(tsdr);
 		RETURN_EXCEPTION(tsdr, "The plugin cannot be loaded. It is incompatible or there are depending libraries missing. Please check the readme file that comes with the plugin.", status);