diff options
| author | yangwei <[email protected]> | 2024-08-23 17:55:02 +0800 |
|---|---|---|
| committer | yangwei <[email protected]> | 2024-08-23 17:55:02 +0800 |
| commit | ad01deabef9d3137e181b88901c9a1609d2cb64c (patch) | |
| tree | 9c2ed25306009e9f22175e8079d53054017dc8c1 | |
| parent | 2ef4c8f3cad74fa4291129c7047a3bfdca5a3861 (diff) | |
✨ feat(rename nouse to discard): set tcp max stream num separately
| -rw-r--r-- | include/private/sapp_global_val.h | 4 | ||||
| -rw-r--r-- | src/config/config_parse.cpp | 4 | ||||
| -rw-r--r-- | src/dealpkt/stream_manage.c | 4 | ||||
| -rw-r--r-- | src/sapp_dev/sapp_init.c | 50 |
4 files changed, 33 insertions, 29 deletions
diff --git a/include/private/sapp_global_val.h b/include/private/sapp_global_val.h index 51a8152..87671a0 100644 --- a/include/private/sapp_global_val.h +++ b/include/private/sapp_global_val.h @@ -106,7 +106,9 @@ typedef struct{ int max_timeouts_per_sec; int max_opening_per_sec; int reorder_on_closing; - int fast_close_nouse; + int fast_close_discard; + int max_opening; + int max_discard; }sapp_config_stream_tcp_t; diff --git a/src/config/config_parse.cpp b/src/config/config_parse.cpp index af8ac32..5d83953 100644 --- a/src/config/config_parse.cpp +++ b/src/config/config_parse.cpp @@ -1684,13 +1684,15 @@ int sapp_parse_config(void) tomlc99_wrap_load_string_def(ABBR_CFG_FILE_MAIN_ENTRY, (char *)"STREAM", (char *)"stream_id_base_time", pconfig->stream.stream_id_base_time_str, 32, ""); tomlc99_wrap_load_int_def(ABBR_CFG_FILE_MAIN_ENTRY, (char *)"stream.tcp", (char *)"max", (int *)&pconfig->stream.tcp.max, 50000); + tomlc99_wrap_load_int_def(ABBR_CFG_FILE_MAIN_ENTRY, (char *)"stream.tcp", (char *)"max_opening", (int *)&pconfig->stream.tcp.max_opening, pconfig->stream.tcp.max*3); + tomlc99_wrap_load_int_def(ABBR_CFG_FILE_MAIN_ENTRY, (char *)"stream.tcp", (char *)"max_discard", (int *)&pconfig->stream.tcp.max_discard, pconfig->stream.tcp.max*2); tomlc99_wrap_load_int_def(ABBR_CFG_FILE_MAIN_ENTRY, (char *)"stream.tcp", (char *)"timeout", (int *)&pconfig->stream.tcp.timeout, 180); if(pconfig->stream.tcp.timeout == 0)pconfig->stream.tcp.timeout=MAX_DEFALUT_TIMEOUT_S; tomlc99_wrap_load_int_def(ABBR_CFG_FILE_MAIN_ENTRY, (char *)"stream.tcp", (char *)"syn_mandatory", (int *)&pconfig->stream.tcp.syn_mandatory, 1); tomlc99_wrap_load_int_def(ABBR_CFG_FILE_MAIN_ENTRY, (char *)"stream.tcp", (char *)"reorder_pkt_max", (int *)&pconfig->stream.tcp.reorder_pkt_max, 5); tomlc99_wrap_load_int_def(ABBR_CFG_FILE_MAIN_ENTRY, (char *)"stream.tcp", (char *)"reorder_on_closing", (int *)&pconfig->stream.tcp.reorder_on_closing, 0); - tomlc99_wrap_load_int_def(ABBR_CFG_FILE_MAIN_ENTRY, (char *)"stream.tcp", (char *)"fast_close_nouse", (int *)&pconfig->stream.tcp.fast_close_nouse, 0); + tomlc99_wrap_load_int_def(ABBR_CFG_FILE_MAIN_ENTRY, (char *)"stream.tcp", (char *)"fast_close_discard", (int *)&pconfig->stream.tcp.fast_close_discard, 0); tomlc99_wrap_load_int_def(ABBR_CFG_FILE_MAIN_ENTRY, (char *)"stream.tcp", (char *)"analyse_option_enabled", (int *)&pconfig->stream.tcp.analyse_option_enabled, 1); tomlc99_wrap_load_int_def(ABBR_CFG_FILE_MAIN_ENTRY, (char *)"stream.tcp", (char *)"tuple4_reuse_time_interval", (int *)&pconfig->stream.tcp.tuple4_reuse_time_interval, 30); tomlc99_wrap_load_int_def(ABBR_CFG_FILE_MAIN_ENTRY, (char *)"stream.tcp", (char *)"meaningful_statistics_minimum_pkt", (int *)&pconfig->stream.tcp.meaningful_statistics_minimum_pkt, 3); diff --git a/src/dealpkt/stream_manage.c b/src/dealpkt/stream_manage.c index 9041dad..6b10eb9 100644 --- a/src/dealpkt/stream_manage.c +++ b/src/dealpkt/stream_manage.c @@ -343,7 +343,7 @@ void streamaddlist(struct streamindex *pindex,struct stream_list *plist) next_timeout_ms = tcp_opening_timeout * 1000 + g_CurrentTime_ms; } else if ((pstream->stream_state == TCP_NOUSE_STATE && pstream->type == STREAM_TYPE_TCP) && - (sapp_global_val->config.stream.tcp.fast_close_nouse == 1)) + (sapp_global_val->config.stream.tcp.fast_close_discard == 1)) { if(pstream_pr->set_special_timeout==0) { @@ -551,7 +551,7 @@ int lrustream(struct streamindex *pindex) timeouts_add(plist->streamindex_timer, &pindex->timeout, tcp_opening_timeout * 1000 + g_CurrentTime_ms); } else if (pstream->stream_state == TCP_NOUSE_STATE && pstream->type == STREAM_TYPE_TCP && - (sapp_global_val->config.stream.tcp.fast_close_nouse == 1)) + (sapp_global_val->config.stream.tcp.fast_close_discard == 1)) { if(pstream_pr->set_special_timeout==0) { diff --git a/src/sapp_dev/sapp_init.c b/src/sapp_dev/sapp_init.c index 5c1d247..ddac21e 100644 --- a/src/sapp_dev/sapp_init.c +++ b/src/sapp_dev/sapp_init.c @@ -32,7 +32,7 @@ extern int g_raw_pkt_broken_check; extern int g_skip_ethernet_layer_sw; //extern int g_kill_tcp_remedy_sw; extern int g_encapsulate_with_ddp; -extern int g_encapsulate_with_L2E; /* ʹ��DDPЭ���װ��x27ԭʼIP�� */ +extern int g_encapsulate_with_L2E; /* ʹ��DDPЭ���װ��x27ԭʼIP�� */ extern int g_PollingFunNum; extern int packet_io_set_ipv6_raw_socket_enable(int op_switch); @@ -60,17 +60,17 @@ extern volatile unsigned long g_sapp_destory_env_done_state; static void sapp_platform_finish_up(void) { /* - �½��ļ���: ./sapp_status/ + �½��ļ���: ./sapp_status/ - �����ע��ɹ���project tag �б�, project_list.status, + �����ע��ɹ���project tag �б�, project_list.status, name, type - ������в���ļ�����Ϣ, �����dzɹ����Dz��ɹ�, Ҫ��ÿ��cat | grep runtime.log + ������в���ļ�����Ϣ, �����dzɹ����Dz��ɹ�, Ҫ��ÿ��cat | grep runtime.log plug_load.status, plug_name, plug_path, state(succ,fail) - ���sapp״̬Ǩ�Ʊ仯��ʱ���¼, sapp_state.staus: + ���sapp״̬Ǩ�Ʊ仯��ʱ���¼, sapp_state.staus: start_time state 01:00:00 just_start 01:00:01 platform_init @@ -102,7 +102,7 @@ int MESA_platform_init(int argc, char *argv[]) ipv4_frag_init(g_iThreadNum, 1024 * 512); ipv6_frag_init(g_iThreadNum, 1024 * 256); - tcp_set_stream_num(max_tcp_stream_num*3,max_tcp_stream_num,max_tcp_stream_num*2); + tcp_set_stream_num(sapp_global_val->config.stream.tcp.max_opening,max_tcp_stream_num,sapp_global_val->config.stream.tcp.max_discard); udp_set_stream_num(sapp_global_val->config.stream.udp.max_opening,sapp_global_val->config.stream.udp.max_pair,sapp_global_val->config.stream.udp.max); MESA_load_profile_int_def("conf/main.conf","Module", "timedelay_threshold", &int_tmp, 10000000); @@ -226,12 +226,12 @@ int MESA_platform_init(int argc, char *argv[]) //MESA_load_profile_int_def((char *)"conf/main.conf", (char *)"Module", (char *)"reverse_ethernet_addr", &g_reverse_ethernet_addr_sw, 0); - /* ƽ̨���ù̶������IJ�� */ + /* ƽ̨���ù̶������IJ�� */ stream_register_udp_raw(udp_teredo_identify_entry); //stream_register_udp_raw(udp_gtp_identify_entry); stream_register_udp(udp_l2tp_identify_entry); - /* 2020-12-23 lijia add, vxlan���������� */ + /* 2020-12-23 lijia add, vxlan���������� */ if(DEPLOYMENT_MODE_INLINE == sapp_global_val->config.packet_io.deployment_mode_bin){ stream_register_overlay_ip((IPv4_CB_FUN_T)gdev_keepalive_ip_entry); stream_register_overlay_udp(gdev_keepalive_udp_entry); @@ -244,8 +244,8 @@ int MESA_platform_init(int argc, char *argv[]) MESA_load_profile_int_def((char *)"conf/main.conf", (char *)"Module", (char *)"symbol_conflict_check", &int_tmp,0); if(int_tmp != 0){ - /* NOTE: ���������һ��Ҫ��plugctrl_proc(), �����в������֮��, Ĭ�Ͽ��� */ - symbol_check(); /* 2016-01-13 Lijia add, ���ȫ�ַ�������ͻ */ + /* NOTE: ���������һ��Ҫ��plugctrl_proc(), �����в������֮��, Ĭ�Ͽ��� */ + symbol_check(); /* 2016-01-13 Lijia add, ���ȫ�ַ�������ͻ */ } sapp_global_val_sanity_check(); @@ -260,19 +260,19 @@ int MESA_platform_init(int argc, char *argv[]) /* 2017-02-24 lijia modify, NOTE: - �ȳ�ʼ�����, ����ڲ����ܻ����pthread_create��̬�����߳�, - ������, ��DPDKģʽ��, dpdk��ʼ���ξͻ��ǰ�̵߳�ijCPU����, - ��ô������pthread_create���߳�Ĭ�ϼ̳������Ϊ, - ����, �ȳ�ʼ���߳��ٳ�ʼ��packet_io. + �ȳ�ʼ�����, ����ڲ����ܻ����pthread_create��̬�����߳�, + ������, ��DPDKģʽ��, dpdk��ʼ���ξͻ��ǰ�̵߳�ijCPU����, + ��ô������pthread_create���߳�Ĭ�ϼ̳������Ϊ, + ����, �ȳ�ʼ���߳��ٳ�ʼ��packet_io. */ /* - 2019-04-11, marsio�Ѿ�����������, �ٻָ����ȵ���packet_io_init(), �����plugctrl(). + 2019-04-11, marsio�Ѿ�����������, �ٻָ����ȵ���packet_io_init(), �����plugctrl(). */ /* - 2020-09-15, ���packet_io_init�ȵ���, �����Ѿ����հ�����, - ���Dz�����ܻ�û��ʼ�����, sapp����������ʼ�հ�, ������������, �������л��������˻ᵼ�¶���, - �ij��ȵ���plugctrl(), �����packet_io_init(). + 2020-09-15, ���packet_io_init�ȵ���, �����Ѿ����հ�����, + ���Dz�����ܻ�û��ʼ�����, sapp����������ʼ�հ�, ������������, �������л��������˻ᵼ�¶���, + �ij��ȵ���plugctrl(), �����packet_io_init(). */ @@ -282,11 +282,11 @@ int MESA_platform_init(int argc, char *argv[]) return -1; } - sapp_independent_thread_init(); /* Ҫ���ڲ����ʼ��֮ǰ, �����ʼ��ʱ������ independent_thread ���������߳� */ + sapp_independent_thread_init(); /* Ҫ���ڲ����ʼ��֮ǰ, �����ʼ��ʱ������ independent_thread ���������߳� */ sapp_dup_pkt_init(); - /* 2021-07-05, sapp_assistant_init()�ƶ���plugctrl_proc()֮��, Ҫ���Ѽ��ز������entry���б� */ + /* 2021-07-05, sapp_assistant_init()�ƶ���plugctrl_proc()֮��, Ҫ���Ѽ��ز������entry���б� */ if(sapp_metric_init() < 0){ return -1; } @@ -298,7 +298,7 @@ int MESA_platform_init(int argc, char *argv[]) return -1; } - sapp_platform_finish_up(); /* ֧�ֶ�̬project tagע��, ���������в����ʼ����ɺ����, ��һЩƽ̨��ʼ���ε���β���� */ + sapp_platform_finish_up(); /* ֧�ֶ�̬project tagע��, ���������в����ʼ����ɺ����, ��һЩƽ̨��ʼ���ε���β���� */ sapp_set_current_state(SAPP_STATE_PLUG_INITED); sapp_set_current_state(SAPP_STATE_PKT_IO_INITED); @@ -310,7 +310,7 @@ int MESA_platform_init(int argc, char *argv[]) return 0; } -/* ��鱾�����Ƿ�ͨ��SYSTEMD���� */ +/* ��鱾�����Ƿ�ͨ��SYSTEMD���� */ static int check_is_started_by_notify() { char *notify_socket = getenv("NOTIFY_SOCKET"); @@ -320,10 +320,10 @@ static int check_is_started_by_notify() void MESA_platform_run(void) { /* - ʹ��atexit()ע��ĺ���, ������ע�ắ���෴, ���Ծ������Ӻ�atexit()ע��λ��, - �������г�ʼ�����֮��, packet_io_run()֮ǰ�� + ʹ��atexit()ע��ĺ���, ������ע�ắ���෴, ���Ծ������Ӻ�atexit()ע��λ��, + �������г�ʼ�����֮��, packet_io_run()֮ǰ�� - ������sapp_gval_destroy()֮��, ȫ�ֱ���sapp_global_val����free��, �˴���ʱ��һ��. + ������sapp_gval_destroy()֮��, ȫ�ֱ���sapp_global_val����free��, �˴���ʱ��һ��. */ __sapp_timer_platform_run(); |
