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

深度遍历group graph时，若分组不被其它分组引用，执行快速处理路径，提高加载性能。

Browse Source
This commit is contained in:
zhengchao
2019-07-28 20:42:17 +06:00
parent 3473cf6dd4
commit eadab7ecba
3 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/entry/Maat_rule.cpp
View File

@@ -1990,7 +1990,7 @@ int add_group_rule(struct Maat_table_desc* table, struct db_group_rule_t* db_gro
} }
else else
{ {
group_rule->has_compile_neighbors=1; group_rule->ref_by_compile_cnt++;
compile_rule=(struct Maat_compile_group_relation*)HASH_fetch_by_id(scanner->compile_hash, db_group_rule->parent_id); compile_rule=(struct Maat_compile_group_relation*)HASH_fetch_by_id(scanner->compile_hash, db_group_rule->parent_id);
if(compile_rule==NULL) if(compile_rule==NULL)
{ {
@@ -2092,6 +2092,7 @@ int del_group_rule(struct Maat_table_desc* table, struct db_group_rule_t* db_gro
{ {
destroy_compile_group_relation(relation, scanner); destroy_compile_group_relation(relation, scanner);
} }
group_rule->ref_by_compile_cnt--;
} }
destroy_group_rule(group_rule, DESTROY_GROUP_BY_PARENT, scanner); destroy_group_rule(group_rule, DESTROY_GROUP_BY_PARENT, scanner);
scanner->to_update_group_cnt++; scanner->to_update_group_cnt++;
@@ -3189,15 +3190,22 @@ void walk_group_hash(const uchar * key, uint size, void * data, void * user)
struct Maat_group_inner* parent_group=NULL; struct Maat_group_inner* parent_group=NULL;
struct Maat_scanner* scanner=(struct Maat_scanner*)user; struct Maat_scanner* scanner=(struct Maat_scanner*)user;
int tmp_vid=0; int tmp_vid=0;
size_t i=0, top_group_cnt=0;
long long* temp_group_ids=NULL;
if(group_rule->ref_by_compile_cnt==group_rule->ref_by_parent_cnt)
{
//fast path, group is only referenced by compile rules.
top_group_cnt=1;
temp_group_ids=ALLOC(long long, top_group_cnt);
temp_group_ids[0]=group_rule->group_id;
}
else
{
igraph_vector_t *vids=&(scanner->dfs_vids); igraph_vector_t *vids=&(scanner->dfs_vids);
igraph_dfs(&(scanner->group_graph), group_rule->vertex_id, IGRAPH_OUT, igraph_dfs(&(scanner->group_graph), group_rule->vertex_id, IGRAPH_OUT,
0, vids, NULL, NULL, NULL, NULL, NULL, NULL); 0, vids, NULL, NULL, NULL, NULL, NULL, NULL);
temp_group_ids=ALLOC(long long, effective_vertices_count(vids));
size_t i=0, top_group_cnt=0;
size_t parent_group_cnt=effective_vertices_count(vids);
long long* temp_group_ids=ALLOC(long long, parent_group_cnt);
for(i=0; i<(size_t)igraph_vector_size(vids); i++) for(i=0; i<(size_t)igraph_vector_size(vids); i++)
{ {
@@ -3207,13 +3215,13 @@ void walk_group_hash(const uchar * key, uint size, void * data, void * user)
break; break;
} }
parent_group=(struct Maat_group_inner*)HASH_fetch_by_id(scanner->vertex_id2group, tmp_vid); parent_group=(struct Maat_group_inner*)HASH_fetch_by_id(scanner->vertex_id2group, tmp_vid);
if(parent_group->has_compile_neighbors)//including itself if(parent_group->ref_by_compile_cnt>0)//including itself
{ {
temp_group_ids[top_group_cnt]=parent_group->group_id; temp_group_ids[top_group_cnt]=parent_group->group_id;
top_group_cnt++; top_group_cnt++;
} }
} }
}
pthread_mutex_lock(&(group_rule->mutex)); pthread_mutex_lock(&(group_rule->mutex));
free(group_rule->top_groups); free(group_rule->top_groups);
group_rule->top_group_cnt=top_group_cnt; group_rule->top_group_cnt=top_group_cnt;

2
src/inc_internal/Maat_rule_internal.h
View File

@@ -152,7 +152,7 @@ struct Maat_group_inner
int ref_by_parent_cnt; int ref_by_parent_cnt;
int ref_by_children_cnt; int ref_by_children_cnt;
char* group_name; char* group_name;
int has_compile_neighbors; int ref_by_compile_cnt;
int vertex_id; int vertex_id;
size_t top_group_cnt; size_t top_group_cnt;
long long* top_groups; long long* top_groups;

4
test/perf_test_maatframe.cpp
View File

@@ -105,9 +105,9 @@ Maat_feather_t MaatCMDPerfTest::_shared_feather;
void* MaatCMDPerfTest::logger; void* MaatCMDPerfTest::logger;
//Following tests must be coded/tested at last, for they stalled the maat update thread and interrupt other tests. //Following tests must be coded/tested at last, for they stalled the maat update thread and interrupt other tests.
TEST_F(MaatCMDPerfTest, SetExpr100K) TEST_F(MaatCMDPerfTest, SetExpr200K)
{ {
const int CMD_EXPR_NUM=100*1000; const int CMD_EXPR_NUM=200*1000;
const char* table_name="HTTP_URL"; const char* table_name="HTTP_URL";
const char* keywords1="Hiredis"; const char* keywords1="Hiredis";