espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-04 21:24:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/iperf_counter_size' into 'master'

Browse Source 
Update the formula for calculating the average bandwidth

Closes IDF-3705

See merge request espressif/esp-idf!14915
This commit is contained in:
David Čermák
2021-09-08 17:26:18 +00:00
parent 39b7d3e13f 677ebc276c
commit df1b524d07
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
examples/common_components/iperf/iperf.c
View File

@@ -19,7 +19,7 @@
typedef struct { typedef struct {
iperf_cfg_t cfg; iperf_cfg_t cfg;
bool finish; bool finish;
uint32_t total_len; uint32_t actual_len;
uint32_t buffer_len; uint32_t buffer_len;
uint8_t *buffer; uint8_t *buffer;
uint32_t sockfd; uint32_t sockfd;
@@ -69,26 +69,28 @@ static void iperf_report_task(void *arg)
uint32_t interval = s_iperf_ctrl.cfg.interval; uint32_t interval = s_iperf_ctrl.cfg.interval;
uint32_t time = s_iperf_ctrl.cfg.time; uint32_t time = s_iperf_ctrl.cfg.time;
TickType_t delay_interval = (interval * 1000) / portTICK_PERIOD_MS; TickType_t delay_interval = (interval * 1000) / portTICK_PERIOD_MS;
uint32_t last_len = 0;
uint32_t cur = 0; uint32_t cur = 0;
double average = 0;
double actual_bandwidth = 0;
int k = 1;
printf("\n%16s %s\n", "Interval", "Bandwidth"); printf("\n%16s %s\n", "Interval", "Bandwidth");
while (!s_iperf_ctrl.finish) { while (!s_iperf_ctrl.finish) {
vTaskDelay(delay_interval); vTaskDelay(delay_interval);
actual_bandwidth = (s_iperf_ctrl.actual_len / 1e6 * 8) / interval;
printf("%4d-%4d sec %.2f Mbits/sec\n", cur, cur + 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; 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) { if (cur >= time) {
printf("%4d-%4d sec %.2f Mbits/sec\n", 0, time,
average);
break; 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; s_iperf_ctrl.finish = true;
vTaskDelete(NULL); vTaskDelete(NULL);
} }
@@ -140,7 +142,7 @@ static void socket_recv(int recv_socket, struct sockaddr_storage listen_addr, ui
iperf_start_report(); iperf_start_report();
udp_recv_start = false; 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; break;
} }
} else { } else {
s_iperf_ctrl.total_len += actual_send; s_iperf_ctrl.actual_len += actual_send;
} }
} }
} }