Traffic stats: more entries added

mbakholdina · Dec 13, 2019 · 1aa55df · 1aa55df
1 parent 874cdd5
commit 1aa55df
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -106,19 +106,27 @@ Options:
 Example output:
 
 ```
-SRT Data payload:          6.685 Mbps
+Overall UDP rate:          7.501 Mbps
+SRT Data org+rexmit pld:   7.367 Mbps
+SRT Data org payload:      6.665 Mbps
 SRT Data overhead:         1.824%
-SRT Data lost:             4.250%
-SRT Data rexmit overhead:  8.857%
-SRT ACK overhead:          0.404%
-SRT ACKACK overhead:       0.404%
-SRT NAK overhead:          0.161%
+SRT Data missing:          0.000%
+SRT Data rexmit overhead:  10.723%
+SRT ACK overhead:          0.286%
+SRT ACKACK overhead:       0.286%
+SRT NAK overhead:          0.162%
 ===========================================
-SRT overall overhead:      9.630%
-SRT Retransmitted:         8.699% of original packets
-including:
-    retransmitted twice:   3.706% of original packets
-    retransmitted more:    0.372% of original packets
+SRT overall overhead:       11.325%
+SRT Data packets (org):     19913
+SRT retransmitted:          719 packets (2097 retransmissions)
+SRT DATA retransmisions:    10.531% × DATA packets
+SRT retransmitted:          3.611% of original packets
+    including retransmitted:
+    once:    0.015% of original packets
+    twice:   0.291% of original packets
+    3×:      3.284% of original packets
+    4×:      0.020% of original packets
+    more:    0.000% of original packets
 ```
 
 # Data Preparation

diff --git a/scripts/get_traffic_stats.py b/scripts/get_traffic_stats.py
@@ -73,26 +73,39 @@ def main(path, overwrite):
 	rexmit_pkts['srt.seqno']      = rexmit_pkts['srt.seqno'].astype('int32')
 	rexmit_pkts['seqno']          = rexmit_pkts['srt.seqno']
 	srt_data_rexmits              = rexmit_pkts.groupby(['srt.seqno'])['seqno'].count()
+	srt_data_rex_once_count       = srt_data_rexmits[srt_data_rexmits == 1].count()
 	srt_data_rex_twice_count      = srt_data_rexmits[srt_data_rexmits == 2].count()
-	srt_data_rex_3_and_more_count = srt_data_rexmits[srt_data_rexmits > 2].count()
+	srt_data_rex_3x_count         = srt_data_rexmits[srt_data_rexmits == 3].count()
+	srt_data_rex_4x_count         = srt_data_rexmits[srt_data_rexmits == 4].count()
+	srt_data_rex_5x_more_count    = srt_data_rexmits[srt_data_rexmits > 4].count()
 
-	print(f"SRT Data payload:         {srt_data_org_pld * 8 / duration_sec / 1000000: .3f} Mbps")
+	print(f"Overall UDP rate:         {srt_packets[srt_data_i]['udp.length'].sum() * 8 / duration_sec / 1000000: .3f} Mbps")
+	print(f"SRT Data org+rexmit pld:  {srt_packets[srt_data_i]['data.len'].sum() * 8 / duration_sec / 1000000: .3f} Mbps")
+	print(f"SRT Data org payload:     {srt_data_org_pld * 8 / duration_sec / 1000000: .3f} Mbps")
 	print(f"SRT Data overhead:        {srt_data_org_udp / srt_data_org_pld * 100 - 100: .3f}%")
-	print(f"SRT Data lost:            {srt_data_lost / srt_data_org_count * 100: .3f}%")
+	print(f"SRT Data missing:         {srt_data_lost / srt_data_org_count * 100: .3f}%")
 	print(f"SRT Data rexmit overhead: {srt_data_rex_udp / srt_data_org_pld * 100: .3f}%")
 	print(f"SRT ACK overhead:         {srt_ack_udp / srt_data_org_pld * 100: .3f}%")
 	print(f"SRT ACKACK overhead:      {srt_ack_udp / srt_data_org_pld * 100: .3f}%")
 	print(f"SRT NAK overhead:         {srt_nak_udp / srt_data_org_pld * 100: .3f}%")
 
 	print("===========================================")
 	srt_overhead_bytes = srt_data_rex_udp + srt_ack_udp + srt_ackack_udp + srt_nak_udp
-	print(f"SRT overall overhead:     {srt_overhead_bytes / srt_data_org_pld * 100: .3f}%")
-	print(f"SRT Retransmitted:        {srt_data_rex_count / srt_data_org_count * 100: .3f}% of original packets")
-	print("including:")
-	print(f"    retransmitted twice:  {srt_data_rex_twice_count / srt_data_org_count * 100: .3f}% of original packets")
-	print(f"    retransmitted more:   {srt_data_rex_3_and_more_count / srt_data_org_count * 100: .3f}% of original packets")
+	print(f"SRT overall overhead:      {srt_overhead_bytes / srt_data_org_pld * 100: .3f}%")
+	print(f"SRT Data packets (org):     {srt_data_org_count}")
+	print(f"SRT retransmitted:          {srt_data_rexmits.count()} packets ({srt_data_rex_count} retransmissions)")
+	print(f"SRT DATA retransmisions:   {srt_data_rex_count / srt_data_org_count * 100: .3f}% × DATA packets")
+	print(f"SRT retransmitted:         {srt_data_rexmits.count() / srt_data_org_count * 100: .3f}% of original packets")
+	#print("Retransmitted = 1x Number once + 2x Number twice + Xx more")
+	print(f"    including retransmitted:")
+	print(f"    once:   {srt_data_rex_once_count / srt_data_org_count * 100: .3f}% of original packets")
+	print(f"    twice:  {srt_data_rex_twice_count / srt_data_org_count * 100: .3f}% of original packets")
+	print(f"    3×:     {srt_data_rex_3x_count / srt_data_org_count * 100: .3f}% of original packets")
+	print(f"    4×:     {srt_data_rex_4x_count / srt_data_org_count * 100: .3f}% of original packets")
+	print(f"    more:   {srt_data_rex_5x_more_count / srt_data_org_count * 100: .3f}% of original packets")
 
 	# TODO: add an option to print packets retransmitted more than once
+	#print(srt_data_rexmits.loc[47383194])
 	#print(srt_data_rexmits[srt_data_rexmits > 1])