Replace sleeping while loop with watchservice

goblint · Feb 28, 2022 · db670e6 · db670e6
1 parent ae9b5a0
commit db670e6
Showing 1 changed file with 16 additions and 5 deletions.
diff --git a/src/main/java/goblintserver/GoblintServer.java b/src/main/java/goblintserver/GoblintServer.java
@@ -4,6 +4,7 @@
 import java.util.concurrent.TimeoutException;
 import java.util.stream.Stream;
 import java.io.*;
+import java.nio.file.*;
 
 import com.google.gson.*;
 
@@ -64,13 +65,23 @@ public boolean startGoblintServer() {
                 return false;
             }
 
-            while(!goblintSocket.exists()) {
-                Thread.sleep(1000); 
+            // wait until Goblint socket is created before continuing
+            WatchService watchService = FileSystems.getDefault().newWatchService();
+            Path path = Paths.get(System.getProperty("user.dir"));
+            path.register(watchService, StandardWatchEventKinds.ENTRY_CREATE );
+            WatchKey key;
+            while ((key = watchService.take()) != null) {
+                for (WatchEvent<?> event : key.pollEvents()) {
+                    if (event.context().toString().equals(goblintSocket.toString())) {
+                        log.info("Goblint server started.");
+                        return true;
+                    }
+                }
+                key.reset();
             }
 
-            log.info("Goblint server started.");
-
-            return true;
+            return false;
+
         } catch (IOException | InvalidExitValueException | InterruptedException | TimeoutException e) {
             this.magpieServer.forwardMessageToClient(new MessageParams(MessageType.Error, "Running Goblint failed. " + e.getMessage()));
             return false;