From 677ebc276cac92ce4b43439d19439134fe10fd53 Mon Sep 17 00:00:00 2001
From: AndriiFilippov <andrii.filippov@espressif.com>
Date: Wed, 11 Aug 2021 16:50:11 +0200
Subject: [PATCH] iperf: Update the formula for calculating the average
 bandwidth

The ethernet\iperf example has a bug, once bandwidth is more than 80 Mbits/s the average counter shows wrong total transmitted data value. Issue occur due to overflow of the uint32_t total_len variable.
* created new average formula to avoid the overflow
* updated interval formula according to new variables
* renamed variable according to its purpose
---
 examples/common_components/iperf/iperf.c | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/examples/common_components/iperf/iperf.c b/examples/common_components/iperf/iperf.c
index 5d7061d52e..5105c04bae 100644
--- a/examples/common_components/iperf/iperf.c
+++ b/examples/common_components/iperf/iperf.c
@@ -19,7 +19,7 @@
 typedef struct {
     iperf_cfg_t cfg;
     bool finish;
-    uint32_t total_len;
+    uint32_t actual_len;
     uint32_t buffer_len;
     uint8_t *buffer;
     uint32_t sockfd;
@@ -69,26 +69,28 @@ static void iperf_report_task(void *arg)
     uint32_t interval = s_iperf_ctrl.cfg.interval;
     uint32_t time = s_iperf_ctrl.cfg.time;
     TickType_t delay_interval = (interval * 1000) / portTICK_PERIOD_MS;
-    uint32_t last_len = 0;
     uint32_t cur = 0;
+    double average = 0;
+    double actual_bandwidth = 0;
+    int k = 1;
 
     printf("\n%16s %s\n", "Interval", "Bandwidth");
     while (!s_iperf_ctrl.finish) {
         vTaskDelay(delay_interval);
+        actual_bandwidth = (s_iperf_ctrl.actual_len / 1e6 * 8) / interval;
         printf("%4d-%4d sec       %.2f Mbits/sec\n", cur, cur + interval,
-               (double)((s_iperf_ctrl.total_len - last_len) * 8) / interval / 1e6);
+            actual_bandwidth);
         cur += interval;
-        last_len = s_iperf_ctrl.total_len;
+        average = ((average * (k - 1) / k) + (actual_bandwidth / k));
+        k++;
+        s_iperf_ctrl.actual_len = 0;
         if (cur >= time) {
+            printf("%4d-%4d sec       %.2f Mbits/sec\n", 0, time,
+                average);
             break;
         }
     }
 
-    if (cur != 0) {
-        printf("%4d-%4d sec       %.2f Mbits/sec\n", 0, time,
-               (double)(s_iperf_ctrl.total_len * 8) / cur / 1e6);
-    }
-
     s_iperf_ctrl.finish = true;
     vTaskDelete(NULL);
 }
@@ -140,7 +142,7 @@ static void socket_recv(int recv_socket, struct sockaddr_storage listen_addr, ui
                 iperf_start_report();
                 udp_recv_start = false;
             }
-            s_iperf_ctrl.total_len += actual_recv;
+            s_iperf_ctrl.actual_len += actual_recv;
         }
     }
 }
@@ -192,7 +194,7 @@ static void socket_send(int send_socket, struct sockaddr_storage dest_addr, uint
                 break;
             }
         } else {
-            s_iperf_ctrl.total_len += actual_send;
+            s_iperf_ctrl.actual_len += actual_send;
         }
     }
 }