Add JDK19 to test matrix

.github/workflows/continuous.yml

@@ -24,16 +24,6 @@ jobs:
         java-version: 8
     - name: Store JAVA_8_HOME
       run: JAVA_PATH=$(which java) && echo "JAVA_8_HOME=${JAVA_PATH/\/bin\/java/\/}" >> $GITHUB_ENV
-    - name: Set up Java 9
-      uses: actions/setup-java@v1
-      with:
-        java-version: 9
-    - name: Store JAVA_9_HOME
-      run: JAVA_PATH=$(which java) && echo "JAVA_9_HOME=${JAVA_PATH/\/bin\/java/\/}" >> $GITHUB_ENV
-    - name: Set up Java 16
-      uses: actions/setup-java@v1
-      with:
-        java-version: 16
     - name: Store JAVA_16_HOME
       run: JAVA_PATH=$(which java) && echo "JAVA_16_HOME=${JAVA_PATH/\/bin\/java/\/}" >> $GITHUB_ENV
     - name: Set up Java 17
@@ -48,6 +38,12 @@ jobs:
         java-version: 18
     - name: Store JAVA_18_HOME
       run: JAVA_PATH=$(which java) && echo "JAVA_18_HOME=${JAVA_PATH/\/bin\/java/\/}" >> $GITHUB_ENV
+    - name: Set up Java 19
+      uses: actions/setup-java@v1
+      with:
+        java-version: 19
+    - name: Store JAVA_19_HOME
+      run: JAVA_PATH=$(which java) && echo "JAVA_19_HOME=${JAVA_PATH/\/bin\/java/\/}" >> $GITHUB_ENV
     - name: Set up Java 11
       uses: actions/setup-java@v1
       with:

btrace-agent/src/main/java/org/openjdk/btrace/agent/RemoteClient.java

@@ -114,7 +114,9 @@ static Client getClient(ClientContext ctx, Socket sock, Function<Client, Future<
         case Command.RECONNECT:
           {
             String probeId = ((ReconnectCommand) cmd).getProbeId();
+            log.debug("Attempting to reconnect client for probe {}", probeId);
             Client client = Client.findClient(probeId);
+            log.debug("Found client {}", client);
             if (client instanceof RemoteClient) {
               ((RemoteClient) client).reconnect(ois, oos, sock);
               client.sendCommand(new StatusCommand(ReconnectCommand.STATUS_FLAG));
@@ -237,7 +239,9 @@ public void onCommand(Command cmd) throws IOException {
     try {
       boolean isConnected = true;
       try {
-        output.reset();
+        synchronized (output) {
+          output.reset();
+        }
       } catch (SocketException e) {
         isConnected = false;
       }
@@ -285,9 +289,11 @@ private boolean dispatchCommand(Command cmd, boolean isConnected) {
           {
             ((DisconnectCommand) cmd).setProbeId(id.toString());
             if (output != null) {
-              WireIO.write(output, cmd);
-              output.flush();
-              output.close();
+              synchronized (output) {
+                WireIO.write(output, cmd);
+                output.flush();
+                output.close();
+              }
               oosUpdater.compareAndSet(this, output, null);
             }
             if (input != null) {
@@ -327,7 +333,9 @@ protected void closeAll() throws IOException {
 
     ObjectOutputStream output = oos;
     if (output != null) {
-      output.close();
+      synchronized (output) {
+        output.close();
+      }
       oosUpdater.compareAndSet(this, output, null);
     }
     ObjectInputStream input = ois;

btrace-client/src/main/java/org/openjdk/btrace/client/Client.java

@@ -438,11 +438,11 @@ void reconnect(String host, String resumeProbe, CommandListener listener, String
         System.exit(1);
       }
       oos = new ObjectOutputStream(sock.getOutputStream());
-      log.debug("reconnecting client");
-      WireIO.write(oos, new ReconnectCommand(resumeProbe));
-
       ois = new ObjectInputStream(sock.getInputStream());
 
+      log.debug("reconnecting client {}", resumeProbe);
+      WireIO.write(oos, new ReconnectCommand(resumeProbe));
+
       log.debug("entering into command loop");
       commandLoop(
           new CommandListener() {

btrace-instr/src/main/java/org/openjdk/btrace/instr/HandlerRepositoryImpl.java

@@ -63,7 +63,8 @@ protected String getMethodName(String name) {
 
     if (debugSupport.isDumpClasses()) {
       try {
-        String handlerPath = debugSupport.getDumpClassDir() + "/" + handlerClassName.replace('/', '_') + ".class";
+        String handlerPath =
+            debugSupport.getDumpClassDir() + "/" + handlerClassName.replace('/', '_') + ".class";
         log.debug("BTrace INDY handler dumped: {}", handlerPath);
         Files.write(Paths.get(handlerPath), data, StandardOpenOption.CREATE);
       } catch (IOException e) {

btrace-instr/src/test/java/org/openjdk/btrace/BTraceFunctionalTests.java

@@ -441,7 +441,7 @@ public boolean onStderr(int lineno, String line) {
           @Override
           public boolean onStdout(int lineno, String line) {
             System.out.println("[btrace #" + lineno + "] " + line);
-            if (lineno > 1000) {
+            if (lineno > 100) {
               return false;
             }
             if (line.contains(probeId[0])) {

btrace-instr/src/test/java/org/openjdk/btrace/RuntimeTest.java

@@ -263,10 +263,23 @@ public void test(
       Process client = attach(pid, testScript, cmdArgs, checkLines, stdout, stderr);
 
       System.out.println("Detached.");
-      pw.println("done");
-      pw.flush();
 
-      ret.set(client.waitFor());
+      int retries = 10;
+      boolean exitted = false;
+      while (!exitted && retries-- > 0) {
+        pw.println("done");
+        pw.flush();
+        exitted = client.waitFor(1, TimeUnit.SECONDS);
+        if (!exitted) {
+          System.out.println("... retrying ...");
+        }
+      }
+
+      if (!exitted) {
+        client.destroyForcibly();
+      }
+
+      ret.set(exitted ? client.exitValue() : -1);
 
       outT.join();
       errT.join();

btrace-instr/src/test/java/resources/TestApp.java

@@ -45,16 +45,19 @@ public void run() {
         t.setDaemon(true);
         t.start();
 
-        String resp = new BufferedReader(new InputStreamReader(System.in, StandardCharsets.UTF_8)).readLine();
-        System.out.println("Received " + resp + " - " + "done".equals(resp));
-        if ("done".equals(resp)) {
-            System.out.flush();
-            System.out.println(System.currentTimeMillis() + ":  Interrupting the worker thread");
-            t.interrupt();
-            System.out.println(System.currentTimeMillis() + ": Waiting for the worker thread to finish");
-            t.join();
-            System.out.println(System.currentTimeMillis() + ": Worker thread finished");
-        }
+        do {
+            String resp = new BufferedReader(new InputStreamReader(System.in, StandardCharsets.UTF_8)).readLine();
+            System.out.println("Received " + resp + " - " + "done".contains(resp));
+            if ("done".contains(resp)) {
+                System.out.flush();
+                System.out.println(System.currentTimeMillis() + ":  Interrupting the worker thread");
+                t.interrupt();
+                System.out.println(System.currentTimeMillis() + ": Waiting for the worker thread to finish");
+                t.join();
+                System.out.println(System.currentTimeMillis() + ": Worker thread finished");
+                break;
+            }
+        } while (true);
     }
 
     private static long getPID() {

run_tests.sh

@@ -14,5 +14,5 @@ for VERSION in 8 11 17 18 19 20; do
     continue
   fi
   echo "Running tests with TEST_JAVA_HOME=${!home_string}"
-  TEST_JAVA_HOME=${!home_string} BTRACE_TEST_DEBUG="true" ./gradlew test | tee -a build/reports/test_java_$VERSION.out  || true
+  TEST_JAVA_HOME=${!home_string} BTRACE_TEST_DEBUG="false" ./gradlew test | tee -a build/reports/test_java_$VERSION.out  || true
 done