fix updating stats when running Lua scripts.

VERSION

@@ -1 +1 @@
-24.03.0
+24.03.1

app/lpktgenlib.c

@@ -923,7 +923,6 @@ __delay(int32_t t)
     int32_t n;
 
     while (t > 0) {
-        cli_use_timers();
         n = (t > 10) ? 10 : t;
         rte_delay_us_sleep(n * 1000);
         t -= n;

app/pktgen-main.c

@@ -475,8 +475,6 @@ main(int argc, char **argv)
     argc -= ret;
     argv += ret;
 
-    rte_timer_subsystem_init();
-
     /* Configure pktgen data which will be encapsulated in the mbuf. */
     pktgen_dynfield_offset = rte_mbuf_dynfield_register(&pktgen_dynfield_desc);
     if (pktgen_dynfield_offset < 0)

app/pktgen.c

@@ -1553,19 +1553,41 @@ pktgen_page_display(void)
     pktgen_print_packet_dump();
 }
 
-static struct rte_timer update_stats_timer;
-static struct rte_timer update_display_timer;
-
-static void
-stats_cb(__rte_unused struct rte_timer *tim, __rte_unused void *arg)
+static void *
+_timer_thread(void *arg)
 {
-    pktgen_process_stats();
-}
+    uint64_t process, page, prev;
 
-static void
-display_cb(__rte_unused struct rte_timer *tim, __rte_unused void *arg)
-{
-    pktgen_page_display();
+    this_scrn = arg;
+
+    pktgen.stats_timeout = pktgen.hz;
+    pktgen.page_timeout  = UPDATE_DISPLAY_TICK_RATE;
+
+    page = prev = pktgen_get_time();
+    process     = page + pktgen.stats_timeout;
+    page += pktgen.page_timeout;
+
+    pktgen.timer_running = 1;
+
+    while (pktgen.timer_running) {
+        uint64_t curr;
+
+        curr = pktgen_get_time();
+
+        if (curr >= process) {
+            process = curr + pktgen.stats_timeout;
+            pktgen_process_stats();
+            prev = curr;
+        }
+
+        if (curr >= page) {
+            page = curr + pktgen.page_timeout;
+            pktgen_page_display();
+        }
+
+        rte_pause();
+    }
+    return NULL;
 }
 
 /**
@@ -1583,12 +1605,14 @@ display_cb(__rte_unused struct rte_timer *tim, __rte_unused void *arg)
 void
 pktgen_timer_setup(void)
 {
-    unsigned int main_lcore = rte_get_main_lcore();
-    uint64_t hz             = rte_get_timer_hz();
+    rte_cpuset_t cpuset_data;
+    rte_cpuset_t *cpuset = &cpuset_data;
+    pthread_t tid;
+
+    CPU_ZERO(cpuset);
 
-    rte_timer_init(&update_stats_timer);
-    rte_timer_init(&update_display_timer);
+    pthread_create(&tid, NULL, _timer_thread, this_scrn);
 
-    rte_timer_reset(&update_stats_timer, hz, PERIODICAL, main_lcore, stats_cb, NULL);
-    rte_timer_reset(&update_display_timer, hz / 4, PERIODICAL, main_lcore, display_cb, NULL);
+    CPU_SET(rte_get_main_lcore(), cpuset);
+    pthread_setaffinity_np(tid, sizeof(cpuset), cpuset);
 }

changelog.txt

@@ -6,6 +6,9 @@ Pktgen-DPDK - Traffic Generator powered by DPDK
 ** (Pktgen) Sounds like 'Packet-Gen'**
 
 **=== Modifications ===**
+ - 24.03.1 - Fix updating stats when running Lua scripts.
+             Remove a number of old .map files.
+             Remove the unused CLI support for running with timers.
  - 24.03.0 - Fix a number of problems with save command for lua scripts.
              Removed the decompile/compile/sendPkt/recvPkt references.
              Compiled with DPDK 24.03.0

lib/cli/cli.c

@@ -21,13 +21,6 @@ static int (*__dofile_lua)(void *, const char *);
 
 RTE_DEFINE_PER_LCORE(struct cli *, cli);
 
-void
-cli_use_timers(void)
-{
-    if (this_cli && this_cli->flags & CLI_USE_TIMERS)
-        rte_timer_manage();
-}
-
 int
 cli_nodes_unlimited(void)
 {
@@ -560,9 +553,8 @@ cli_start(const char *msg)
 
     RTE_ASSERT(this_cli != NULL);
 
-    cli_printf("\n** Version: %s, %s with%s timers\n", rte_version(),
-               (msg == NULL) ? "Command Line Interface" : msg,
-               (this_cli->flags & CLI_USE_TIMERS) ? "" : "out");
+    cli_printf("\n** Version: %s, %s\n", rte_version(),
+               (msg == NULL) ? "Command Line Interface" : msg);
 
     this_cli->plen = this_cli->prompt(0);
 
@@ -574,23 +566,12 @@ cli_start(const char *msg)
     while (!this_cli->quit_flag) {
         if (cli_poll(&c))
             cli_input(&c, 1);
-        rte_timer_manage();
         rte_pause();
     }
 
     cli_printf("\n");
 }
 
-void
-cli_start_with_timers(const char *msg)
-{
-    RTE_ASSERT(this_cli != NULL);
-
-    this_cli->flags |= CLI_USE_TIMERS;
-
-    cli_start(msg);
-}
-
 /* Create a CLI root node for the tree */
 struct cli_node *
 cli_create_root(const char *dirname)

lib/cli/cli.h

@@ -163,7 +163,6 @@ RTE_DECLARE_PER_LCORE(struct cli *, cli);
 #define DELETE_CHAR     (1 << 3)
 #define CLEAR_LINE      (1 << 4)
 
-#define CLI_USE_TIMERS      (1 << 8) /**< call rte_timer_manage() on input */
 #define CLI_NODES_UNLIMITED (1 << 9) /**< Allocate nodes with no limit */
 #define CLI_YIELD_IO        (1 << 10)
 #define CLI_DEFAULT_TREE    (1 << 11)
@@ -704,18 +703,6 @@ void cli_destroy(void);
  */
 void cli_start(const char *msg);
 
-/**
- * Start the CLI running and use timerss
- *
- * @note Uses thread variable this_cli.
- *
- * @param msg
- *   User message to be displayed on startup
- * @return
- *   N/A
- */
-void cli_start_with_timers(const char *msg);
-
 /**
  * Execute command line string in cli->input
  *
@@ -918,13 +905,6 @@ int cli_execute_cmdfiles(void);
  */
 int cli_remove_node(struct cli_node *node);
 
-/**
- * Handle calling the rte_timer_manage routine if trimers are enabled
- *
- * @note Uses thread variable this_cli.
- */
-void cli_use_timers(void);
-
 /**
  * return true if allocating unlimited nodes are enabled.
  *

lib/cli/cli_cmds.c

@@ -521,7 +521,6 @@ sleep_cmd(int argc __rte_unused, char **argv)
     }
 
     while (cnt--) {
-        cli_use_timers();
         rte_delay_us_sleep(250 * 1000);
     }
     return 0;
@@ -534,7 +533,6 @@ delay_cmd(int argc __rte_unused, char **argv)
     int cnt = (ms / 1000) * 4;
 
     while (cnt--) {
-        cli_use_timers();
         rte_delay_us_sleep(250 * 1000);
         ms -= 250;
     }

lib/cli/cli_input.c

@@ -84,8 +84,6 @@ cli_poll(char *c)
     fds.events  = POLLIN;
     fds.revents = 0;
 
-    cli_use_timers();
-
     if (poll(&fds, 1, 0)) {
         if ((fds.revents & (POLLERR | POLLNVAL)) == 0) {
             if ((fds.revents & POLLHUP))

test/portstats_with_delay.lua

@@ -0,0 +1,8 @@
+package.path = package.path .. ";?.lua;test/?.lua;"
+require("Pktgen")
+
+pktgen.start("0");
+TEST_DURATION = 10
+pktgen.delay(TEST_DURATION * 1000);
+pktgen.stop("0");
+prints("portStats", pktgen.portStats('0', 'port'));

themes/black-yellow.theme

@@ -33,3 +33,4 @@ theme stats.mac green none off
 theme stats.ip cyan none off
 theme pktgen.prompt green none off
 cls
+on

themes/white-black.theme

@@ -21,3 +21,5 @@ theme stats.mac green none bold
 theme stats.ip cyan none bold
 theme pktgen.prompt green none off
 theme on
+cls
+on