gfwleak/tango-tsg-master
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

适配MAAT4的plugin表的垃圾回收机制，减少原子操作

Browse Source
This commit is contained in:
liuxueli
2023-06-16 20:13:39 +08:00
parent 7cc941be4e
commit 910f97b3bf
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bin/tsg_static_tableinfo.json
View File

@@ -699,7 +699,8 @@
"custom": { "custom": {
"key": 1, "key": 1,
"key_type": "integer", "key_type": "integer",
"key_len": 8 "key_len": 8,
"gc_timeout_s":10
} }
}, },
{ {

2
src/tsg_action.cpp
View File

@@ -988,7 +988,7 @@ unsigned char tsg_enforing_deny_application(const struct streaminfo *a_stream, s
} }
state=tsg_do_deny_action(a_stream, &app_user_region, p_result, protocol, type, user_data); state=tsg_do_deny_action(a_stream, &app_user_region, p_result, protocol, type, user_data);
plugin_ex_data_app_id_dict_free(dict); //plugin_ex_data_app_id_dict_free(dict);
return state; return state;
} }

2
src/tsg_entry.cpp
View File

@@ -1613,7 +1613,7 @@ size_t session_app_id_and_properties_scan(const struct streaminfo *a_stream, str
set_app_timeout(a_stream, dict, &(srt_process_context->timeout)); set_app_timeout(a_stream, dict, &(srt_process_context->timeout));
plugin_ex_data_app_id_dict_free(dict); //plugin_ex_data_app_id_dict_free(dict);
} }
else else
{ {

16
src/tsg_rule.cpp
View File

@@ -773,8 +773,8 @@ void ex_data_app_id_dict_dup(int table_id, void **to, void **from, long argl, vo
{ {
if((*from)!=NULL) if((*from)!=NULL)
{ {
struct app_id_dict *dict=(struct app_id_dict *)(*from); //struct app_id_dict *dict=(struct app_id_dict *)(*from);
atomic_inc(&dict->ref_cnt); //atomic_inc(&dict->ref_cnt);
*to=*from; *to=*from;
} }
@@ -843,7 +843,7 @@ void ex_data_app_id_dict_new(const char *table_name, int table_id, const char* k
dict->characteristics_len=(char)strlen(dict->characteristics); dict->characteristics_len=(char)strlen(dict->characteristics);
} }
atomic_inc(&dict->ref_cnt); //atomic_inc(&dict->ref_cnt);
*ad=(void *)dict; *ad=(void *)dict;
tsg_stat_sync_exdata_add_update(SYNC_EXDATA_APP_ID_DICT, 1); tsg_stat_sync_exdata_add_update(SYNC_EXDATA_APP_ID_DICT, 1);
@@ -855,7 +855,7 @@ void ex_data_app_id_dict_free(int table_id, void **ad, long argl, void* argp)
if((*ad)!=NULL) if((*ad)!=NULL)
{ {
struct app_id_dict *dict=(struct app_id_dict *)(*ad); struct app_id_dict *dict=(struct app_id_dict *)(*ad);
if((__sync_sub_and_fetch(&dict->ref_cnt, 1) == 0)) //if((__sync_sub_and_fetch(&dict->ref_cnt, 1) == 0))
{ {
tsg_free_field(dict->app_name); tsg_free_field(dict->app_name);
tsg_free_field(dict->parent_app_name); tsg_free_field(dict->parent_app_name);
@@ -1312,9 +1312,9 @@ void ex_data_security_compile_new(const char *table_name, int table_id, const ch
void ex_data_security_compile_dup(int table_id, void **to, void **from, long argl, void *argp) void ex_data_security_compile_dup(int table_id, void **to, void **from, long argl, void *argp)
{ {
struct maat_compile *compile=(struct maat_compile *)(*from); if(*from!=NULL)
if(compile!=NULL)
{ {
struct maat_compile *compile=(struct maat_compile *)(*from);
atomic_inc(&compile->ref_cnt); atomic_inc(&compile->ref_cnt);
*to=*from; *to=*from;
} }
@@ -2973,7 +2973,7 @@ int tsg_get_app_name_by_id(struct maat *feather, int app_id, char *app_name, int
{ {
if((int)(dict->app_name_len) > app_name_len) if((int)(dict->app_name_len) > app_name_len)
{ {
ex_data_app_id_dict_free(g_tsg_maat_rt_para.plugin_tb[MAAT_PLUGIN_APP_ID_DICT].id, (void **)&dict, 0, NULL); //ex_data_app_id_dict_free(g_tsg_maat_rt_para.plugin_tb[MAAT_PLUGIN_APP_ID_DICT].id, (void **)&dict, 0, NULL);
return offset; return offset;
} }
@@ -2994,7 +2994,7 @@ int tsg_get_app_name_by_id(struct maat *feather, int app_id, char *app_name, int
app_name[offset]='\0'; app_name[offset]='\0';
} }
ex_data_app_id_dict_free(g_tsg_maat_rt_para.plugin_tb[MAAT_PLUGIN_APP_ID_DICT].id, (void **)&dict, 0, NULL); //ex_data_app_id_dict_free(g_tsg_maat_rt_para.plugin_tb[MAAT_PLUGIN_APP_ID_DICT].id, (void **)&dict, 0, NULL);
return offset; return offset;
} }