From 334092cf827c42892fc873e0b03f63bb074436b3 Mon Sep 17 00:00:00 2001 From: lijia Date: Fri, 19 Jun 2020 19:17:10 +0800 Subject: 按虚链路ID发包功能, 改为使用接口marsio_buff_set_rehash_index()设置rehash, 而不是设置ctrlzone的变量. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/dealpkt/deal_tcp.c | 2 ++ src/dealpkt/stream_manage.c | 1 + src/inner_plug/sapp_assistant.cpp | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/dealpkt/deal_tcp.c b/src/dealpkt/deal_tcp.c index 94a3dfe..1aeeb24 100644 --- a/src/dealpkt/deal_tcp.c +++ b/src/dealpkt/deal_tcp.c @@ -1408,6 +1408,8 @@ static int tcp_reset_stream(struct streamindex *pindex,const void *this_iphdr, dictator_free(threadnum, pstream_pr->synack_opt_array); pstream_pr->synack_opt_array = NULL; } + + free_polling_inject_context(pstream_pr); //2020-06-08 lijia add, for memory leak if(this_tcphdr->th_flags & TH_SYN){ tcp_add_new_stream_bysyn(pindex,this_iphdr,this_tcphdr,datalen,REUSE_OLD_LINK,raw_pkt); diff --git a/src/dealpkt/stream_manage.c b/src/dealpkt/stream_manage.c index 6f02c37..4ac7504 100644 --- a/src/dealpkt/stream_manage.c +++ b/src/dealpkt/stream_manage.c @@ -2795,6 +2795,7 @@ void free_polling_inject_context(struct streaminfo_private *pstream_pr) } dictator_free(thread_index, pstream_pr->polling_inject_context); + pstream_pr->polling_inject_context = NULL; } /* 全局流id, stream_index历史上已经表示单机内唯一id, 此处要保证集群所有机器不重复, 所以新建变? diff --git a/src/inner_plug/sapp_assistant.cpp b/src/inner_plug/sapp_assistant.cpp index 033e292..bed677b 100644 --- a/src/inner_plug/sapp_assistant.cpp +++ b/src/inner_plug/sapp_assistant.cpp @@ -584,7 +584,7 @@ int sapp_assistant_init(void) pthread_mutex_init(&g_plug_Independent_thread_mutex, NULL); if(sapp_global_val->config.cpu.send_only_threads_max_num > 0){ - g_plug_Independent_thread_pid = (pthread_t *)calloc(1, sizeof(pthread_t)); + g_plug_Independent_thread_pid = (pthread_t *)calloc(g_packet_io_thread_num + sapp_global_val->config.cpu.send_only_threads_max_num, sizeof(pthread_t)); } return 1; -- cgit v1.2.3