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

uint64_t -> long long

Browse Source
This commit is contained in:
liuwentan
2023-02-22 15:22:41 +08:00
parent ac51c70426
commit 9578be5ff3
22 changed files with 175 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/inc_internal/maat_command.h
View File

@@ -28,7 +28,7 @@ struct maat_cmd_line
{
const char *table_name;
const char *table_line;
uint64_t rule_id; // for MAAT_OP_DEL, only rule_id and table_name are necessary.
long long rule_id; // for MAAT_OP_DEL, only rule_id and table_name are necessary.
int expire_after; //expired after $timeout$ seconds, set to 0 for never timeout.
};

8
src/inc_internal/maat_compile.h
View File

@@ -53,7 +53,7 @@ int compile_table_set_rule_ex_data_schema(struct compile_schema *compile_schema,
maat_rule_ex_dup_func_t *dup_func,
long argl, void *argp,
struct log_handle *logger);
void *compile_table_get_rule_ex_data(struct compile_schema *compile_schema, uint64_t compile_id, size_t idx);
void *compile_table_get_rule_ex_data(struct compile_schema *compile_schema, long long compile_id, size_t idx);
void compile_table_rule_ex_data_iterate(struct compile_schema *compile_schema, int idx);
size_t compile_table_rule_ex_data_schema_count(struct compile_schema *compile_schema);
@@ -68,7 +68,7 @@ int compile_runtime_update(void *compile_runtime, void *compile_schema,
const char *line, int valid_column);
int compile_runtime_commit(void *compile_runtime, const char *table_name);
int compile_runtime_match(struct compile_runtime *compile_rt, uint64_t *compile_ids,
int compile_runtime_match(struct compile_runtime *compile_rt, long long *compile_ids,
size_t compile_ids_size, struct maat_state *state);
size_t compile_runtime_get_hit_paths(struct compile_runtime *compile_rt,
@@ -92,7 +92,7 @@ struct maat_compile_state *maat_compile_state_new(int thread_id);
void maat_compile_state_free(struct maat_compile_state *compile_state);
int maat_compile_state_update(struct maat_item *item_hash, int vtable_id,
uint64_t *hit_item_ids, size_t hit_item_cnt,
long long *hit_item_ids, size_t hit_item_cnt,
size_t *n_hit_group_id, struct maat_state *state);
int maat_compile_state_has_NOT_clause(struct maat_compile_state *compile_state);
@@ -101,4 +101,4 @@ int maat_compile_state_has_NOT_clause(struct maat_compile_state *compile_state);
}
#endif
#endif
#endif

2
src/inc_internal/maat_flag.h
View File

@@ -46,7 +46,7 @@ int flag_runtime_commit(void *flag_runtime, const char *table_name);
*
* @retval the num of hit group_id
*/
int flag_runtime_scan(struct flag_runtime *flag_rt, int thread_id, uint64_t flag,
int flag_runtime_scan(struct flag_runtime *flag_rt, int thread_id, long long flag,
int vtable_id, struct maat_state *state);
void flag_runtime_scan_hit_inc(struct flag_runtime *flag_rt, int thread_id);

10
src/inc_internal/maat_group.h
View File

@@ -40,13 +40,13 @@ void group2group_runtime_free(void *g2g_runtime);
void maat_group_ref_inc(struct maat_group *group);
void maat_group_ref_dec(struct maat_group *group);
struct maat_group *group2group_runtime_add_group(void *g2g_runtime, uint64_t group_id);
struct maat_group *group2group_runtime_add_group(void *g2g_runtime, long long group_id);
void group2group_runtime_remove_group(void *g2g_runtime, struct maat_group *group);
struct maat_group *group2group_runtime_find_group(void *g2g_runtime, uint64_t group_id);
struct maat_group *group2group_runtime_find_group(void *g2g_runtime, long long group_id);
int group2group_runtime_build_top_groups(void *g2g_runtime);
int group2group_runtime_get_top_groups(void *g2g_runtime, uint64_t *group_ids,
size_t n_group_ids, uint64_t *top_group_ids);
int group2group_runtime_get_top_groups(void *g2g_runtime, long long *group_ids,
size_t n_group_ids, long long *top_group_ids);
int group2group_runtime_update(void *g2g_runtime, void *g2g_schema,
const char *line, int valid_column);
@@ -56,4 +56,4 @@ int group2group_runtime_commit(void *g2g_runtime, const char *table_name);
}
#endif
#endif
#endif

2
src/inc_internal/maat_interval.h
View File

@@ -47,7 +47,7 @@ int interval_runtime_commit(void *interval_runtime, const char *table_name);
* @retval the num of hit group_id
*/
int interval_runtime_scan(struct interval_runtime *interval_rt, int thread_id,
uint64_t integer, int vtable_id, struct maat_state *state);
long long integer, int vtable_id, struct maat_state *state);
void interval_runtime_scan_hit_inc(struct interval_runtime *interval_rt, int thread_id);
long long interval_runtime_scan_hit_sum(struct interval_runtime *interval_rt, int n_thread);

22
src/inc_internal/maat_rule.h
View File

@@ -61,7 +61,7 @@ enum tag_match {
};
struct maat_rule_head {
uint64_t config_id;
long long config_id;
char resevered;
int serv_def_len;
};
@@ -69,8 +69,8 @@ struct maat_rule_head {
#define ITEM_RULE_MAGIC 0x4d3c2b1a
struct maat_item_inner {
long long magic_num;
uint64_t item_id;
uint64_t group_id;
long long item_id;
long long group_id;
int district_id;
int expr_id_cnt;
int expr_id_lb; //low boundary
@@ -78,8 +78,8 @@ struct maat_item_inner {
};
struct maat_item {
uint64_t item_id;
uint64_t group_id;
long long item_id;
long long group_id;
UT_hash_handle hh;
void *user_data;
};
@@ -87,7 +87,7 @@ struct maat_item {
#define COMPILE_RULE_MAGIC 0x1a2b3c4d
struct compile_rule {
long long magic_num;
uint64_t compile_id;
long long compile_id;
struct maat_rule_head head;// fix len of Maat_rule_t
char *service_defined;
int declared_clause_num;
@@ -98,8 +98,8 @@ struct compile_rule {
};
struct group2group_rule {
uint64_t group_id;
uint64_t super_group_id;
long long group_id;
long long super_group_id;
};
struct maat_runtime {
@@ -254,11 +254,11 @@ size_t parse_accept_tag(const char *value, struct rule_tag **result, struct log_
int compare_accept_tag(const char *value, const struct rule_tag *accept_tags, size_t n_accept_tag);
struct maat_item *maat_item_new(uint64_t item_id, uint64_t group_id, void *user_data);
struct maat_item *maat_item_new(long long item_id, long long group_id, void *user_data);
void maat_item_free(struct maat_item *item, void (* item_user_data_free)(void *));
struct maat_item_inner *maat_item_inner_new(uint64_t group_id, uint64_t item_id, int district_id);
struct maat_item_inner *maat_item_inner_new(long long group_id, long long item_id, int district_id);
void maat_item_inner_free(void *item_inner);
@@ -319,4 +319,4 @@ void maat_cmd_set_serial_rule(struct serial_rule *rule, enum maat_operation op,
}
#endif
#endif
#endif