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

fix multi compile table hit path bug

Browse Source
This commit is contained in:
liuwentan
2023-03-06 14:09:52 +08:00
parent cf5c8353e3
commit 9ff724af02
4 changed files with 103 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/maat_api.c
View File

@@ -1789,20 +1789,20 @@ size_t maat_get_hit_paths(struct maat *maat_instance, struct maat_state *state,
compile_table_cnt = state->n_compile_table;
}
size_t hit_path_index = 0;
//size_t sum_hit_paths = 0;
size_t sum_hit_path = 0;
for (size_t i = 0; i < compile_table_cnt; i++) {
void *compile_rt = table_manager_get_runtime(maat_instance->tbl_mgr, compile_table_ids[i]);
void *g2g_runtime = table_manager_get_runtime(maat_instance->tbl_mgr, maat_instance->g2g_table_id);
assert(NULL != compile_rt && NULL != g2g_runtime);
size_t n_hit_path = compile_runtime_get_hit_paths((struct compile_runtime *)compile_rt,
(struct group2group_runtime *)g2g_runtime,
state->compile_state, paths, hit_path_index,
state->compile_state, paths, sum_hit_path,
n_path);
hit_path_index += n_hit_path;
sum_hit_path += n_hit_path;
}
return hit_path_index;
return sum_hit_path;
}
size_t maat_get_hit_objects(struct maat_compile_state *compile_state,

77
src/maat_compile.c
View File

@@ -137,6 +137,7 @@ struct maat_internal_hit_path {
struct maat_compile_state {
int thread_id;
int Nth_scan;
int Nth_get_hit_path;
time_t hier_ver;
size_t this_scan_hit_item_cnt;
int not_clause_hitted_flag;
@@ -1277,41 +1278,44 @@ size_t compile_runtime_get_hit_paths(struct compile_runtime *compile_rt,
size_t hit_path_cnt = hit_path_index;
size_t new_hit_path_cnt = 0;
for (i = 0; i < utarray_len(compile_state->internal_hit_paths); i++) {
internal_path = (struct maat_internal_hit_path *)utarray_eltptr(compile_state->internal_hit_paths, i);
/*
NOTE: maybe one item has been deleted, but it's item_id still exist in internal_hit_paths
*/
long long top_group_ids[MAX_SCANNER_HIT_GROUP_NUM];
memset(top_group_ids, 0, sizeof(top_group_ids));
int top_group_cnt = group2group_runtime_get_top_groups(g2g_rt, &(internal_path->group_id),
1, top_group_ids);
if (top_group_cnt <= 0) {
/*
item->group_id has no top group, this group can only be referenced by compile
------------------------------------------------------------------------------
for example:
compile1 -> group1 -> group2 -> item1
group3 -> item2
group1 and group3 has no top group
group1 is referenced by compile1, group3 is not referenced by any compile
NOTE: Add the hit path as long as the item is hit
size_t tmp_path_cnt = utarray_len(compile_state->internal_hit_paths);
if (0 == compile_state->Nth_get_hit_path) {
for (i = 0; i < utarray_len(compile_state->internal_hit_paths); i++) {
internal_path = (struct maat_internal_hit_path *)utarray_eltptr(compile_state->internal_hit_paths, i);
/*
NOTE: maybe one item has been deleted, but it's item_id still exist in internal_hit_paths
*/
top_group_cnt = 1; //add one hit path which top_group_ids[0] = -1
}
long long top_group_ids[MAX_SCANNER_HIT_GROUP_NUM];
memset(top_group_ids, 0, sizeof(top_group_ids));
int top_group_cnt = group2group_runtime_get_top_groups(g2g_rt, &(internal_path->group_id),
1, top_group_ids);
if (top_group_cnt <= 0) {
/*
item->group_id has no top group, this group can only be referenced by compile
------------------------------------------------------------------------------
for example:
compile1 -> group1 -> group2 -> item1
group3 -> item2
for (int j = 0; j < top_group_cnt && hit_path_cnt < hit_path_size; j++, hit_path_cnt++) {
hit_paths[hit_path_cnt].Nth_scan = internal_path->Nth_scan;
hit_paths[hit_path_cnt].item_id = internal_path->item_id;
hit_paths[hit_path_cnt].sub_group_id = internal_path->group_id;
hit_paths[hit_path_cnt].top_group_id = top_group_ids[j]; //top_group_id may be -1
hit_paths[hit_path_cnt].vtable_id = internal_path->vtable_id;
hit_paths[hit_path_cnt].compile_id = -1;
group1 and group3 has no top group
group1 is referenced by compile1, group3 is not referenced by any compile
NOTE: Add the hit path as long as the item is hit
*/
top_group_cnt = 1; // add one hit path which top_group_ids[0] = -1
}
for (int j = 0; j < top_group_cnt && hit_path_cnt < hit_path_size; j++, hit_path_cnt++) {
hit_paths[hit_path_cnt].Nth_scan = internal_path->Nth_scan;
hit_paths[hit_path_cnt].item_id = internal_path->item_id;
hit_paths[hit_path_cnt].sub_group_id = internal_path->group_id;
hit_paths[hit_path_cnt].top_group_id = top_group_ids[j]; // top_group_id may be -1
hit_paths[hit_path_cnt].vtable_id = internal_path->vtable_id;
hit_paths[hit_path_cnt].compile_id = -1;
}
}
}
}
/* assign hit_paths[].compile_id */
struct maat_compile *compile = NULL;
@@ -1353,7 +1357,14 @@ size_t compile_runtime_get_hit_paths(struct compile_runtime *compile_rt,
}
}
return hit_path_cnt + new_hit_path_cnt;
if (0 == compile_state->Nth_get_hit_path) {
hit_path_cnt += new_hit_path_cnt;
} else {
hit_path_cnt = new_hit_path_cnt;
}
compile_state->Nth_get_hit_path++;
return hit_path_cnt;
}
void maat_compile_state_update_hit_path(struct maat_compile_state *compile_state,

2
src/maat_table.c
View File

@@ -617,7 +617,7 @@ void table_manager_runtime_destroy(struct table_manager *tbl_mgr)
if (NULL == runtime) {
continue;
}
enum table_type table_type = table_manager_get_table_type(tbl_mgr, i);
maat_table_runtime_free(runtime, table_type);
tbl_mgr->tbl[i]->runtime = NULL;