snapshot - still working on orchestrated tests; using processes instead of threads now.

Author: thsc42

src/net/sharksystem/app/messenger/SharkNetMessengerComponentImpl.java

@@ -200,7 +200,7 @@ public SharkPKIComponent getSharkPKI() {
     }
 
     /////////////////////////////////////////////////////////////////////////////////////////////
-    //                                     act on received messages                            //
+    //                                 act on received asap messages                           //
     /////////////////////////////////////////////////////////////////////////////////////////////
 
     @Override

src/net/sharksystem/ui/messenger/cli/SNMDistributedTestsMessageReceivedListener.java

@@ -25,13 +25,9 @@ public void run() {
         }
         else if(uri.toString().equalsIgnoreCase(
                 SharkNetMessengerAppSupportingDistributedTesting.SCRIPT_RQ_CHANNEL.toString())) {
-            new Thread(new Runnable() {
-                @Override
-                public void run() {
-                    SNMDistributedTestsMessageReceivedListener.this.sharkMessengerAppTestingVersion.
-                            receivedScriptRQ(SharkNetMessengerAppSupportingDistributedTesting.SCRIPT_RQ_CHANNEL);
-                }
-            }).start();
+            // no need for a thread - is already created in asap core
+            SNMDistributedTestsMessageReceivedListener.this.sharkMessengerAppTestingVersion.
+                    receivedScriptRQ(SharkNetMessengerAppSupportingDistributedTesting.SCRIPT_RQ_CHANNEL);
         }
         else if(uri.toString().equalsIgnoreCase(
                 SharkNetMessengerAppSupportingDistributedTesting.TEST_SCRIPT_CHANNEL.toString())) {

src/net/sharksystem/ui/messenger/cli/SharkNetMessengerAppSupportingDistributedTesting.java

@@ -6,9 +6,7 @@
 import net.sharksystem.app.messenger.SharkNetMessengerChannel;
 import net.sharksystem.app.messenger.SharkNetMessengerException;
 import net.sharksystem.asap.ASAPException;
-import net.sharksystem.ui.messenger.cli.commands.testing.PeerHostingEnvironmentDescription;
-import net.sharksystem.ui.messenger.cli.commands.testing.ScriptRunnerThread;
-import net.sharksystem.ui.messenger.cli.commands.testing.TestScriptDescription;
+import net.sharksystem.ui.messenger.cli.commands.testing.*;
 import net.sharksystem.ui.messenger.cli.testlanguage.TestLanguageCompiler;
 import net.sharksystem.utils.SerializationHelper;
 
@@ -70,18 +68,23 @@ else if(contentType.toString().equalsIgnoreCase(TEST_SCRIPT_FORMAT)) {
     private List<Thread> blockedThreads = new ArrayList<>(); // a thread can wait for more labels - useful or not
     public void block(String label) {
         // check if already released
+        this.tellUI("looking for release label " + label);
         while(true) {
             for(String receivedLabel : this.receivedLabels) {
                 if (receivedLabel.equalsIgnoreCase(label)) {
+                    this.tellUI("release label received: " + label);
                     return; // block released
                 }
             }
             try {
                 this.blockedThreads.add(Thread.currentThread());
+                this.tellUI("threads sleeps and waits for release label " + label);
                 Thread.sleep(Long.MAX_VALUE);
             } catch (InterruptedException e) {
                 // new message received - try again
             }
+            this.tellUI("threads woke up - check if release label arrived " + label);
+            this.blockedThreads.remove(Thread.currentThread());
         }
     }
 
@@ -156,11 +159,19 @@ public void receivedTestScript(CharSequence testScriptChannel) {
                 // for me?
                 if(testScriptDescription.peerID.equalsIgnoreCase(this.getSharkPeer().getPeerID().toString())) {
                     this.tellUI("test script received - prepare script runner" + testScriptDescription);
+
+                    /*
                     // produce test running thread
                     new ScriptRunnerThread(
                         Integer.toString(testScriptDescription.peerIndex),
                         Integer.toString(testScriptDescription.testNumber),
                         testScriptDescription.script).start();
+                     */
+                    // produce test running process
+                    new ScriptRunnerProcess(
+                            Integer.toString(testScriptDescription.peerIndex),
+                            Integer.toString(testScriptDescription.testNumber),
+                            testScriptDescription.script).start();
                     this.tellUI("running script: " + testScriptDescription.script);
                 } else {
                     this.tellUI("test script received, not for me though. Index: " + scriptIndex);
@@ -409,12 +420,26 @@ public void run() {
             }
 
             // run orchestrator script first - wait to collect logs
+            try {
+                ScriptRunnerProcess scriptRunnerProcess =
+                        scriptRunnerProcess = new ScriptRunnerProcess(ORCHESTRATOR_PEER_NAME,
+                        Integer.toString(this.testNumber), orchestratorScript);
+                scriptRunnerProcess.start();
+            } catch (IOException e) {
+                SharkNetMessengerAppSupportingDistributedTesting.
+                        this.tellUIError("could not start orchestrator process / don't send scripts to peers: "
+                        + e.getStackTrace());
+                return;
+            }
+
+            /*
             ScriptRunnerThread scriptRunnerThread =
                     new ScriptRunnerThread(ORCHESTRATOR_PEER_NAME,
                             Integer.toString(this.testNumber), orchestratorScript);
             SharkNetMessengerAppSupportingDistributedTesting.this.tellUI(
                     "running script as peer " + ORCHESTRATOR_PEER_NAME + ": " + orchestratorScript);
             scriptRunnerThread.start();
+             */
 
             // now - send script to each peer
 

src/net/sharksystem/ui/messenger/cli/commands/tcp/UICommandConnectTCP.java

@@ -62,6 +62,8 @@ protected UICommandQuestionnaire specifyCommandStructure() {
     protected void execute() throws Exception {
         try {
             this.getSharkMessengerApp().connectTCP(this.hostName.getValue(), this.portNumber.getValue());
+            this.getSharkMessengerApp().tellUI("connected to "
+                    + this.hostName.getValue() + ":" + this.portNumber.getValue());
         } catch (IOException e) {
             this.printErrorMessage(e.getLocalizedMessage());
         }

src/net/sharksystem/ui/messenger/cli/commands/tcp/UICommandOpenTCP.java

@@ -20,6 +20,7 @@ public UICommandOpenTCP(SharkNetMessengerApp sharkMessengerApp, SharkNetMessenge
     protected void execute() throws Exception {
         try {
             this.getSharkMessengerApp().openTCPConnection(this.getIntegerArgument());
+            this.getSharkMessengerApp().tellUI("TCP port opened: " + this.getIntegerArgument());
         } catch (IOException e) {
             this.printErrorMessage(e.getLocalizedMessage());
         }

src/net/sharksystem/ui/messenger/cli/commands/testing/Helper.java

@@ -0,0 +1,28 @@
+package net.sharksystem.ui.messenger.cli.commands.testing;
+
+class Helper {
+    public static final String SNM_CLI_JAR_FILENAME = "SharkNetMessengerCLI.jar";
+
+    static String getFriendlyPeerName(String peerName) {
+        if(peerName.length() != 1) return peerName; // already friendly - hopefully
+
+        switch (peerName) {
+            case "0":
+            case "A":
+                return "Alice";
+            case "1":
+            case "B":
+                return "Bob";
+            case "2":
+            case "C":
+                return "Clara";
+            case "3":
+            case "D":
+                return "David";
+            case "4":
+            case "E":
+                return "Eve";
+            default: return peerName;
+        }
+    }
+}

src/net/sharksystem/ui/messenger/cli/commands/testing/ScriptRunnerProcess.java

@@ -0,0 +1,48 @@
+package net.sharksystem.ui.messenger.cli.commands.testing;
+
+import net.sharksystem.hub.peerside.ASAPHubManager;
+import net.sharksystem.ui.messenger.cli.ProductionUI;
+import net.sharksystem.utils.Log;
+
+import java.io.File;
+import java.io.IOException;
+
+public class ScriptRunnerProcess {
+    private String command;
+
+    public ScriptRunnerProcess(String peerName, String testName, String script) throws IOException {
+        // produce command line to launch a new SNM CLI
+        peerName = Helper.getFriendlyPeerName(peerName);
+
+        StringBuilder sb = new StringBuilder();
+        sb.append("java -jar ");
+        sb.append(Helper.SNM_CLI_JAR_FILENAME);
+        sb.append(" ");
+        sb.append(peerName + "_" + testName);
+        sb.append(" ");
+        sb.append(String.valueOf(ASAPHubManager.DEFAULT_WAIT_INTERVAL_IN_SECONDS));
+        sb.append(" \"");
+        sb.append(script);
+        sb.append("\"");
+
+        // a specified system command.
+        this.command = sb.toString();
+    }
+    public void start() throws IOException {
+        /*
+        array of strings, each element of which has environment variable settings in the format name=value,
+        or null if the subprocess should inherit the environment of the current process.
+         */
+        String[] env = null;
+
+        /*
+        the working directory of the subprocess,
+        or null if the subprocess should inherit the working directory of the current process.
+         */
+        File workingDir = null;
+
+        Log.writeLog(this, "launch new process: " + this.command);
+        System.out.println("launch new process: " + this.command);
+        Runtime.getRuntime().exec(this.command, env, workingDir);
+    }
+}

src/net/sharksystem/ui/messenger/cli/commands/testing/ScriptRunnerThread.java

@@ -13,7 +13,7 @@ public class ScriptRunnerThread extends Thread {
     ProductionUI ui;
 
     public ScriptRunnerThread(String peerName, String testName, String script) {
-        this.peerName = ScriptRunnerThread.getFriendlyPeerName(peerName);
+        this.peerName = Helper.getFriendlyPeerName(peerName);
         this.testName = testName;
         this.script = script;
 
@@ -32,27 +32,4 @@ public ScriptRunnerThread(String peerName, String testName, String script) {
     public void run() {
         this.ui.startCLI(peerName);
     }
-
-    public static String getFriendlyPeerName(String peerName) {
-        if(peerName.length() != 1) return peerName; // already friendly - hopefully
-
-        switch (peerName) {
-            case "0":
-            case "A":
-                return "Alice";
-            case "1":
-            case "B":
-                return "Bob";
-            case "2":
-            case "C":
-                return "Clara";
-            case "3":
-            case "D":
-                return "David";
-            case "4":
-            case "E":
-                return "Eve";
-            default: return peerName;
-        }
-    }
 }

src/net/sharksystem/ui/messenger/cli/commands/testing/ScriptsRunner.java

@@ -23,9 +23,10 @@ protected void execute() throws Exception {
          */
 
          // what works - independent tests - no interaction between test peers
-        // 2025-12-03
-        String script0_0 =  "sendMessage HiFromTest;wait 1000;lsMessages;";
-        String script0_1 =  "sendMessage HiFromTest;wait 1000;lsMessages;";
+        // 2025-12-03 with thread variant
+        //
+        String script0_A =  "sendMessage HiFromTest;wait 1000;lsMessages;";
+        String script0_B =  "sendMessage HiFromTest;wait 1000;lsMessages;";
 
         // Orchestrator: orchestrateTest dummy; openTCP 6907
         // dann Peers: connectTCP localhost 6907; scriptRQ
@@ -35,6 +36,8 @@ protected void execute() throws Exception {
         // check locks - getting even weirder - to test peer names are generated twice?
         // There is nothing but a good mystery :)
         // what the difference to scenario 0? no additional TCP connections(?)
+
+        // going to launch new processes rather new threads: orchestrator (not yet); test peers (not yet)
         String script1_A =  "wait 5000;connectTCP localhost 9999;release A1;wait 5000;lsMessages;";
         String script1_B = "openTCP 9999;block A1;sendMessage HiFromBob;wait 5000;";
 
@@ -51,7 +54,7 @@ protected void execute() throws Exception {
         // fill with example data
         this.getSharkMessengerApp().tellUI("use sample data - todo: fill with real data");
         // anything will do
-        scripts.add(script1_A);
+        scripts.add(script0_A);
         scripts.add(script1_B);
 
         this.snmTestSupport.orchestrateTest(scripts);