automatic commit at releng box

mc36 · Dec 28, 2024 · c93c94e · c93c94e
1 parent 1605a6c
commit c93c94e
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 4 deletions.
diff --git a/src/org/freertr/prt/prtGen.java b/src/org/freertr/prt/prtGen.java
@@ -581,7 +581,14 @@ public void counterUpdate(ipFwdIface ifc, addrIP adr, int rem, int loc, counter
         if (ntry == null) {
             return;
         }
+        counter old = ntry.hwCntr;
         ntry.hwCntr = cntr;
+        if (old == null) {
+            return;
+        }
+        if (old.compareTo(ntry.hwCntr) == 0) {
+            return;
+        }
         ntry.lastActivity = bits.getTime();
     }
 

diff --git a/src/org/freertr/serv/servP4langConn.java b/src/org/freertr/serv/servP4langConn.java
@@ -481,11 +481,18 @@ private boolean doReports() {
                     }
                     continue;
                 }
+                counter old = ntry.hwCntr;
                 ntry.hwCntr = new counter();
                 ntry.hwCntr.packRx = bits.str2long(cmd.word());
                 ntry.hwCntr.byteRx = bits.str2long(cmd.word());
                 ntry.hwCntr.packTx = bits.str2long(cmd.word());
                 ntry.hwCntr.byteTx = bits.str2long(cmd.word());
+                if (old == null) {
+                    continue;
+                }
+                if (old.compareTo(ntry.hwCntr) == 0) {
+                    continue;
+                }
                 ntry.time = bits.getTime();
                 continue;
             }

diff --git a/src/org/freertr/serv/servP4langUtil.java b/src/org/freertr/serv/servP4langUtil.java
@@ -187,9 +187,16 @@ protected final static void updateNatTrans(cmds cmd, ipFwd fwd) {
             }
             return;
         }
+        counter old = ntry.hwCntr;
         ntry.hwCntr = new counter();
         ntry.hwCntr.packRx = bits.str2long(cmd.word());
         ntry.hwCntr.byteRx = bits.str2long(cmd.word());
+        if (old == null) {
+            return;
+        }
+        if (old.compareTo(ntry.hwCntr) == 0) {
+            return;
+        }
         ntry.lastUsed = bits.getTime();
         ntry.reverse.lastUsed = ntry.lastUsed;
     }
@@ -227,11 +234,18 @@ protected final static void updateInsp(cmds cmd, tabSession insp) {
             }
         }
         ntry = res;
+        counter old = ntry.hwCntr;
         ntry.hwCntr = new counter();
         ntry.hwCntr.packRx = bits.str2long(cmd.word());
         ntry.hwCntr.byteRx = bits.str2long(cmd.word());
         ntry.hwCntr.packTx = bits.str2long(cmd.word());
         ntry.hwCntr.byteTx = bits.str2long(cmd.word());
+        if (old == null) {
+            return;
+        }
+        if (old.compareTo(ntry.hwCntr) == 0) {
+            return;
+        }
         ntry.lastTime = bits.getTime();
     }
 
@@ -313,9 +327,16 @@ protected final static void updatePbr(cmds cmd, tabListing<tabPbrN, addrIP> pbr)
         if (ntry.rolledFrom != null) {
             ntry = ntry.rolledFrom;
         }
+        counter old = ntry.hwCntr;
         ntry.hwCntr = new counter();
         ntry.hwCntr.packRx = bits.str2long(cmd.word());
         ntry.hwCntr.byteRx = bits.str2long(cmd.word());
+        if (old == null) {
+            return;
+        }
+        if (old.compareTo(ntry.hwCntr) == 0) {
+            return;
+        }
         ntry.lastMatch = bits.getTime();
     }
 
@@ -336,9 +357,16 @@ protected final static void updateAcl(cmds cmd, tabListing<tabAceslstN<addrIP>,
         if (ntry.rolledFrom != null) {
             ntry = ntry.rolledFrom;
         }
+        counter old = ntry.hwCntr;
         ntry.hwCntr = new counter();
         ntry.hwCntr.packRx = bits.str2long(cmd.word());
         ntry.hwCntr.byteRx = bits.str2long(cmd.word());
+        if (old == null) {
+            return;
+        }
+        if (old.compareTo(ntry.hwCntr) == 0) {
+            return;
+        }
         ntry.lastMatch = bits.getTime();
     }
 

diff --git a/src/rtr.csv b/src/rtr.csv
@@ -1,6 +1,6 @@
 url;file;result;test
 -;-;-;freeRouter v24.12.27-cur, done by sprscc13@mrn0b0dy.
--;-;-;2024-12-27 22:42:55, took 00:15:04, with 50 workers, on 3602 cases, 0 failed, 0 traces, 4 retries
+-;-;-;2024-12-27 23:13:44, took 00:14:43, with 50 workers, on 3602 cases, 0 failed, 0 traces, 0 retries
 -;-;-;./rtr.bin
 http://sources.freertr.org/cfg/basic01.tst;basic01.tst;success;dummy test
 http://sources.freertr.org/cfg/basic02.tst;basic02.tst;success;interface with slot

diff --git a/src/rtr.html b/src/rtr.html
@@ -10,7 +10,7 @@
 </style>
 <title>tester</title></head><body>
 release: freeRouter v24.12.27-cur, done by sprscc13@mrn0b0dy.<br/>
-tested: 2024-12-27 22:42:55, took 00:15:04, with 50 workers, on 3602 cases, 0 failed, 0 traces, 4 retries<br/>
+tested: 2024-12-27 23:13:44, took 00:14:43, with 50 workers, on 3602 cases, 0 failed, 0 traces, 0 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>

diff --git a/src/rtr8.csv b/src/rtr8.csv
@@ -1,6 +1,6 @@
 url;file;result;test
 -;-;-;freeRouter v24.12.27-cur, done by sprscc13@mrn0b0dy.
--;-;-;2024-12-27 22:56:09, took 00:12:52, with 50 workers, on 674 cases, 0 failed, 0 traces, 1 retries
+-;-;-;2024-12-27 23:26:31, took 00:12:25, with 50 workers, on 674 cases, 0 failed, 0 traces, 3 retries
 -;-;-;./rtr.bin
 http://sources.freertr.org/cfg/p4lang-acl001.tst;p4lang-acl001.tst;success;p4lang: copp
 http://sources.freertr.org/cfg/p4lang-acl002.tst;p4lang-acl002.tst;success;p4lang: ingress access list

diff --git a/src/rtr8.html b/src/rtr8.html
@@ -10,7 +10,7 @@
 </style>
 <title>tester</title></head><body>
 release: freeRouter v24.12.27-cur, done by sprscc13@mrn0b0dy.<br/>
-tested: 2024-12-27 22:56:09, took 00:12:52, with 50 workers, on 674 cases, 0 failed, 0 traces, 1 retries<br/>
+tested: 2024-12-27 23:26:31, took 00:12:25, with 50 workers, on 674 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>