[vmkit-commits] [PATCH] Impl JVM_Interrupt, JVM_IsInterrupted

[Nicolas Geoffray]

Looks good. Again, if you could try to share that code... :)

On Thu, Nov 3, 2011 at 3:38 PM, Will Dietz <wdietz2 at illinois.edu> wrote:

> Inlined below.
>
> Very similar to classpath code, only the field type is different, so
> should be using the "Long" instance accessors, not Object.
>
> ~Will
>
> >From effd45eb93189cbcd18480e691e4027fcaac4868 Mon Sep 17 00:00:00 2001
> From: Will Dietz <w at wdtz.org>
> Date: Thu, 3 Nov 2011 08:57:13 -0500
> Subject: [PATCH 16/17] Impl JVM_Interrupt, JVM_IsInterrupted
>
> ---
>  lib/J3/ClassLib/OpenJDK/OpenJDK.inc |   70
> +++++++++++++++++++++++++++++++++--
>  1 files changed, 66 insertions(+), 4 deletions(-)
>
> diff --git a/lib/J3/ClassLib/OpenJDK/OpenJDK.inc
> b/lib/J3/ClassLib/OpenJDK/OpenJDK.inc
> index 48ffce9..954234d 100644
> --- a/lib/J3/ClassLib/OpenJDK/OpenJDK.inc
> +++ b/lib/J3/ClassLib/OpenJDK/OpenJDK.inc
> @@ -700,13 +700,75 @@ JVM_CountStackFrames(JNIEnv *env, jobject thread) {
>  }
>
>  JNIEXPORT void JNICALL
> -JVM_Interrupt(JNIEnv *env, jobject thread) {
> -  NYI();
> +JVM_Interrupt(JNIEnv *env, jobject _thread) {
> +  JavaObject * thread = 0;
> +  llvm_gcroot(thread, 0);
> +  BEGIN_JNI_EXCEPTION
> +
> +  thread = *(JavaObject**)_thread;
> +  Jnjvm* vm = JavaThread::get()->getJVM();
> +  JavaField * field = vm->upcalls->eetop;
> +
> +  // It's possible that the thread to be interrupted has not finished
> +  // its initialization. Wait until the initialization is done.
> +  while (field->getInstanceLongField(thread) == 0)
> +    mvm::Thread::yield();
> +
> +  JavaThread* th = (JavaThread*)field->getInstanceLongField(thread);
> +  th->lockingThread.interruptFlag = 1;
> +  mvm::FatLock* lock = th->lockingThread.waitsOn;
> +
> +  // If the thread is blocked on a wait. We also verify nextWaiting in
> case
> +  // the thread has been notified.
> +  if (lock && th->lockingThread.nextWaiting) {
> +    th->lockingThread.state = mvm::LockingThread::StateInterrupted;
> +
> +    // Make sure the thread is waiting.
> +    uint32 locked = 0;
> +    while (true) {
> +      locked = (lock->tryAcquire() == 0);
> +      if (locked || (lock->getOwner() != th && lock->getOwner() != 0))
> +        break;
> +      else mvm::Thread::yield();
> +    }
> +
> +    // Interrupt the thread.
> +    th->lockingThread.varcond.signal();
> +
> +    // Release the lock if we acquired it.
> +    if (locked) lock->release(lock->getAssociatedObject(),
> vm->lockSystem);
> +  }
> +
> +  // Here we could also raise a signal for interrupting I/O
> +
> +  RETURN_VOID_FROM_JNI
> +  END_JNI_EXCEPTION
>  }
>
>  JNIEXPORT jboolean JNICALL
> -JVM_IsInterrupted(JNIEnv *env, jobject thread, jboolean clearInterrupted)
> {
> -  NYI();
> +JVM_IsInterrupted(JNIEnv *env, jobject _thread, jboolean
> clearInterrupted) {
> +  JavaObject * thread = 0;
> +  llvm_gcroot(thread, 0);
> +
> +  bool interrupt = false;
> +
> +  BEGIN_JNI_EXCEPTION
> +
> +  thread = *(JavaObject**)_thread;
> +  Jnjvm* vm = JavaThread::get()->getJVM();
> +  JavaField * field = vm->upcalls->eetop;
> +
> +  JavaThread* jth = (JavaThread*)field->getInstanceLongField(thread);
> +  interrupt = (jboolean)jth->lockingThread.interruptFlag;
> +
> +  if (clearInterrupted)
> +    jth->lockingThread.interruptFlag = 0;
> +
> +  RETURN_FROM_JNI(interrupt);
> +
> +  END_JNI_EXCEPTION
> +
> +  return false;
>  }
>
>  JNIEXPORT jboolean JNICALL
> --
> 1.7.5.1
> _______________________________________________
> vmkit-commits mailing list
> vmkit-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/vmkit-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/vmkit-commits/attachments/20111104/c455d099/attachment.html>