Revert "run model in Java thread for debugging"

This reverts commit 08c4256.

Author: kherud

src/main/cpp/jllama.cpp

@@ -454,9 +454,22 @@ JNIEXPORT void JNICALL Java_de_kherud_llama_LlamaModel_loadModel(JNIEnv *env, jo
                                                             std::placeholders::_1, std::placeholders::_2,
                                                             std::placeholders::_3));
 
-    env->SetLongField(obj, f_model_pointer, reinterpret_cast<jlong>(ctx_server));
+    std::thread t([ctx_server]() {
+        JNIEnv *env;
+        jint res = g_vm->GetEnv((void **)&env, JNI_VERSION_1_6);
+        if (res == JNI_EDETACHED)
+        {
+            res = g_vm->AttachCurrentThread((void **)&env, nullptr);
+            if (res != JNI_OK)
+            {
+                throw std::runtime_error("Failed to attach thread to JVM");
+            }
+        }
+        ctx_server->queue_tasks.start_loop();
+    });
+    t.detach();
 
-    ctx_server->queue_tasks.start_loop();
+    env->SetLongField(obj, f_model_pointer, reinterpret_cast<jlong>(ctx_server));
 }
 
 JNIEXPORT jint JNICALL Java_de_kherud_llama_LlamaModel_requestCompletion(JNIEnv *env, jobject obj, jstring jparams)

src/main/java/de/kherud/llama/LlamaModel.java

@@ -28,7 +28,6 @@ public class LlamaModel implements AutoCloseable {
 
 	@Native
 	private long ctx;
-	private final Thread modelThread;
 
 	/**
 	 * Load with the given {@link ModelParameters}. Make sure to either set
@@ -42,14 +41,7 @@ public class LlamaModel implements AutoCloseable {
 	 * @throws LlamaException if no model could be loaded from the given file path
 	 */
 	public LlamaModel(ModelParameters parameters) {
-		this.modelThread = new Thread(() -> loadModel(parameters.toString()));
-		this.modelThread.start();
-		try {
-			Thread.sleep(30000);
-		}
-		catch (InterruptedException e) {
-			throw new RuntimeException(e);
-		}
+		loadModel(parameters.toString());
 	}
 
 	/**