From 9eda18ac948dc35996baf81940683bd5baea9858 Mon Sep 17 00:00:00 2001 From: Hanoh Haim Date: Tue, 3 Jan 2017 17:25:18 +0200 Subject: add not accurate timer wheel for better performance Signed-off-by: Hanoh Haim --- .../stf/examples/stf_active_flow.py | 7 ++++--- scripts/cfg/kiwi02_more_flows.yaml | 12 ++++++++++++ scripts/exp/imix-0-ex.erf | Bin 67928 -> 67928 bytes scripts/exp/imix-0.erf | Bin 67928 -> 67928 bytes scripts/exp/imix_v6-0-ex.erf | Bin 70720 -> 70720 bytes scripts/exp/imix_v6-0.erf | Bin 70720 -> 70720 bytes scripts/exp/limit_single_pkt-0-ex.erf | Bin 6512 -> 6600 bytes scripts/exp/limit_single_pkt-0.erf | Bin 6512 -> 6600 bytes scripts/exp/pcap_mode1-0.erf | Bin 91456 -> 91456 bytes scripts/exp/pcap_mode2-0-ex.erf | Bin 823104 -> 823104 bytes scripts/exp/rtsp_short1-0.erf | Bin 20024 -> 20024 bytes scripts/exp/rtsp_short1_ipv6_rxcheck.erf | Bin 21560 -> 21560 bytes scripts/exp/rtsp_short1_rxcheck.erf | Bin 20912 -> 20912 bytes scripts/exp/rtsp_short1_v6-0.erf | Bin 20672 -> 20672 bytes scripts/exp/rtsp_short2-0.erf | Bin 20024 -> 20024 bytes scripts/exp/rtsp_short2_v6-0.erf | Bin 20672 -> 20672 bytes scripts/exp/rtsp_short3-0.erf | Bin 20032 -> 20032 bytes scripts/exp/rtsp_short3_v6-0.erf | Bin 20696 -> 20696 bytes scripts/exp/sip_short1-0.erf | Bin 3576 -> 3576 bytes scripts/exp/sip_short1_v6-0.erf | Bin 3880 -> 3880 bytes scripts/exp/sip_short2-0.erf | Bin 3576 -> 3576 bytes scripts/exp/sip_short2_v6-0.erf | Bin 3880 -> 3880 bytes scripts/exp/sip_short3-0.erf | Bin 3584 -> 3584 bytes scripts/exp/sip_short3_v6-0.erf | Bin 3888 -> 3888 bytes 24 files changed, 16 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/automation/trex_control_plane/stf/examples/stf_active_flow.py b/scripts/automation/trex_control_plane/stf/examples/stf_active_flow.py index 0a72c9ac..8560a5db 100644 --- a/scripts/automation/trex_control_plane/stf/examples/stf_active_flow.py +++ b/scripts/automation/trex_control_plane/stf/examples/stf_active_flow.py @@ -14,8 +14,8 @@ def minimal_stateful_test(server,csv_file,a_active_flows): trex_client.start_trex( c = 7, m = 30000, -# f = 'cap2/cur_flow_single.yaml', - f = 'cap2/cur_flow.yaml', + f = 'cap2/cur_flow_single.yaml', +# f = 'cap2/cur_flow.yaml', d = 30, l = 1000, p=True, @@ -39,6 +39,7 @@ def minimal_stateful_test(server,csv_file,a_active_flows): print("WARNING QUEU WAS FULL"); tuple=(active_flows[-5],cpu_utl[-5],pps[-5],queue_full[-1]) + print(tuple) file_writer = csv.writer(test_file) file_writer.writerow(tuple); @@ -58,7 +59,7 @@ if __name__ == '__main__': max_flows = 8000000; min_flows = 100; active_flow = min_flows; - num_point = 10 + num_point = 40 factor = math.exp(math.log(max_flows/min_flows,math.e)/num_point); for i in range(num_point+1): print("<<=====================>>",i,math.floor(active_flow)) diff --git a/scripts/cfg/kiwi02_more_flows.yaml b/scripts/cfg/kiwi02_more_flows.yaml index a156d4f4..42735fdb 100644 --- a/scripts/cfg/kiwi02_more_flows.yaml +++ b/scripts/cfg/kiwi02_more_flows.yaml @@ -10,6 +10,18 @@ threads : [1,2,3,4] - socket : 1 threads : [8,9,10,11] + port_info: + - dest_mac : [0x00,0x00,0x00,0x01,0x00,0x00] + src_mac : [0x00,0x00,0x00,0x01,0x00,0x00] + + - dest_mac : [0x00,0x00,0x00,0x01,0x00,0x00] + src_mac : [0x00,0x00,0x00,0x01,0x00,0x00] + + - dest_mac : [0x00,0x00,0x00,0x01,0x00,0x00] + src_mac : [0x00,0x00,0x00,0x01,0x00,0x00] + + - dest_mac : [0x00,0x00,0x00,0x01,0x00,0x00] + src_mac : [0x00,0x00,0x00,0x01,0x00,0x00] memory : dp_flows : 4048576 diff --git a/scripts/exp/imix-0-ex.erf b/scripts/exp/imix-0-ex.erf index 6f5f4f07..b044cb70 100755 Binary files a/scripts/exp/imix-0-ex.erf and b/scripts/exp/imix-0-ex.erf differ diff --git a/scripts/exp/imix-0.erf b/scripts/exp/imix-0.erf index 6f5f4f07..b044cb70 100644 Binary files a/scripts/exp/imix-0.erf and b/scripts/exp/imix-0.erf differ diff --git a/scripts/exp/imix_v6-0-ex.erf b/scripts/exp/imix_v6-0-ex.erf index d52d8541..589300c2 100755 Binary files a/scripts/exp/imix_v6-0-ex.erf and b/scripts/exp/imix_v6-0-ex.erf differ diff --git a/scripts/exp/imix_v6-0.erf b/scripts/exp/imix_v6-0.erf index d52d8541..589300c2 100644 Binary files a/scripts/exp/imix_v6-0.erf and b/scripts/exp/imix_v6-0.erf differ diff --git a/scripts/exp/limit_single_pkt-0-ex.erf b/scripts/exp/limit_single_pkt-0-ex.erf index 344a25d0..0ec672fa 100755 Binary files a/scripts/exp/limit_single_pkt-0-ex.erf and b/scripts/exp/limit_single_pkt-0-ex.erf differ diff --git a/scripts/exp/limit_single_pkt-0.erf b/scripts/exp/limit_single_pkt-0.erf index 344a25d0..0ec672fa 100644 Binary files a/scripts/exp/limit_single_pkt-0.erf and b/scripts/exp/limit_single_pkt-0.erf differ diff --git a/scripts/exp/pcap_mode1-0.erf b/scripts/exp/pcap_mode1-0.erf index 72e14bef..1f043784 100644 Binary files a/scripts/exp/pcap_mode1-0.erf and b/scripts/exp/pcap_mode1-0.erf differ diff --git a/scripts/exp/pcap_mode2-0-ex.erf b/scripts/exp/pcap_mode2-0-ex.erf index dde7d7e2..3f6ff4c9 100755 Binary files a/scripts/exp/pcap_mode2-0-ex.erf and b/scripts/exp/pcap_mode2-0-ex.erf differ diff --git a/scripts/exp/rtsp_short1-0.erf b/scripts/exp/rtsp_short1-0.erf index d75f8f98..990edbeb 100644 Binary files a/scripts/exp/rtsp_short1-0.erf and b/scripts/exp/rtsp_short1-0.erf differ diff --git a/scripts/exp/rtsp_short1_ipv6_rxcheck.erf b/scripts/exp/rtsp_short1_ipv6_rxcheck.erf index 046e0a1e..a06fe3a7 100644 Binary files a/scripts/exp/rtsp_short1_ipv6_rxcheck.erf and b/scripts/exp/rtsp_short1_ipv6_rxcheck.erf differ diff --git a/scripts/exp/rtsp_short1_rxcheck.erf b/scripts/exp/rtsp_short1_rxcheck.erf index dc195ac0..b5f17783 100644 Binary files a/scripts/exp/rtsp_short1_rxcheck.erf and b/scripts/exp/rtsp_short1_rxcheck.erf differ diff --git a/scripts/exp/rtsp_short1_v6-0.erf b/scripts/exp/rtsp_short1_v6-0.erf index ba220161..2cb322ac 100644 Binary files a/scripts/exp/rtsp_short1_v6-0.erf and b/scripts/exp/rtsp_short1_v6-0.erf differ diff --git a/scripts/exp/rtsp_short2-0.erf b/scripts/exp/rtsp_short2-0.erf index d75f8f98..990edbeb 100644 Binary files a/scripts/exp/rtsp_short2-0.erf and b/scripts/exp/rtsp_short2-0.erf differ diff --git a/scripts/exp/rtsp_short2_v6-0.erf b/scripts/exp/rtsp_short2_v6-0.erf index ba220161..2cb322ac 100644 Binary files a/scripts/exp/rtsp_short2_v6-0.erf and b/scripts/exp/rtsp_short2_v6-0.erf differ diff --git a/scripts/exp/rtsp_short3-0.erf b/scripts/exp/rtsp_short3-0.erf index 57668046..1b178df9 100644 Binary files a/scripts/exp/rtsp_short3-0.erf and b/scripts/exp/rtsp_short3-0.erf differ diff --git a/scripts/exp/rtsp_short3_v6-0.erf b/scripts/exp/rtsp_short3_v6-0.erf index 49fa4c20..048c3b65 100644 Binary files a/scripts/exp/rtsp_short3_v6-0.erf and b/scripts/exp/rtsp_short3_v6-0.erf differ diff --git a/scripts/exp/sip_short1-0.erf b/scripts/exp/sip_short1-0.erf index ee1ddd13..4f8f33ce 100644 Binary files a/scripts/exp/sip_short1-0.erf and b/scripts/exp/sip_short1-0.erf differ diff --git a/scripts/exp/sip_short1_v6-0.erf b/scripts/exp/sip_short1_v6-0.erf index 573b5b8d..7ad1ad14 100644 Binary files a/scripts/exp/sip_short1_v6-0.erf and b/scripts/exp/sip_short1_v6-0.erf differ diff --git a/scripts/exp/sip_short2-0.erf b/scripts/exp/sip_short2-0.erf index ee1ddd13..4f8f33ce 100644 Binary files a/scripts/exp/sip_short2-0.erf and b/scripts/exp/sip_short2-0.erf differ diff --git a/scripts/exp/sip_short2_v6-0.erf b/scripts/exp/sip_short2_v6-0.erf index 573b5b8d..7ad1ad14 100644 Binary files a/scripts/exp/sip_short2_v6-0.erf and b/scripts/exp/sip_short2_v6-0.erf differ diff --git a/scripts/exp/sip_short3-0.erf b/scripts/exp/sip_short3-0.erf index 5f21788d..0d6c4796 100644 Binary files a/scripts/exp/sip_short3-0.erf and b/scripts/exp/sip_short3-0.erf differ diff --git a/scripts/exp/sip_short3_v6-0.erf b/scripts/exp/sip_short3_v6-0.erf index 35b95903..321754d1 100644 Binary files a/scripts/exp/sip_short3_v6-0.erf and b/scripts/exp/sip_short3_v6-0.erf differ -- cgit 1.2.3-korg