🐞 fix: #389 Fix race condition in V8Guard

caoccao · Sep 6, 2024 · 4885852 · 4885852
1 parent 9b54446
commit 4885852
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/src/main/java/com/caoccao/javet/interop/V8Guard.java b/src/main/java/com/caoccao/javet/interop/V8Guard.java
@@ -83,9 +83,11 @@ public final class V8Guard implements IJavetClosable {
      */
     public void cancel() {
         if (!isClosed()) {
-            PriorityBlockingQueue<V8Guard> v8GuardQueue = v8Runtime.getV8Host().getV8GuardDaemon().getV8GuardQueue();
-            boolean ignored = v8GuardQueue.remove(this);
             closed = true;
+            synchronized (v8Runtime.getCloseLock()) {
+                PriorityBlockingQueue<V8Guard> v8GuardQueue = v8Runtime.getV8Host().getV8GuardDaemon().getV8GuardQueue();
+                boolean ignored = v8GuardQueue.remove(this);
+            }
         }
     }
 

diff --git a/src/main/java/com/caoccao/javet/interop/V8Host.java b/src/main/java/com/caoccao/javet/interop/V8Host.java
@@ -573,7 +573,7 @@ public void run() {
                         if (!(!v8Guard.isDebugModeEnabled() && IS_IN_DEBUG_MODE)) {
                             V8Runtime v8Runtime = v8Guard.getV8Runtime();
                             synchronized (v8Runtime.getCloseLock()) {
-                                if (!v8Runtime.isClosed() && v8Runtime.isInUse()) {
+                                if (!v8Guard.isClosed() && !v8Runtime.isClosed() && v8Runtime.isInUse()) {
                                     v8Runtime.terminateExecution();
                                     v8Runtime.getLogger().logWarn(
                                             "Execution was terminated after {0}ms.",
@@ -582,9 +582,16 @@ public void run() {
                             }
                         }
                     } else {
-                        v8GuardQueue.add(v8Guard);
-                        long sleepMillis = Math.min(v8Guard.getEndTimeMillis() - now, sleepIntervalMillis);
-                        TimeUnit.MILLISECONDS.sleep(sleepMillis);
+                        V8Runtime v8Runtime = v8Guard.getV8Runtime();
+                        synchronized (v8Runtime.getCloseLock()) {
+                            if (!v8Guard.isClosed() && !v8Runtime.isClosed()) {
+                                v8GuardQueue.add(v8Guard);
+                                long sleepMillis = Math.min(v8Guard.getEndTimeMillis() - now, sleepIntervalMillis);
+                                if (sleepMillis > 0) {
+                                    TimeUnit.MILLISECONDS.sleep(sleepMillis);
+                                }
+                            }
+                        }
                     }
                 } catch (InterruptedException ignored) {
                     break;