Do not run visualizations on InterruptException

There is no point in running visualization for the expression value that is InterruptedException. The latter is likely to bubble up the exception or create one that will be confusing to the user. Closes #11243 and partially addresses some of the symptomes of #11084.
enso-org · Oct 3, 2024 · 2b10a3e · 2b10a3e
1 parent ad53c82
commit 2b10a3e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/...trument-common/src/main/java/org/enso/interpreter/instrument/job/VisualizationResult.java b/...trument-common/src/main/java/org/enso/interpreter/instrument/job/VisualizationResult.java
@@ -43,6 +43,14 @@ public static String findExceptionMessage(Throwable ex) {
     }
   }
 
+  public static boolean isInterruptedExceptionValue(Object object) {
+    if (object instanceof Throwable ex) {
+      return isInterruptedException(ex);
+    } else {
+      return false;
+    }
+  }
+
   public static boolean isInterruptedException(Throwable ex) {
     var iop = InteropLibrary.getUncached();
     return isInterruptedException(ex, iop);

diff --git a/...-common/src/main/scala/org/enso/interpreter/instrument/execution/JobExecutionEngine.scala b/...-common/src/main/scala/org/enso/interpreter/instrument/execution/JobExecutionEngine.scala
@@ -190,7 +190,7 @@ final class JobExecutionEngine(
     logger.log(
       Level.FINE,
       "Aborting {0} jobs because {1}: {2}",
-      Array(cancellableJobs.length, reason, cancellableJobs.map(_.id))
+      Array[Any](cancellableJobs.length, reason, cancellableJobs.map(_.id))
     )
     cancellableJobs.foreach { runningJob =>
       runningJob.future.cancel(runningJob.job.mayInterruptIfRunning)
@@ -215,7 +215,7 @@ final class JobExecutionEngine(
         logger.log(
           Level.FINE,
           "Aborting job {0} because {1}",
-          Array(runningJob.id, reason)
+          Array[AnyRef](runningJob.id, reason)
         )
         runningJob.future.cancel(runningJob.job.mayInterruptIfRunning)
       }
@@ -237,7 +237,7 @@ final class JobExecutionEngine(
         logger.log(
           Level.FINE,
           "Aborting job {0} because {1}",
-          Array(runningJob.id, reason)
+          Array[Any](runningJob.id, reason)
         )
         runningJob.future.cancel(runningJob.job.mayInterruptIfRunning)
       }
@@ -260,7 +260,7 @@ final class JobExecutionEngine(
     logger.log(
       Level.FINE,
       "Aborting {0} background jobs because {1}: {2}",
-      Array(cancellableJobs.length, reason, cancellableJobs.map(_.id))
+      Array[Any](cancellableJobs.length, reason, cancellableJobs.map(_.id))
     )
     cancellableJobs.foreach { runningJob =>
       runningJob.future.cancel(runningJob.job.mayInterruptIfRunning)

diff --git a/...nt-common/src/main/scala/org/enso/interpreter/instrument/execution/ReentrantLocking.scala b/...nt-common/src/main/scala/org/enso/interpreter/instrument/execution/ReentrantLocking.scala
@@ -213,7 +213,7 @@ class ReentrantLocking(logger: TruffleLogger) extends Locking {
         contextLock.lock,
         "context lock",
         where
-      ) //acquireContextLock(contextId)
+      )
       callable.call()
     } catch {
       case _: InterruptedException =>

diff --git a/...t-common/src/main/scala/org/enso/interpreter/instrument/job/ProgramExecutionSupport.scala b/...t-common/src/main/scala/org/enso/interpreter/instrument/job/ProgramExecutionSupport.scala
@@ -545,7 +545,7 @@ object ProgramExecutionSupport {
         } else {
           runtimeCache.getAnyValue(visualization.expressionId)
         }
-        if (v != null) {
+        if (v != null && !VisualizationResult.isInterruptedExceptionValue(v)) {
           executeAndSendVisualizationUpdate(
             contextId,
             runtimeCache,