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

修复BUG：删除compile时，未置空group中的shortcut，导致region compile段错误(#16)

Browse Source
This commit is contained in:
zhengchao
2019-06-29 21:46:46 +06:00
parent 3b80abf265
commit 14a2691577
2 changed files with 32 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/entry/Maat_rule.cpp
View File

@@ -1947,6 +1947,7 @@ int add_group_to_compile(struct Maat_compile_group_relation*relation, struct Maa
relation->not_flag[write_pos]=0; relation->not_flag[write_pos]=0;
} }
relation->group_cnt++; relation->group_cnt++;
a_rule_group->ref_by_parent_cnt++;
//member group->compile_shortcut may set to NULL and compile rule pointer repeatly,until rule build finish. //member group->compile_shortcut may set to NULL and compile rule pointer repeatly,until rule build finish.
if(a_rule_group->ref_by_parent_cnt==1&&relation->group_cnt==1) if(a_rule_group->ref_by_parent_cnt==1&&relation->group_cnt==1)
{ {
@@ -1956,7 +1957,6 @@ int add_group_to_compile(struct Maat_compile_group_relation*relation, struct Maa
{ {
a_rule_group->compile_shortcut=NULL; a_rule_group->compile_shortcut=NULL;
} }
a_rule_group->ref_by_parent_cnt++;
//update group's shortcut when compile has more than one group. //update group's shortcut when compile has more than one group.
if(relation->group_cnt!=1) if(relation->group_cnt!=1)
{ {
@@ -1995,6 +1995,12 @@ struct Maat_group_inner* del_group_from_compile(struct Maat_compile_group_relati
relation->not_group_cnt--; relation->not_group_cnt--;
relation->not_flag[i]=0; relation->not_flag[i]=0;
} }
if(group_rule->compile_shortcut)
{
assert(group_rule->compile_shortcut==relation);
assert(group_rule->ref_by_parent_cnt==1&&relation->group_cnt==1);
group_rule->compile_shortcut=NULL;
}
relation->group_cnt--; relation->group_cnt--;
break; break;
} }
@@ -2499,6 +2505,12 @@ int add_group_rule(struct Maat_table_desc* table, struct db_group_rule_t* db_gro
{ {
parent_group=create_group_rule(db_group_rule->parent_id, table->table_id, scanner); parent_group=create_group_rule(db_group_rule->parent_id, table->table_id, scanner);
} }
//A sub group is not possile to have a compile shortcut.
if(group_rule->compile_shortcut)
{
assert(group_rule->ref_by_parent_cnt==1);
group_rule->compile_shortcut=NULL;
}
group_rule->ref_by_parent_cnt++; group_rule->ref_by_parent_cnt++;
parent_group->ref_by_children_cnt++; parent_group->ref_by_children_cnt++;
ret=igraph_get_eid(&scanner->group_graph, &edge_id, group_rule->vertex_id, parent_group->vertex_id, IGRAPH_DIRECTED, /*error*/ 0); ret=igraph_get_eid(&scanner->group_graph, &edge_id, group_rule->vertex_id, parent_group->vertex_id, IGRAPH_DIRECTED, /*error*/ 0);

36
src/inc_internal/Maat_rule_internal.h
View File

@@ -135,23 +135,6 @@ struct Maat_region_inner
int expr_id_ub; int expr_id_ub;
enum MAAT_TABLE_TYPE table_type; enum MAAT_TABLE_TYPE table_type;
}; };
struct Maat_group_inner
{
int group_id;
int table_id;
int region_boundary;
int region_cnt;
int ref_by_parent_cnt;
int ref_by_children_cnt;
char* group_name;
int has_compile_neighbors;
int vertex_id;
int top_group_cnt;
long long* top_groups;
dynamic_array_t *regions;
void* compile_shortcut;
pthread_mutex_t mutex;
};
#define COMPILE_RELATION_MAGIC 0x1a2b3c4d #define COMPILE_RELATION_MAGIC 0x1a2b3c4d
struct Maat_compile_group_relation struct Maat_compile_group_relation
{ {
@@ -166,6 +149,25 @@ struct Maat_compile_group_relation
pthread_rwlock_t rwlock;//reading compile rule is safe in update thread, rwlock lock called when delete or scan thread read pthread_rwlock_t rwlock;//reading compile rule is safe in update thread, rwlock lock called when delete or scan thread read
}; };
struct Maat_group_inner
{
int group_id;
int table_id;
int region_boundary;
int region_cnt;
int ref_by_parent_cnt;
int ref_by_children_cnt;
char* group_name;
int has_compile_neighbors;
int vertex_id;
int top_group_cnt;
long long* top_groups;
dynamic_array_t *regions;
struct Maat_compile_group_relation* compile_shortcut;
pthread_mutex_t mutex;
};
struct _compile_result_t struct _compile_result_t
{ {
int compile_id; int compile_id;