TSG-7770, sapp支持按不同模块统计自身所占用的内存.

3 files changed, 14 insertions, 14 deletions

diff --git a/src/project/project_requirement.c b/src/project/project_requirement.c
index 809bbba..76c4c62 100644
--- a/src/project/project_requirement.c
+++ b/src/project/project_requirement.c
@@ -432,7 +432,7 @@ const void *project_req_get_struct(const struct streaminfo *stream, int project_
 }

 

 

-void project_requirement_destroy(int thread_num, void *pproject)

+void project_requirement_destroy(int mem_use_type, int thread_num, void *pproject)

 {

 	int i;

 	project_req_info_t *pinfo;

@@ -447,7 +447,7 @@ void project_requirement_destroy(int thread_num, void *pproject)
 		if(PROGECT_REQ_VALUE_TYPE_STRUCT == G_PROJECT_REQ_MANAGE[i].project_req_type){

 			if(pinfo[i].value != 0){

 				if(G_PROJECT_REQ_MANAGE[i].free_cb != NULL){

-					(*(G_PROJECT_REQ_MANAGE[i].free_cb))(thread_num, (void *)pinfo[i].value);

+					(*(G_PROJECT_REQ_MANAGE[i].free_cb))(thread_num, (void *)pinfo[i].value); /* ����Լ�������ڴ��޷�ͳ��  */

 				}

 #if 0				

 				else{

@@ -462,13 +462,13 @@ void project_requirement_destroy(int thread_num, void *pproject)
 		}

 	}

 

-	dictator_free(thread_num, pproject);

+	sapp_mem_free((sapp_mem_type_t)mem_use_type, thread_num, pproject);

 

 	return;

 }

 

 /* �½�һ�����ṹʱ���� */

-void *project_requirement_create(int thread_num)

+void *project_requirement_create(int mem_use_type, int thread_num)

 {

 	project_req_info_t *pinfo;

 

@@ -476,7 +476,7 @@ void *project_requirement_create(int thread_num)
 		return NULL;

 	}

 

-	pinfo = (project_req_info_t *)dictator_malloc(thread_num, sizeof(project_req_info_t) * G_PROJECT_PLUG_NUM);

+	pinfo = (project_req_info_t *)sapp_mem_malloc((sapp_mem_type_t)mem_use_type,thread_num, sizeof(project_req_info_t) * G_PROJECT_PLUG_NUM);

 	memset(pinfo, 0, sizeof(project_req_info_t) * G_PROJECT_PLUG_NUM);

 

 	return (void *)pinfo;

@@ -524,7 +524,7 @@ int project_req_terminal_tag_init(void)
 

 static void udp_flow_stat_free(int thread_seq, void *project_req_value)

 {

-	dictator_free(thread_seq, project_req_value);

+	sapp_mem_free(SAPP_MEM_DYN_UDP_FLOW_STAT, thread_seq, project_req_value);

 

 	return;

 }

diff --git a/src/project/raw_ip_frag_list.c b/src/project/raw_ip_frag_list.c
index 616b8f4..434eb50 100644
--- a/src/project/raw_ip_frag_list.c
+++ b/src/project/raw_ip_frag_list.c
@@ -49,9 +49,9 @@ int frags_list_append(struct frag_ipq *ipq, const raw_pkt_t *raw_pkt, int type,
 	}

 

 	pkt_len = raw_pkt->raw_pkt_len - raw_pkt->overlay_layer_bytes; /* 2021-07-29 lijia modify, inlineģʽ��, ԭʼip��Ƭ��������overlay�� */

-	save_pkt_ptr = dictator_malloc(thread_num, pkt_len);

+	save_pkt_ptr = sapp_mem_malloc(SAPP_MEM_DYN_IP_FRAG_PKT, thread_num, pkt_len);

 	memcpy(save_pkt_ptr, raw_pkt->raw_pkt_data + raw_pkt->overlay_layer_bytes, pkt_len);

-	new_list_node = (raw_ipfrag_list_t *)dictator_malloc(thread_num, sizeof(raw_ipfrag_list_t));

+	new_list_node = (raw_ipfrag_list_t *)sapp_mem_malloc(SAPP_MEM_DYN_IP_FRAG_PKT,thread_num, sizeof(raw_ipfrag_list_t));

 	new_list_node->frag_packet = save_pkt_ptr;

 	new_list_node->pkt_len = pkt_len;

 	new_list_node->type = type;

@@ -92,8 +92,8 @@ void raw_frags_list_free_one(int thread_seq, void *project_req_value)
 	struct mesa_ip4_hdr *ip4hdr = (struct mesa_ip4_hdr *)((char *)free_node->frag_packet + 14);

 	printf("##### frag free  ip id:0x%x\n", ntohs(ip4hdr->ip_id));

 #endif		

-		dictator_free(thread_seq, free_node->frag_packet);

-		dictator_free(thread_seq, free_node);

+		sapp_mem_free(SAPP_MEM_DYN_IP_FRAG_PKT,thread_seq, free_node->frag_packet);

+		sapp_mem_free(SAPP_MEM_DYN_IP_FRAG_PKT,thread_seq, free_node);

 		free_node = next;

 	}

 

diff --git a/src/project/stream_bridge.c b/src/project/stream_bridge.c
index 4db7792..3765cd5 100644
--- a/src/project/stream_bridge.c
+++ b/src/project/stream_bridge.c
@@ -109,7 +109,7 @@ static int stream_bridege_create_new_bridge(const char *bridge_name)
 
 
 /* 新建一个流结构时调用 */
-void *stream_bridge_create_per_stream(int thread_num)
+void *stream_bridge_create_per_stream(int mem_used_type, int thread_num)
 {
 	stream_bridge_item_t *stream_bridge_array;
 
@@ -117,13 +117,13 @@ void *stream_bridge_create_per_stream(int thread_num)
 		return NULL;
 	}
 
-	stream_bridge_array = (stream_bridge_item_t *)dictator_malloc(thread_num, sizeof(stream_bridge_item_t) * g_stream_bridge_actual_num);
+	stream_bridge_array = (stream_bridge_item_t *)sapp_mem_malloc((sapp_mem_type_t)mem_used_type, thread_num, sizeof(stream_bridge_item_t) * g_stream_bridge_actual_num);
 	memset(stream_bridge_array, 0, sizeof(stream_bridge_item_t) * g_stream_bridge_actual_num);
 
 	return (void *)stream_bridge_array;
 }
 
-void stream_bridge_destroy_per_stream(const struct streaminfo *stream, void *pbridge)
+void stream_bridge_destroy_per_stream(int mem_used_type, const struct streaminfo *stream, void *pbridge)
 {
 	int i;
 	stream_bridge_item_t *bridge_array;
@@ -140,7 +140,7 @@ void stream_bridge_destroy_per_stream(const struct streaminfo *stream, void *pbr
 		}
 	}
 
-	dictator_free(stream->threadnum, pbridge);
+	sapp_mem_free((sapp_mem_type_t)mem_used_type, stream->threadnum, pbridge);
 
 	return;
 }