Warn on wrong use of waiting in UI thread

KeYProject · Jul 17, 2023 · ada3542 · ada3542
1 parent c07a00f
commit ada3542
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/key.ui/src/main/java/de/uka/ilkd/key/core/Watchdog.java b/key.ui/src/main/java/de/uka/ilkd/key/core/Watchdog.java
@@ -38,7 +38,7 @@ public static void start() {
     private static void run() {
         while (true) {
             try {
-                Thread.sleep(10000);
+                Thread.sleep(20000);
             } catch (InterruptedException e) {
                 return;
             }
@@ -66,8 +66,7 @@ private static void run() {
              * Common-Cleaner TIMED_WAITING
              */
 
-            for (int i = 0; i < threads.length; i++) {
-                var thread = threads[i];
+            for (Thread thread : threads) {
                 if (thread == null || IGNORED_THREADS.contains(thread.getName())) {
                     continue;
                 }
@@ -81,6 +80,7 @@ private static void run() {
                             && EventQueue.getCurrentEvent() == null) {
                         anyProgress = true; // nothing to do
                     }
+                    break;
                 case BLOCKED:
                 case TIMED_WAITING:
                 case TERMINATED:
@@ -93,8 +93,7 @@ private static void run() {
                 // unfortunately, we cannot display a dialog since the UI thread is blocked...
                 LOGGER.error("Watchdog detected deadlock!");
                 LOGGER.info("Current thread state:");
-                for (int i = 0; i < threads.length; i++) {
-                    var thread = threads[i];
+                for (Thread thread : threads) {
                     if (thread == null || IGNORED_THREADS.contains(thread.getName())) {
                         continue;
                     }

diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/AutoModeAction.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/AutoModeAction.java
@@ -166,7 +166,7 @@ public void actionPerformed(ActionEvent e) {
             // This method delegates the request only to the UserInterfaceControl which implements
             // the functionality.
             // No functionality is allowed in this method body!
-            getMediator().getUI().getProofControl().stopAndWaitAutoMode();
+            getMediator().getUI().getProofControl().stopAutoMode();
         }
     }
 

diff --git a/key.ui/src/main/java/de/uka/ilkd/key/ui/MediatorProofControl.java b/key.ui/src/main/java/de/uka/ilkd/key/ui/MediatorProofControl.java
@@ -23,6 +23,9 @@
 
 import org.key_project.util.collection.ImmutableList;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * A {@link ProofControl} which performs the automode in a {@link SwingWorker}.
  *
@@ -32,6 +35,8 @@
 // KeYMediator.
 // Refactor the implementation and use events to update the user interface.
 public class MediatorProofControl extends AbstractProofControl {
+    private static final Logger LOGGER = LoggerFactory.getLogger(MediatorProofControl.class);
+
     private final AbstractMediatorUserInterfaceControl ui;
     private AutoModeWorker worker;
 
@@ -96,6 +101,8 @@ public void stopAutoMode() {
     @Override
     public void waitWhileAutoMode() {
         if (SwingUtilities.isEventDispatchThread()) {
+            LOGGER.warn("", new IllegalStateException(
+                "tried to block the UI thread whilst waiting for auto mode to finish"));
             return; // do not block the UI thread
         }
         while (ui.getMediator().isInAutoMode()) { // Wait until auto mode has stopped.