optimize session manager config

2 files changed, 98 insertions, 102 deletions

diff --git a/test/decoders/http/test_based_on_stellar/env/stellar.toml b/test/decoders/http/test_based_on_stellar/env/stellar.toml
index b472a69..d741b1c 100644
--- a/test/decoders/http/test_based_on_stellar/env/stellar.toml
+++ b/test/decoders/http/test_based_on_stellar/env/stellar.toml
@@ -1,67 +1,65 @@
 [snowflake]
-snowflake_base = 1   # [0, 31]
-snowflake_offset = 2 # [0, 127]
+    snowflake_base = 1   # [0, 31]
+    snowflake_offset = 2 # [0, 127]
 
 [packet_io]
-mode = "pcapfile"                      # pcapfile, pcaplist, marsio
-app_symbol = "stellar"
-dev_symbol = "nf_0_fw"
-pcap_path = "./pcap/test.pcap"
-nr_worker_thread = 1                   # range: [1, 256]
-cpu_mask = [5, 6, 7, 8, 9, 10, 11, 12]
-idle_yield_interval_ms = 900           # range: [0, 60000] (ms)
+    mode = "pcapfile"                      # pcapfile, pcaplist, marsio
+    app_symbol = "stellar"
+    dev_symbol = "nf_0_fw"
+    pcap_path = "./pcap/test.pcap"
+    nr_worker_thread = 1                   # range: [1, 256]
+    cpu_mask = [5, 6, 7, 8, 9, 10, 11, 12]
+    idle_yield_interval_ms = 900           # range: [0, 60000] (ms)
 
 [ip_reassembly]
-enable = 1
-bucket_entries = 32 # range: [1, 4294967295] (must be power of 2)
-bucket_num = 1024   # range: [1, 4294967295]
+    enable = 1
+    bucket_entries = 32 # range: [1, 4294967295] (must be power of 2)
+    bucket_num = 1024   # range: [1, 4294967295]
 
-ip_frag_timeout_ms = 10000             # range: [1, 60000] (ms)
-ip_frag_expire_polling_interval_ms = 0 # range: [0, 60000] (ms)
-ip_frag_expire_polling_limit = 1024    # range: [1, 1024]
+    ip_frag_timeout_ms = 10000             # range: [1, 60000] (ms)
+    ip_frag_expire_polling_interval_ms = 0 # range: [0, 60000] (ms)
+    ip_frag_expire_polling_limit = 1024    # range: [1, 1024]
 
 [session_manager]
-# max session number
-max_tcp_session_num = 50000
-max_udp_session_num = 50000
+    tcp_session_max = 50000
+    udp_session_max = 50000
 
-# session overload evict
-tcp_overload_evict_old_sess = 1 # 1: evict old session, 0: bypass new session
-udp_overload_evict_old_sess = 1 # 1: evict old session, 0: bypass new session
+    evict_old_on_tcp_table_limit = 1 # range: [0, 1]
+    evict_old_on_udp_table_limit = 1 # range: [0, 1]
 
-# TCP timeout
-tcp_init_timeout_ms = 50           # range: [1, 60000] (ms)
-tcp_handshake_timeout_ms = 50      # range: [1, 60000] (ms)
-tcp_data_timeout_ms = 50           # range: [1, 15999999000] (ms)
-tcp_half_closed_timeout_ms = 50    # range: [1, 604800000] (ms)
-tcp_time_wait_timeout_ms = 50      # range: [1, 600000] (ms)
-tcp_discard_timeout_ms = 10        # range: [1, 15999999000] (ms)
-tcp_unverified_rst_timeout_ms = 50 # range: [1, 600000] (ms)
-# UDP timeout
-udp_data_timeout_ms = 50    # range: [1, 15999999000] (ms)
-udp_discard_timeout_ms = 50 # range: [1, 15999999000] (ms)
+    expire_period_ms = 0    # range: [0, 60000] (ms)
+    expire_batch_max = 1024 # range: [1, 1024]
 
-# limit 
-session_expire_polling_interval_ms = 0 # range: [0, 60000] (ms)
-session_expire_polling_limit = 1024    # range: [1, 1024]
+    [session_manager.tcp_timeout_ms]
+        init = 5000             # range: [1, 60000] (ms)
+        handshake = 5000        # range: [1, 60000] (ms)
+        data = 5000             # range: [1, 15999999000] (ms)
+        half_closed = 5000      # range: [1, 604800000] (ms)
+        time_wait = 5000        # range: [1, 600000] (ms)
+        discard_default = 10000 # range: [1, 15999999000] (ms)
+        unverified_rst = 5000   # range: [1, 600000] (ms)
 
-# duplicate packet filter
-duplicated_packet_filter_enable = 1
-duplicated_packet_filter_capacity = 1000000   # range: [1, 4294967295]
-duplicated_packet_filter_timeout_ms = 10000   # range: [1, 60000] (ms)
-duplicated_packet_filter_error_rate = 0.00001 # range: [0.0, 1.0]
+    [session_manager.udp_timeout_ms]
+        data = 5000            # range: [1, 15999999000] (ms)
+        discard_default = 5000 # range: [1, 15999999000] (ms)
 
-# evicted session filter
-evicted_session_filter_enable = 1
-evicted_session_filter_capacity = 1000000   # range: [1, 4294967295]
-evicted_session_filter_timeout_ms = 10000   # range: [1, 60000] (ms)
-evicted_session_filter_error_rate = 0.00001 # range: [0.0, 1.0]
+    [session_manager.duplicated_packet_bloom_filter]
+        enable = 1
+        capacity = 1000000     # range: [1, 4294967295]
+        time_window_ms = 10000 # range: [1, 60000] (ms)
+        error_rate = 0.00001   # range: [0.0, 1.0]
 
-# TCP reassembly (Per direction)
-tcp_reassembly_enable = 1
-tcp_reassembly_max_timeout_ms = 10000 # range: [1, 60000] (ms)
-tcp_reassembly_max_segments = 256     # range: [2, 4096]
+    [session_manager.evicted_session_bloom_filter]
+        enable = 1             # range: [0, 1]
+        capacity = 1000000     # range: [1, 4294967295]
+        time_window_ms = 10000 # range: [1, 60000] (ms)
+        error_rate = 0.00001   # range: [0.0, 1.0]
+
+    [session_manager.tcp_reassembly]
+        enable = 1                  # range: [0, 1]
+        timeout_ms = 10000          # range: [1, 60000] (ms)
+        buffered_segments_max = 256 # range: [2, 4096] per flow
 
 [schedule]
-merge_stat_interval = 50  # range: [1, 60000] (ms)
-output_stat_interval = 10 # range: [1, 60000] (ms)
+    merge_stat_interval = 500   # range: [1, 60000] (ms)
+    output_stat_interval = 2000 # range: [1, 60000] (ms)
diff --git a/test/packet_inject/conf/stellar.toml b/test/packet_inject/conf/stellar.toml
index 4791358..ee4c8cb 100644
--- a/test/packet_inject/conf/stellar.toml
+++ b/test/packet_inject/conf/stellar.toml
@@ -1,67 +1,65 @@
 [snowflake]
-snowflake_base = 1   # [0, 31]
-snowflake_offset = 2 # [0, 127]
+    snowflake_base = 1   # [0, 31]
+    snowflake_offset = 2 # [0, 127]
 
 [packet_io]
-mode = "pcapfile"            # pcapfile, pcaplist, marsio
-app_symbol = "stellar"
-dev_symbol = "nf_0_fw"
-pcap_path = "/tmp/test.pcap"
-nr_worker_thread = 1         # range: [1, 256]
-cpu_mask = [5]
-idle_yield_interval_ms = 900 # range: [0, 60000] (ms)
+    mode = "pcapfile"                      # pcapfile, pcaplist, marsio
+    app_symbol = "stellar"
+    dev_symbol = "nf_0_fw"
+    pcap_path = "/tmp/test.pcap"
+    nr_worker_thread = 1                   # range: [1, 256]
+    cpu_mask = [5, 6, 7, 8, 9, 10, 11, 12]
+    idle_yield_interval_ms = 900           # range: [0, 60000] (ms)
 
 [ip_reassembly]
-enable = 1
-bucket_entries = 32 # range: [1, 4294967295] (must be power of 2)
-bucket_num = 1024   # range: [1, 4294967295]
+    enable = 1
+    bucket_entries = 32 # range: [1, 4294967295] (must be power of 2)
+    bucket_num = 1024   # range: [1, 4294967295]
 
-ip_frag_timeout_ms = 10000             # range: [1, 60000] (ms)
-ip_frag_expire_polling_interval_ms = 0 # range: [0, 60000] (ms)
-ip_frag_expire_polling_limit = 1024    # range: [1, 1024]
+    ip_frag_timeout_ms = 10000             # range: [1, 60000] (ms)
+    ip_frag_expire_polling_interval_ms = 0 # range: [0, 60000] (ms)
+    ip_frag_expire_polling_limit = 1024    # range: [1, 1024]
 
 [session_manager]
-# max session number
-max_tcp_session_num = 50000
-max_udp_session_num = 50000
+    tcp_session_max = 50000
+    udp_session_max = 50000
 
-# session overload evict
-tcp_overload_evict_old_sess = 1 # 1: evict old session, 0: bypass new session
-udp_overload_evict_old_sess = 1 # 1: evict old session, 0: bypass new session
+    evict_old_on_tcp_table_limit = 1 # range: [0, 1]
+    evict_old_on_udp_table_limit = 1 # range: [0, 1]
 
-# TCP timeout
-tcp_init_timeout_ms = 50           # range: [1, 60000] (ms)
-tcp_handshake_timeout_ms = 50      # range: [1, 60000] (ms)
-tcp_data_timeout_ms = 50           # range: [1, 15999999000] (ms)
-tcp_half_closed_timeout_ms = 50    # range: [1, 604800000] (ms)
-tcp_time_wait_timeout_ms = 50      # range: [1, 600000] (ms)
-tcp_discard_timeout_ms = 50        # range: [1, 15999999000] (ms)
-tcp_unverified_rst_timeout_ms = 50 # range: [1, 600000] (ms)
-# UDP timeout
-udp_data_timeout_ms = 50    # range: [1, 15999999000] (ms)
-udp_discard_timeout_ms = 50 # range: [1, 15999999000] (ms)
+    expire_period_ms = 0    # range: [0, 60000] (ms)
+    expire_batch_max = 1024 # range: [1, 1024]
 
-# limit 
-session_expire_polling_interval_ms = 0 # range: [0, 60000] (ms)
-session_expire_polling_limit = 1024    # range: [1, 1024]
+    [session_manager.tcp_timeout_ms]
+        init = 5000             # range: [1, 60000] (ms)
+        handshake = 5000        # range: [1, 60000] (ms)
+        data = 5000             # range: [1, 15999999000] (ms)
+        half_closed = 5000      # range: [1, 604800000] (ms)
+        time_wait = 5000        # range: [1, 600000] (ms)
+        discard_default = 10000 # range: [1, 15999999000] (ms)
+        unverified_rst = 5000   # range: [1, 600000] (ms)
 
-# duplicate packet filter
-duplicated_packet_filter_enable = 1
-duplicated_packet_filter_capacity = 1000000   # range: [1, 4294967295]
-duplicated_packet_filter_timeout_ms = 100     # range: [1, 60000] (ms)
-duplicated_packet_filter_error_rate = 0.00001 # range: [0.0, 1.0]
+    [session_manager.udp_timeout_ms]
+        data = 5000            # range: [1, 15999999000] (ms)
+        discard_default = 5000 # range: [1, 15999999000] (ms)
 
-# evicted session filter
-evicted_session_filter_enable = 1
-evicted_session_filter_capacity = 1000000   # range: [1, 4294967295]
-evicted_session_filter_timeout_ms = 100     # range: [1, 60000] (ms)
-evicted_session_filter_error_rate = 0.00001 # range: [0.0, 1.0]
+    [session_manager.duplicated_packet_bloom_filter]
+        enable = 1
+        capacity = 1000000     # range: [1, 4294967295]
+        time_window_ms = 10000 # range: [1, 60000] (ms)
+        error_rate = 0.00001   # range: [0.0, 1.0]
 
-# TCP reassembly (Per direction)
-tcp_reassembly_enable = 1
-tcp_reassembly_max_timeout_ms = 10000 # range: [1, 60000] (ms)
-tcp_reassembly_max_segments = 128     # range: [2, 4096]
+    [session_manager.evicted_session_bloom_filter]
+        enable = 1             # range: [0, 1]
+        capacity = 1000000     # range: [1, 4294967295]
+        time_window_ms = 10000 # range: [1, 60000] (ms)
+        error_rate = 0.00001   # range: [0.0, 1.0]
+
+    [session_manager.tcp_reassembly]
+        enable = 1                  # range: [0, 1]
+        timeout_ms = 10000          # range: [1, 60000] (ms)
+        buffered_segments_max = 256 # range: [2, 4096] per flow
 
 [schedule]
-merge_stat_interval = 50    # range: [1, 60000] (ms)
-output_stat_interval = 2000 # range: [1, 60000] (ms)
+    merge_stat_interval = 500   # range: [1, 60000] (ms)
+    output_stat_interval = 2000 # range: [1, 60000] (ms)