automatic commit at releng box

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

Hide file tree

Showing 10 changed files with 16 additions and 18 deletions.
diff --git a/misc/native/p4emu_dbg.c b/misc/native/p4emu_dbg.c
@@ -4,7 +4,6 @@
 #include <string.h>
 #include <arpa/inet.h>
 #include <sys/socket.h>
-#include <sys/ioctl.h>
 #include <netinet/in.h>
 
 #define HAVE_DEBUG

diff --git a/misc/native/p4emu_full.c b/misc/native/p4emu_full.c
@@ -4,7 +4,6 @@
 #include <string.h>
 #include <arpa/inet.h>
 #include <sys/socket.h>
-#include <sys/ioctl.h>
 #include <netinet/in.h>
 
 #undef HAVE_DEBUG

diff --git a/misc/native/p4emu_msg.h b/misc/native/p4emu_msg.h
@@ -1,9 +1,12 @@
 unsigned char portStatsBuf[16384];
 int portStatsLen = 0;
 int commandSock;
+int printCmds;
 FILE *commandRx;
 FILE *commandTx;
 
+
+
 void str2mac(unsigned char *dst, char *src) {
     sscanf(src, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", &dst[0], &dst[1], &dst[2], &dst[3], &dst[4], &dst[5]);
 }
@@ -187,9 +190,11 @@ int doOneCommand(struct packetContext *ctx, unsigned char* buf) {
     cnt++;
     buf[o] = 0;
     for (int i=cnt; i < 128; i++) arg[i]=(char*)&buf[o];
-    printf("rx: ");
-    for (int i=0; i < cnt; i++) printf("'%s' ",arg[i]);
-    printf("\n");
+    if (printCmds != 0) {
+        printf("rx: ");
+        for (int i=0; i < cnt; i++) printf("'%s' ",arg[i]);
+        printf("\n");
+    }
     int del = strcmp(arg[1], "del");
     if (del != 0) del = 1;
     struct polkaIdx_entry polkaIdx_ntry;
@@ -2954,6 +2959,7 @@ void doNegotiate(char*name) {
 
 
 void doSockLoop() {
+    printCmds = getenv("p4emuNOCMDS") == NULL;
     struct packetContext ctx;
     if (initContext(&ctx) != 0) err("error initializing context");
     unsigned char buf[16384];
@@ -3077,17 +3083,12 @@ void doStatLoop() {
 
 
 void doMainLoop() {
+    if (getenv("p4emuNOCONS") != NULL) for (;;) sleep(1);
     unsigned char buf[1024];
     unsigned char buf2[1024];
     unsigned char buf3[1024];
-    int nbytes;
     for (;;) {
         printf("> ");
-        ioctl(STDIN_FILENO, FIONREAD, &nbytes);
-        if (nbytes < 1) {
-            sleep(1);
-            continue;
-        }
         buf[0] = 0;
         int i = scanf("%1023s", buf);
         if (i < 1) {

diff --git a/misc/native/p4emu_nocr.c b/misc/native/p4emu_nocr.c
@@ -4,7 +4,6 @@
 #include <string.h>
 #include <arpa/inet.h>
 #include <sys/socket.h>
-#include <sys/ioctl.h>
 #include <netinet/in.h>
 
 #undef HAVE_DEBUG

diff --git a/src/org/freertr/util/verCore.java b/src/org/freertr/util/verCore.java
@@ -43,7 +43,7 @@ private verCore() {
     /**
      * compile day
      */
-    public final static int day = 27;
+    public final static int day = 28;
 
     /**
      * statement of release

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 23:13:44, took 00:14:43, with 50 workers, on 3602 cases, 0 failed, 0 traces, 0 retries
+-;-;-;2024-12-28 00:49:39, took 00:14:39, with 50 workers, on 3602 cases, 0 failed, 0 traces, 2 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 23:13:44, took 00:14:43, with 50 workers, on 3602 cases, 0 failed, 0 traces, 0 retries<br/>
+tested: 2024-12-28 00:49:39, took 00:14:39, with 50 workers, on 3602 cases, 0 failed, 0 traces, 2 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/rtr.txt b/src/rtr.txt
@@ -1 +1 @@
-24.12.27
+24.12.28
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 23:26:31, took 00:12:25, with 50 workers, on 674 cases, 0 failed, 0 traces, 3 retries
+-;-;-;2024-12-28 01:00:07, took 00:10:06, with 50 workers, on 674 cases, 0 failed, 0 traces, 0 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 23:26:31, took 00:12:25, with 50 workers, on 674 cases, 0 failed, 0 traces, 3 retries<br/>
+tested: 2024-12-28 01:00:07, took 00:10:06, with 50 workers, on 674 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>