Merge d15a6d9 into 3ed3c17

.classpath

@@ -20,7 +20,7 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/com.oracle.truffle.api.profiles"/>
 	<classpathentry kind="src" path="/com.oracle.truffle.tools"/>
 	<classpathentry kind="src" path="/com.oracle.truffle.tools.debug.shell"/>
-	<classpathentry kind="lib" path="libs/somns-deps-dev.jar"/>
-	<classpathentry kind="lib" path="libs/somns-deps.jar"/>
+	<classpathentry kind="lib" path="libs/somns-deps-dev.jar" sourcepath="libs/somns-deps-source.jar"/>
+	<classpathentry kind="lib" path="libs/somns-deps.jar" sourcepath="libs/somns-deps-source.jar"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>

build.xml

@@ -6,7 +6,7 @@
     <property name="kompos.dir"  value="tools/kompos" />
     <property name="truffle.dir" value="${lib.dir}/truffle" />
     <property name="truffle.build" value="${truffle.dir}/mxbuild/dists" />
-    <property name="somns-deps.version" value="0.3.2" />
+    <property name="somns-deps.version" value="0.3.3" />
     <property name="checkstyle.version" value="7.6.1" />
 
     <property name="build.dir"   value="build"/>
@@ -57,7 +57,7 @@
         </exec>
     </target>
 
-    <target name="ideinit">
+    <target name="ideinit" depends="source">
         <exec executable="../mx/mx" dir="${truffle.dir}" failonerror="true">
             <arg value="eclipseinit"/>
         </exec>
@@ -72,6 +72,12 @@
             dest="${lib.dir}/somns-deps-dev.jar" />
     </target>
 
+    <target name="source" description="Download Source Jars for development">
+        <get src="https://dl.bintray.com/smarr/SOM/somns-deps-source-${somns-deps.version}.jar"
+            usetimestamp="true"
+            dest="${lib.dir}/somns-deps-source.jar" />
+    </target>
+
     <target name="checkstyle-jar">
         <get src="http://tenet.dl.sourceforge.net/project/checkstyle/checkstyle/${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar"
             usetimestamp="true"

src/tools/debugger/FrontendConnector.java

@@ -1,6 +1,7 @@
 package tools.debugger;
 
 import java.io.IOException;
+import java.net.BindException;
 import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
@@ -9,7 +10,7 @@
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
+import java.util.function.Function;
 
 import org.java_websocket.WebSocket;
 
@@ -27,6 +28,8 @@
 import tools.Tagging;
 import tools.TraceData;
 import tools.concurrency.ActorExecutionTrace;
+import tools.debugger.WebSocketHandler.MessageHandler;
+import tools.debugger.WebSocketHandler.TraceHandler;
 import tools.debugger.entities.ActivityType;
 import tools.debugger.entities.BreakpointType;
 import tools.debugger.entities.EntityType;
@@ -64,8 +67,8 @@ public class FrontendConnector {
   /**
    * Receives requests from the client.
    */
-  private final WebSocketHandler receiver;
-  private final BinaryWebSocketHandler binaryHandler;
+  private final MessageHandler receiver;
+  private final TraceHandler binaryHandler;
 
   /**
    * Sends requests to the client.
@@ -80,9 +83,10 @@ public class FrontendConnector {
   private CompletableFuture<WebSocket> clientConnected;
 
   private final Gson gson;
-  private static final int MESSAGE_PORT = 7977;
-  private static final int BINARY_PORT = 7978;
-  private static final int DEBUGGER_PORT = 8888;
+  private static final int MESSAGE_PORT   = 7977;
+  private static final int BINARY_PORT    = 7978;
+  private static final int DEBUGGER_PORT  = 8888;
+  private static final int EPHEMERAL_PORT = 0;
 
   private final ArrayList<Source> notReady = new ArrayList<>(); // TODO rename: toBeSend
 
@@ -98,15 +102,16 @@ public FrontendConnector(final Breakpoints breakpoints,
 
     try {
       log("[DEBUGGER] Initialize HTTP and WebSocket Server for Debugger");
-      receiver = initializeWebSocket(MESSAGE_PORT, clientConnected);
-      log("[DEBUGGER] Started WebSocket Server");
-
-      binaryHandler = new BinaryWebSocketHandler(new InetSocketAddress(BINARY_PORT));
-      binaryHandler.start();
-
-      contentServer = initializeHttpServer(DEBUGGER_PORT);
+      receiver = initializeWebSocket(MESSAGE_PORT, port -> new MessageHandler(port, this, gson));
+      binaryHandler = initializeWebSocket(BINARY_PORT, port -> new TraceHandler(port));
+      log("[DEBUGGER] Started WebSocket Servers");
+      log("[DEBUGGER]   Message Handler: " + receiver.getPort());
+      log("[DEBUGGER]   Trace Handler:   " + binaryHandler.getPort());
+
+      contentServer = initializeHttpServer(DEBUGGER_PORT,
+          receiver.getPort(), binaryHandler.getPort());
       log("[DEBUGGER] Started HTTP Server");
-      log("[DEBUGGER]   URL: http://localhost:" + DEBUGGER_PORT + "/index.html");
+      log("[DEBUGGER]   URL: http://localhost:" + contentServer.getAddress().getPort() + "/index.html");
     } catch (IOException e) {
       log("Failed starting WebSocket and/or HTTP Server");
       throw new RuntimeException(e);
@@ -119,23 +124,49 @@ public Breakpoints getBreakpoints() {
     return breakpoints;
   }
 
-  private WebSocketHandler initializeWebSocket(final int port,
-      final Future<WebSocket> clientConnected) {
-    InetSocketAddress address = new InetSocketAddress(port);
-    WebSocketHandler server = new WebSocketHandler(address, this, gson);
+  private <T extends WebSocketHandler> T tryInitializingWebSocket(final T server) throws Throwable {
     server.start();
+    try {
+      server.awaitStartup();
+    } catch (ExecutionException e) {
+      throw e.getCause();
+    }
     return server;
   }
 
-  private HttpServer initializeHttpServer(final int port) throws IOException {
+  private <T extends WebSocketHandler> T initializeWebSocket(final int port, final Function<Integer, T> ctor) {
+    try {
+      return tryInitializingWebSocket(ctor.apply(port));
+    } catch (BindException e) {
+      try {
+        return tryInitializingWebSocket(ctor.apply(EPHEMERAL_PORT));
+      } catch (Throwable e1) {
+        throw new RuntimeException(e);
+      }
+    } catch (Throwable e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  private HttpServer tryInitializingHttpServer(final int port,
+      final int debuggerPort, final int tracePort) throws IOException {
     InetSocketAddress address = new InetSocketAddress(port);
     HttpServer httpServer = HttpServer.create(address, 0);
-    httpServer.createContext("/", new WebResourceHandler());
+    httpServer.createContext("/", new WebResourceHandler(debuggerPort, tracePort));
     httpServer.setExecutor(null);
     httpServer.start();
     return httpServer;
   }
 
+  private HttpServer initializeHttpServer(final int port,
+      final int debuggerPort, final int tracePort) throws IOException {
+    try {
+      return tryInitializingHttpServer(port, debuggerPort, tracePort);
+    } catch (BindException e) {
+      return tryInitializingHttpServer(EPHEMERAL_PORT, debuggerPort, tracePort);
+    }
+  }
+
   private void ensureConnectionIsAvailable() {
     assert receiver != null;
     assert sender != null;
@@ -278,24 +309,25 @@ static void log(final String str) {
   }
 
   public void completeConnection(final WebSocket conn) {
+    Runtime.getRuntime().addShutdownHook(new Thread(() -> closeAllSockets()));
+
     clientConnected.complete(conn);
     send(InitializationResponse.create(EntityType.values(),
         ActivityType.values(), BreakpointType.values(), SteppingType.values()));
   }
 
-  public void shutdown() {
-    int delaySec = 5;
-    contentServer.stop(delaySec);
+  private void closeAllSockets() {
+    final int delay = 0;
+    contentServer.stop(delay);
 
     sender.close();
     if (binarySender != null) {
       binarySender.close();
     }
     try {
-      int delayMsec = 1000;
-      receiver.stop(delayMsec);
+      receiver.stop(delay);
       if (binarySender != null) {
-        binaryHandler.stop(delayMsec);
+        binaryHandler.stop(delay);
       }
     } catch (InterruptedException e) { }
   }

src/tools/debugger/WebDebugger.java

@@ -155,7 +155,7 @@ public static void log(final String str) {
 
   @Override
   protected void onDispose(final Env env) {
-    connector.shutdown();
+    /* NOOP: we close sockets with a VM shutdown hook */
   }
 
   @Override

src/tools/debugger/WebResourceHandler.java

@@ -5,13 +5,21 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.nio.charset.Charset;
 
 import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpHandler;
 
 import som.vm.NotYetImplementedException;
 
 class WebResourceHandler implements HttpHandler {
+  private final int debuggerPort;
+  private final int tracePort;
+
+  WebResourceHandler(final int debuggerPort, final int tracePort) {
+    this.debuggerPort = debuggerPort;
+    this.tracePort    = tracePort;
+  }
 
   @Override
   public void handle(final HttpExchange exchange) throws IOException {
@@ -36,10 +44,17 @@ public void handle(final HttpExchange exchange) throws IOException {
       }
       exchange.sendResponseHeaders(200, f.length());
       copy(f, exchange.getResponseBody());
+      exchange.close();
       return;
     }
 
     switch (requestedFile) {
+      case "/ports.json":
+        String jsonPorts = "{\"dbgPort\":" + debuggerPort + ",\"tracePort\":" + tracePort + "\"}";
+        exchange.sendResponseHeaders(200, jsonPorts.length());
+        exchange.getResponseBody().write(jsonPorts.getBytes(Charset.forName("UTF-8")));
+        exchange.close();
+        return;
       case "/favicon.ico":
         exchange.sendResponseHeaders(404, 0);
         exchange.close();