automatic commit at releng box

mc36 · Apr 1, 2022 · e572d16 · e572d16
1 parent 02e9e0a
commit e572d16
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/src/net/freertr/pipe/pipeShell.java b/src/net/freertr/pipe/pipeShell.java
@@ -5,6 +5,7 @@
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Stream;
 import net.freertr.util.bits;
 import net.freertr.util.cmds;
 
@@ -129,7 +130,7 @@ public boolean isRunning() {
     /**
      * kill the whole process
      */
-    public synchronized void kill() {
+    public void kill() {
         kill(0);
     }
 
@@ -140,10 +141,22 @@ public synchronized void kill() {
      */
     protected synchronized void kill(int stat) {
         running &= 0x7f - stat;
+        ProcessHandle[] childs = new ProcessHandle[0];
+        try {
+            Stream<ProcessHandle> descends = process.descendants();
+            childs = (ProcessHandle[]) descends.toArray();
+        } catch (Exception e) {
+        }
         try {
             process.destroy();
         } catch (Exception e) {
         }
+        for (int i = 0; i < childs.length; i++) {
+            try {
+                childs[i].destroy();
+            } catch (Exception e) {
+            }
+        }
         bits.sleep(100);
         try {
             stdIn.close();
@@ -216,7 +229,7 @@ public String info() {
         ProcessHandle hnd = null;
         try {
             hnd = process.toHandle();
-            a = "" + hnd.pid();
+            a = hnd.pid() + "|" + hnd.descendants().count();
         } catch (Exception e) {
         }
         try {

diff --git a/src/net/freertr/user/userShow.java b/src/net/freertr/user/userShow.java
@@ -419,7 +419,7 @@ public cfgAlias doer() {
                 return null;
             }
             if (a.equals("device")) {
-                userFormat l = new userFormat("|", "name|rerun|pid|cpu|last|ago");
+                userFormat l = new userFormat("|", "name|rerun|pid|chld|cpu|last|ago");
                 for (int i = 0; i < cfgInit.vdcLst.size(); i++) {
                     cfgVdc ntry = cfgInit.vdcLst.get(i);
                     l.add(ntry.getShow());
@@ -437,7 +437,7 @@ public cfgAlias doer() {
                 return null;
             }
             if (a.equals("external")) {
-                userFormat l = new userFormat("|", "name|rerun|pid|cpu|last|ago");
+                userFormat l = new userFormat("|", "name|rerun|pid|chld|cpu|last|ago");
                 for (int i = 0; i < cfgAll.prcs.size(); i++) {
                     cfgPrcss ntry = cfgAll.prcs.get(i);
                     l.add(ntry.getShow());

diff --git a/src/rtr.csv b/src/rtr.csv
@@ -1,6 +1,6 @@
 url;file;result;test
 -;-;-;freeRouter v22.4.1-cur, done by cs@nop.
--;-;-;2022-04-01 09:14:43, took 00:08:27, with 80 workers, on 2804 cases, 0 failed, 0 traces, 0 retries
+-;-;-;2022-04-01 11:26:27, took 00:08:01, with 80 workers, on 2804 cases, 0 failed, 0 traces, 3 retries
 -;-;-;./rtr.bin
 http://sources.freertr.net/cfg/basic.tst;basic.tst;success;dummy test
 http://sources.freertr.net/cfg/conn-amt01.tst;conn-amt01.tst;success;amt over ipv4

diff --git a/src/rtr.html b/src/rtr.html
@@ -12,7 +12,7 @@
 </style>
 <title>tester</title></head><body>
 release: freeRouter v22.4.1-cur, done by cs@nop.<br/>
-tested: 2022-04-01 09:14:43, took 00:08:27, with 80 workers, on 2804 cases, 0 failed, 0 traces, 0 retries<br/>
+tested: 2022-04-01 11:26:27, took 00:08:01, with 80 workers, on 2804 cases, 0 failed, 0 traces, 3 retries<br/>
 jvm: ./rtr.bin<br/>
 <br/>
 <table><thead><tr><td><b>file</b></td><td><b>result</b></td><td><b>test</b></td></tr></thead><tbody>