support thread.interrupt

runtime/native/exception.cpp

@@ -65,6 +65,7 @@ void Polyglot_jlang_runtime_Exceptions_throwNewThrowable__Ljava_lang_Class_2Ljav
     jclass clazz, jstring str);
 void Polyglot_jlang_runtime_Exceptions_throwThrowable__Ljava_lang_Throwable_2(
     jthrowable obj);
+void Polyglot_jlang_runtime_Exceptions_throwInterruptedException__();
 // A distinct integer identifying our own exceptions.
 const uint64_t javaExceptionClass = 8101813523428701805ll;
 
@@ -520,3 +521,7 @@ void throwThrowable(JNIEnv *env, jthrowable obj) {
     Polyglot_jlang_runtime_Exceptions_throwThrowable__Ljava_lang_Throwable_2(
         obj);
 }
+
+void throwInterruptedException(JNIEnv *env) {
+    Polyglot_jlang_runtime_Exceptions_throwInterruptedException__();
+}

runtime/native/exception.h

@@ -9,6 +9,7 @@
 void throwClassNotFoundException(JNIEnv *env, const char *name);
 void throwNewThrowable(JNIEnv *env, jclass clazz, const char *msg);
 void throwThrowable(JNIEnv *env, jthrowable obj);
+void throwInterruptedException(JNIEnv *env);
 
 extern "C" {
 

runtime/native/jvm.cpp

@@ -111,11 +111,6 @@ jstring internJString(jstring str) {
     }
 }
 
-void throwInterruptedException(JNIEnv *env, const char* msg) {
-    jclass clazz = FindClass("java.lang.InterruptedException");
-    throwNewThrowable(env, clazz, msg);
-}
-
 extern "C" {
 // we copied this number from open JDK -> not sure the implications
 #define JVM_INTERFACE_VERSION 4
@@ -128,6 +123,11 @@ jint JVM_IHashCode(JNIEnv *env, jobject obj) {
 }
 
 void JVM_MonitorWait(JNIEnv *env, jobject obj, jlong ms) {
+    // check interrupted before waiting
+    if (Threads::Instance().threads[currentThread].interrupted) {
+        Threads::Instance().threads[currentThread].interrupted = false;
+        throwInterruptedException(env);
+    }
     Monitor::Instance().wait(obj, ms);
 }
 
@@ -384,12 +384,14 @@ jint JVM_CountStackFrames(JNIEnv *env, jobject thread) {
 }
 
 void JVM_Interrupt(JNIEnv *env, jobject thread) {
-    throwInterruptedException(env, "test");
+    Threads::Instance().threads[thread].interrupted = true;
 }
 
 jboolean JVM_IsInterrupted(JNIEnv *env, jobject thread,
                            jboolean clearInterrupted) {
-    JvmUnimplemented("JVM_IsInterrupted");
+    bool interrupted = Threads::Instance().threads[thread].interrupted;
+    Threads::Instance().threads[thread].interrupted &= !static_cast<bool>(clearInterrupted);
+    return static_cast<jboolean>(interrupted);
 }
 
 jboolean JVM_HoldsLock(JNIEnv *env, jclass threadClass, jobject obj) {

runtime/native/threads.h

@@ -10,6 +10,7 @@ extern thread_local jobject currentThread;
 struct NativeThread {
     pthread_t tid;
     bool threadStatus;
+    bool interrupted;
 };
 
 class Threads {

runtime/src/jlang/runtime/Exceptions.java

@@ -13,4 +13,5 @@ static void throwNewThrowable(Class<? extends Throwable> clazz, String msg) thro
     static void throwThrowable(Throwable t) throws Throwable {
 	throw t;
     }
+    static void throwInterruptedException() throws InterruptedException { throw new InterruptedException(); }
 }