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

optimize maat_scan_xx API

Browse Source
This commit is contained in:
liuwentan
2023-03-28 14:07:44 +08:00
parent 4aa3498d79
commit e98627c9e7
7 changed files with 848 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
include/maat.h
View File

@@ -165,10 +165,10 @@ struct maat_state;
* MAAT_SCAN_HALF_HIT * MAAT_SCAN_HALF_HIT
* MAAT_SCAN_HIT * MAAT_SCAN_HIT
*/ */
int maat_scan_flag(struct maat *instance, int table_id, int thread_id, int maat_scan_flag(struct maat *instance, int table_id,
long long flag, long long *results, size_t n_result, long long flag, long long *results, size_t n_result,
size_t *n_hit_result, struct maat_state *state); size_t *n_hit_result, struct maat_state *state);
int maat_scan_integer(struct maat *instance, int table_id, int thread_id, int maat_scan_integer(struct maat *instance, int table_id,
long long integer, long long *results, size_t n_result, long long integer, long long *results, size_t n_result,
size_t *n_hit_result, struct maat_state *state); size_t *n_hit_result, struct maat_state *state);
@@ -177,39 +177,40 @@ int maat_scan_integer(struct maat *instance, int table_id, int thread_id,
* @param port: network port * @param port: network port
* @param protocol: -1(ANY protocol) 1(ICMP) 6(TCP) 17(UDP) * @param protocol: -1(ANY protocol) 1(ICMP) 6(TCP) 17(UDP)
*/ */
int maat_scan_ipv4(struct maat *instance, int table_id, int thread_id, int maat_scan_ipv4(struct maat *instance, int table_id,
uint32_t ip_addr, uint16_t port, int protocol, uint32_t ip_addr, uint16_t port, int protocol,
long long *results, size_t n_result, long long *results, size_t n_result,
size_t *n_hit_result, struct maat_state *state); size_t *n_hit_result, struct maat_state *state);
int maat_scan_ipv4_tuple4(struct maat *instance, int table_id, int thread_id, int maat_scan_ipv4_tuple4(struct maat *instance, int table_id,
const struct ipv4_tuple *tuple, long long *results, const struct ipv4_tuple *tuple, long long *results,
size_t n_result, size_t *n_hit_result, size_t n_result, size_t *n_hit_result,
struct maat_state *state); struct maat_state *state);
int maat_scan_ipv6(struct maat *instance, int table_id, int thread_id, int maat_scan_ipv6(struct maat *instance, int table_id,
uint8_t *ip_addr, uint16_t port, int protocol, uint8_t *ip_addr, uint16_t port, int protocol,
long long *results, size_t n_result, long long *results, size_t n_result,
size_t *n_hit_result, struct maat_state *state); size_t *n_hit_result, struct maat_state *state);
int maat_scan_ipv6_tuple4(struct maat *instance, int table_id, int thread_id, int maat_scan_ipv6_tuple4(struct maat *instance, int table_id,
const struct ipv6_tuple *tuple, long long *results, const struct ipv6_tuple *tuple, long long *results,
size_t n_result, size_t *n_hit_result, size_t n_result, size_t *n_hit_result,
struct maat_state *state); struct maat_state *state);
int maat_scan_string(struct maat *instance, int table_id, int thread_id, int maat_scan_string(struct maat *instance, int table_id,
const char *data, size_t data_len, long long *results, const char *data, size_t data_len, long long *results,
size_t n_result, size_t *n_hit_result, size_t n_result, size_t *n_hit_result,
struct maat_state *state); struct maat_state *state);
struct maat_stream; struct maat_stream;
struct maat_stream *maat_scan_stream_open(struct maat *instance, int table_id, int thread_id); struct maat_stream *maat_stream_new(struct maat *instance, int table_id,
struct maat_state *state);
int maat_scan_stream(struct maat_stream **stream, const char *data, int data_len, int maat_stream_scan(struct maat_stream *stream, const char *data, int data_len,
long long *results, size_t n_result, size_t *n_hit_result, long long *results, size_t n_result, size_t *n_hit_result,
struct maat_state *state); struct maat_state *state);
void maat_scan_stream_close(struct maat_stream **stream); void maat_stream_free(struct maat_stream *stream);
/* maat state API */ /* maat state API */
struct maat_state *maat_state_new(struct maat *instance, int thread_id); struct maat_state *maat_state_new(struct maat *instance, int thread_id);

3
src/inc_internal/maat_command.h
View File

@@ -40,6 +40,9 @@ struct maat_cmd_line {
*/ */
int maat_cmd_set_line(struct maat *maat_instance, const struct maat_cmd_line *line_rule); int maat_cmd_set_line(struct maat *maat_instance, const struct maat_cmd_line *line_rule);
int maat_cmd_set_file(struct maat *maat_instance, const char *key, const char *value,
size_t size, enum maat_operation op);
long long maat_cmd_incrby(struct maat *maat_instance, const char *key, int increment); long long maat_cmd_incrby(struct maat *maat_instance, const char *key, int increment);
long long maat_cmd_get_config_version(struct maat *maat_instance); long long maat_cmd_get_config_version(struct maat *maat_instance);

156
src/maat_api.c
View File

@@ -695,7 +695,7 @@ int generic_plugin_table_ex_schema_register(struct maat *maat_instance, int tabl
if (table_type == TABLE_TYPE_INVALID || valid_column < 0) { if (table_type == TABLE_TYPE_INVALID || valid_column < 0) {
return -1; return -1;
} }
generic_plugin_runtime_commit_ex_schema(runtime, schema, table_id, table_type, valid_column); generic_plugin_runtime_commit_ex_schema(runtime, schema, table_id, table_type, valid_column);
} }
@@ -1112,7 +1112,8 @@ int string_scan(struct table_manager *tbl_mgr, int thread_id, const char *data,
return group_hit_cnt; return group_hit_cnt;
} }
int expr_stream_scan(struct maat_stream *stream, const char *data, size_t data_len, struct maat_state *state) int expr_stream_scan(struct maat_stream *stream, const char *data, size_t data_len,
struct maat_state *state)
{ {
if (NULL == stream || NULL == data) { if (NULL == stream || NULL == data) {
return 0; return 0;
@@ -1169,13 +1170,13 @@ size_t group_to_compile(struct maat *maat_instance, long long *results, size_t n
return n_hit_compile; return n_hit_compile;
} }
int maat_scan_flag(struct maat *maat_instance, int table_id, int thread_id, int maat_scan_flag(struct maat *maat_instance, int table_id,
long long flag, long long *results, size_t n_result, long long flag, long long *results, size_t n_result,
size_t *n_hit_result, struct maat_state *state) size_t *n_hit_result, struct maat_state *state)
{ {
if ((NULL == maat_instance) || table_id < 0 || table_id >= MAX_TABLE_NUM if ((NULL == maat_instance) || table_id < 0 || table_id >= MAX_TABLE_NUM
|| (thread_id < 0) || (NULL == results) || (0 == n_result) || (NULL == results) || (0 == n_result) || (NULL == state) ||
|| (NULL == state)) { (state->thread_id < 0)) {
return MAAT_SCAN_ERR; return MAAT_SCAN_ERR;
} }
@@ -1184,7 +1185,7 @@ int maat_scan_flag(struct maat *maat_instance, int table_id, int thread_id,
if (NULL == maat_instance->maat_rt) { if (NULL == maat_instance->maat_rt) {
log_error(maat_instance->logger, MODULE_MAAT_API, log_error(maat_instance->logger, MODULE_MAAT_API,
"[%s:%d] table(table_id:%d) thread_id:%d maat_scan_flag error because of maat_runtime is NULL", "[%s:%d] table(table_id:%d) thread_id:%d maat_scan_flag error because of maat_runtime is NULL",
__FUNCTION__, __LINE__, table_id, thread_id); __FUNCTION__, __LINE__, table_id, state->thread_id);
return MAAT_SCAN_OK; return MAAT_SCAN_OK;
} }
@@ -1207,10 +1208,10 @@ int maat_scan_flag(struct maat *maat_instance, int table_id, int thread_id,
return MAAT_SCAN_ERR; return MAAT_SCAN_ERR;
} }
maat_runtime_ref_inc(maat_instance->maat_rt, thread_id); maat_runtime_ref_inc(maat_instance->maat_rt, state->thread_id);
alignment_int64_array_add(maat_instance->thread_call_cnt, thread_id, 1); alignment_int64_array_add(maat_instance->thread_call_cnt, state->thread_id, 1);
int hit_group_cnt = flag_scan(maat_instance->tbl_mgr, thread_id, flag, int hit_group_cnt = flag_scan(maat_instance->tbl_mgr, state->thread_id, flag,
physical_table_id, vtable_id, state); physical_table_id, vtable_id, state);
if (hit_group_cnt < 0) { if (hit_group_cnt < 0) {
return MAAT_SCAN_ERR; return MAAT_SCAN_ERR;
@@ -1224,10 +1225,10 @@ int maat_scan_flag(struct maat *maat_instance, int table_id, int thread_id,
} }
if (sum_hit_compile_cnt > 0) { if (sum_hit_compile_cnt > 0) {
alignment_int64_array_add(maat_instance->hit_cnt, thread_id, 1); alignment_int64_array_add(maat_instance->hit_cnt, state->thread_id, 1);
if (0 == hit_group_cnt) { if (0 == hit_group_cnt) {
//hit NOT group //hit NOT group
alignment_int64_array_add(maat_instance->not_grp_hit_cnt, thread_id, 1); alignment_int64_array_add(maat_instance->not_grp_hit_cnt, state->thread_id, 1);
} }
return MAAT_SCAN_HIT; return MAAT_SCAN_HIT;
} else { } else {
@@ -1237,18 +1238,18 @@ int maat_scan_flag(struct maat *maat_instance, int table_id, int thread_id,
} }
} }
maat_runtime_ref_dec(maat_instance->maat_rt, thread_id); maat_runtime_ref_dec(maat_instance->maat_rt, state->thread_id);
return MAAT_SCAN_OK; return MAAT_SCAN_OK;
} }
int maat_scan_integer(struct maat *maat_instance, int table_id, int thread_id, int maat_scan_integer(struct maat *maat_instance, int table_id,
long long integer, long long *results, size_t n_result, long long integer, long long *results, size_t n_result,
size_t *n_hit_result, struct maat_state *state) size_t *n_hit_result, struct maat_state *state)
{ {
if ((NULL == maat_instance) || table_id < 0 || table_id >= MAX_TABLE_NUM if ((NULL == maat_instance) || table_id < 0 || table_id >= MAX_TABLE_NUM
|| (thread_id < 0) || (NULL == results) || (0 == n_result) || || (NULL == results) || (0 == n_result) || (NULL == state) ||
(NULL == state)) { (state->thread_id < 0)) {
return MAAT_SCAN_ERR; return MAAT_SCAN_ERR;
} }
@@ -1257,7 +1258,7 @@ int maat_scan_integer(struct maat *maat_instance, int table_id, int thread_id,
if (NULL == maat_instance->maat_rt) { if (NULL == maat_instance->maat_rt) {
log_error(maat_instance->logger, MODULE_MAAT_API, log_error(maat_instance->logger, MODULE_MAAT_API,
"[%s:%d] table(table_id:%d) thread_id:%d maat_scan_integer error because of maat_runtime is NULL", "[%s:%d] table(table_id:%d) thread_id:%d maat_scan_integer error because of maat_runtime is NULL",
__FUNCTION__, __LINE__, table_id, thread_id); __FUNCTION__, __LINE__, table_id, state->thread_id);
return MAAT_SCAN_OK; return MAAT_SCAN_OK;
} }
@@ -1280,10 +1281,10 @@ int maat_scan_integer(struct maat *maat_instance, int table_id, int thread_id,
return MAAT_SCAN_ERR; return MAAT_SCAN_ERR;
} }
maat_runtime_ref_inc(maat_instance->maat_rt, thread_id); maat_runtime_ref_inc(maat_instance->maat_rt, state->thread_id);
alignment_int64_array_add(maat_instance->thread_call_cnt, thread_id, 1); alignment_int64_array_add(maat_instance->thread_call_cnt, state->thread_id, 1);
int hit_group_cnt = interval_scan(maat_instance->tbl_mgr, thread_id, integer, int hit_group_cnt = interval_scan(maat_instance->tbl_mgr, state->thread_id, integer,
physical_table_id, vtable_id, state); physical_table_id, vtable_id, state);
if (hit_group_cnt < 0) { if (hit_group_cnt < 0) {
return MAAT_SCAN_ERR; return MAAT_SCAN_ERR;
@@ -1297,10 +1298,10 @@ int maat_scan_integer(struct maat *maat_instance, int table_id, int thread_id,
} }
if (sum_hit_compile_cnt > 0) { if (sum_hit_compile_cnt > 0) {
alignment_int64_array_add(maat_instance->hit_cnt, thread_id, 1); alignment_int64_array_add(maat_instance->hit_cnt, state->thread_id, 1);
if (0 == hit_group_cnt) { if (0 == hit_group_cnt) {
//hit NOT group //hit NOT group
alignment_int64_array_add(maat_instance->not_grp_hit_cnt, thread_id, 1); alignment_int64_array_add(maat_instance->not_grp_hit_cnt, state->thread_id, 1);
} }
return MAAT_SCAN_HIT; return MAAT_SCAN_HIT;
} else { } else {
@@ -1310,19 +1311,19 @@ int maat_scan_integer(struct maat *maat_instance, int table_id, int thread_id,
} }
} }
maat_runtime_ref_dec(maat_instance->maat_rt, thread_id); maat_runtime_ref_dec(maat_instance->maat_rt, state->thread_id);
return MAAT_SCAN_OK; return MAAT_SCAN_OK;
} }
int maat_scan_ipv4(struct maat *maat_instance, int table_id, int thread_id, int maat_scan_ipv4(struct maat *maat_instance, int table_id,
uint32_t ip_addr, uint16_t port, int protocol, uint32_t ip_addr, uint16_t port, int protocol,
long long *results, size_t n_result, long long *results, size_t n_result,
size_t *n_hit_result, struct maat_state *state) size_t *n_hit_result, struct maat_state *state)
{ {
if ((NULL == maat_instance) || table_id < 0 || table_id >= MAX_TABLE_NUM if ((NULL == maat_instance) || table_id < 0 || table_id >= MAX_TABLE_NUM
|| (protocol < -1) || (thread_id < 0) || (NULL == results) || (0 == n_result) || (protocol < -1) || (NULL == results) || (0 == n_result)
|| (NULL == state)) { || (NULL == state) || (state->thread_id < 0)) {
return MAAT_SCAN_ERR; return MAAT_SCAN_ERR;
} }
@@ -1331,7 +1332,7 @@ int maat_scan_ipv4(struct maat *maat_instance, int table_id, int thread_id,
if (NULL == maat_instance->maat_rt) { if (NULL == maat_instance->maat_rt) {
log_error(maat_instance->logger, MODULE_MAAT_API, log_error(maat_instance->logger, MODULE_MAAT_API,
"[%s:%d] table(table_id:%d) thread_id:%d maat_scan_ipv4 error because of maat_runtime is NULL", "[%s:%d] table(table_id:%d) thread_id:%d maat_scan_ipv4 error because of maat_runtime is NULL",
__FUNCTION__, __LINE__, table_id, thread_id); __FUNCTION__, __LINE__, table_id, state->thread_id);
return MAAT_SCAN_OK; return MAAT_SCAN_OK;
} }
@@ -1354,10 +1355,10 @@ int maat_scan_ipv4(struct maat *maat_instance, int table_id, int thread_id,
return MAAT_SCAN_ERR; return MAAT_SCAN_ERR;
} }
maat_runtime_ref_inc(maat_instance->maat_rt, thread_id); maat_runtime_ref_inc(maat_instance->maat_rt, state->thread_id);
alignment_int64_array_add(maat_instance->thread_call_cnt, thread_id, 1); alignment_int64_array_add(maat_instance->thread_call_cnt, state->thread_id, 1);
int hit_group_cnt = ipv4_scan(maat_instance->tbl_mgr, thread_id, ip_addr, port, protocol, int hit_group_cnt = ipv4_scan(maat_instance->tbl_mgr, state->thread_id, ip_addr, port, protocol,
physical_table_id, vtable_id, state); physical_table_id, vtable_id, state);
if (hit_group_cnt < 0) { if (hit_group_cnt < 0) {
return MAAT_SCAN_ERR; return MAAT_SCAN_ERR;
@@ -1371,10 +1372,10 @@ int maat_scan_ipv4(struct maat *maat_instance, int table_id, int thread_id,
} }
if (sum_hit_compile_cnt > 0) { if (sum_hit_compile_cnt > 0) {
alignment_int64_array_add(maat_instance->hit_cnt, thread_id, 1); alignment_int64_array_add(maat_instance->hit_cnt, state->thread_id, 1);
if (0 == hit_group_cnt) { if (0 == hit_group_cnt) {
//hit NOT group //hit NOT group
alignment_int64_array_add(maat_instance->not_grp_hit_cnt, thread_id, 1); alignment_int64_array_add(maat_instance->not_grp_hit_cnt, state->thread_id, 1);
} }
return MAAT_SCAN_HIT; return MAAT_SCAN_HIT;
} else { } else {
@@ -1384,12 +1385,12 @@ int maat_scan_ipv4(struct maat *maat_instance, int table_id, int thread_id,
} }
} }
maat_runtime_ref_dec(maat_instance->maat_rt, thread_id); maat_runtime_ref_dec(maat_instance->maat_rt, state->thread_id);
return MAAT_SCAN_OK; return MAAT_SCAN_OK;
} }
int maat_scan_ipv4_tuple4(struct maat *instance, int table_id, int thread_id, int maat_scan_ipv4_tuple4(struct maat *instance, int table_id,
const struct ipv4_tuple *tuple4, long long *results, const struct ipv4_tuple *tuple4, long long *results,
size_t n_result, size_t *n_hit_result, size_t n_result, size_t *n_hit_result,
struct maat_state *state) struct maat_state *state)
@@ -1397,14 +1398,14 @@ int maat_scan_ipv4_tuple4(struct maat *instance, int table_id, int thread_id,
return MAAT_SCAN_OK; return MAAT_SCAN_OK;
} }
int maat_scan_ipv6(struct maat *maat_instance, int table_id, int thread_id, int maat_scan_ipv6(struct maat *maat_instance, int table_id,
uint8_t *ip_addr, uint16_t port, int protocol, uint8_t *ip_addr, uint16_t port, int protocol,
long long *results, size_t n_result, long long *results, size_t n_result,
size_t *n_hit_result, struct maat_state *state) size_t *n_hit_result, struct maat_state *state)
{ {
if ((NULL == maat_instance) || table_id < 0 || table_id >= MAX_TABLE_NUM if ((NULL == maat_instance) || table_id < 0 || table_id >= MAX_TABLE_NUM
|| (protocol < -1) || (thread_id < 0) || (NULL == ip_addr) || (protocol < -1) || (NULL == ip_addr) || (NULL == results)
|| (NULL == results) || (0 == n_result) || (NULL == state)) { || (0 == n_result) || (NULL == state) || (state->thread_id < 0)) {
return MAAT_SCAN_ERR; return MAAT_SCAN_ERR;
} }
@@ -1413,7 +1414,7 @@ int maat_scan_ipv6(struct maat *maat_instance, int table_id, int thread_id,
if (NULL == maat_instance->maat_rt) { if (NULL == maat_instance->maat_rt) {
log_error(maat_instance->logger, MODULE_MAAT_API, log_error(maat_instance->logger, MODULE_MAAT_API,
"[%s:%d] table(table_id:%d) thread_id:%d maat_scan_ipv6 error because of maat_runtime is NULL", "[%s:%d] table(table_id:%d) thread_id:%d maat_scan_ipv6 error because of maat_runtime is NULL",
__FUNCTION__, __LINE__, table_id, thread_id); __FUNCTION__, __LINE__, table_id, state->thread_id);
return MAAT_SCAN_OK; return MAAT_SCAN_OK;
} }
@@ -1436,10 +1437,10 @@ int maat_scan_ipv6(struct maat *maat_instance, int table_id, int thread_id,
return MAAT_SCAN_ERR; return MAAT_SCAN_ERR;
} }
maat_runtime_ref_inc(maat_instance->maat_rt, thread_id); maat_runtime_ref_inc(maat_instance->maat_rt, state->thread_id);
alignment_int64_array_add(maat_instance->thread_call_cnt, thread_id, 1); alignment_int64_array_add(maat_instance->thread_call_cnt, state->thread_id, 1);
int hit_group_cnt = ipv6_scan(maat_instance->tbl_mgr, thread_id, ip_addr, port, protocol, int hit_group_cnt = ipv6_scan(maat_instance->tbl_mgr, state->thread_id, ip_addr, port, protocol,
physical_table_id, vtable_id, state); physical_table_id, vtable_id, state);
if (hit_group_cnt < 0) { if (hit_group_cnt < 0) {
return MAAT_SCAN_ERR; return MAAT_SCAN_ERR;
@@ -1453,10 +1454,10 @@ int maat_scan_ipv6(struct maat *maat_instance, int table_id, int thread_id,
} }
if (sum_hit_compile_cnt > 0) { if (sum_hit_compile_cnt > 0) {
alignment_int64_array_add(maat_instance->hit_cnt, thread_id, 1); alignment_int64_array_add(maat_instance->hit_cnt, state->thread_id, 1);
if (0 == hit_group_cnt) { if (0 == hit_group_cnt) {
//hit NOT group //hit NOT group
alignment_int64_array_add(maat_instance->not_grp_hit_cnt, thread_id, 1); alignment_int64_array_add(maat_instance->not_grp_hit_cnt, state->thread_id, 1);
} }
return MAAT_SCAN_HIT; return MAAT_SCAN_HIT;
} else { } else {
@@ -1466,12 +1467,12 @@ int maat_scan_ipv6(struct maat *maat_instance, int table_id, int thread_id,
} }
} }
maat_runtime_ref_dec(maat_instance->maat_rt, thread_id); maat_runtime_ref_dec(maat_instance->maat_rt, state->thread_id);
return MAAT_SCAN_OK; return MAAT_SCAN_OK;
} }
int maat_scan_ipv6_tuple4(struct maat *instance, int table_id, int thread_id, int maat_scan_ipv6_tuple4(struct maat *instance, int table_id,
const struct ipv6_tuple *tuple, long long *results, const struct ipv6_tuple *tuple, long long *results,
size_t n_result, size_t *n_hit_result, size_t n_result, size_t *n_hit_result,
struct maat_state *state) struct maat_state *state)
@@ -1479,13 +1480,13 @@ int maat_scan_ipv6_tuple4(struct maat *instance, int table_id, int thread_id,
return MAAT_SCAN_OK; return MAAT_SCAN_OK;
} }
int maat_scan_string(struct maat *maat_instance, int table_id, int thread_id, int maat_scan_string(struct maat *maat_instance, int table_id, const char *data,
const char *data, size_t data_len, long long *results, size_t n_result, size_t data_len, long long *results, size_t n_result,
size_t *n_hit_result, struct maat_state *state) size_t *n_hit_result, struct maat_state *state)
{ {
if ((NULL == maat_instance) || table_id < 0 || table_id >= MAX_TABLE_NUM if ((NULL == maat_instance) || table_id < 0 || table_id >= MAX_TABLE_NUM
|| (thread_id < 0) || (NULL == data) || (0 == data_len) || (NULL == data) || (0 == data_len) || (NULL == results)
|| (NULL == results) || (0 == n_result) || (NULL == state)) { || (0 == n_result) || (NULL == state) || (state->thread_id < 0)) {
return MAAT_SCAN_ERR; return MAAT_SCAN_ERR;
} }
@@ -1494,7 +1495,7 @@ int maat_scan_string(struct maat *maat_instance, int table_id, int thread_id,
if (NULL == maat_instance->maat_rt) { if (NULL == maat_instance->maat_rt) {
log_error(maat_instance->logger, MODULE_MAAT_API, log_error(maat_instance->logger, MODULE_MAAT_API,
"[%s:%d] table(table_id:%d) thread_id:%d maat_scan_string error because of maat_runtime is NULL", "[%s:%d] table(table_id:%d) thread_id:%d maat_scan_string error because of maat_runtime is NULL",
__FUNCTION__, __LINE__, table_id, thread_id); __FUNCTION__, __LINE__, table_id, state->thread_id);
return MAAT_SCAN_OK; return MAAT_SCAN_OK;
} }
@@ -1517,10 +1518,10 @@ int maat_scan_string(struct maat *maat_instance, int table_id, int thread_id,
return MAAT_SCAN_ERR; return MAAT_SCAN_ERR;
} }
maat_runtime_ref_inc(maat_instance->maat_rt, thread_id); maat_runtime_ref_inc(maat_instance->maat_rt, state->thread_id);
alignment_int64_array_add(maat_instance->thread_call_cnt, thread_id, 1); alignment_int64_array_add(maat_instance->thread_call_cnt, state->thread_id, 1);
int hit_group_cnt = string_scan(maat_instance->tbl_mgr, thread_id, data, data_len, int hit_group_cnt = string_scan(maat_instance->tbl_mgr, state->thread_id, data, data_len,
physical_table_id, vtable_id, state); physical_table_id, vtable_id, state);
if (hit_group_cnt < 0) { if (hit_group_cnt < 0) {
return MAAT_SCAN_ERR; return MAAT_SCAN_ERR;
@@ -1534,10 +1535,10 @@ int maat_scan_string(struct maat *maat_instance, int table_id, int thread_id,
} }
if (sum_hit_compile_cnt > 0) { if (sum_hit_compile_cnt > 0) {
alignment_int64_array_add(maat_instance->hit_cnt, thread_id, 1); alignment_int64_array_add(maat_instance->hit_cnt, state->thread_id, 1);
if (0 == hit_group_cnt) { if (0 == hit_group_cnt) {
//hit NOT group //hit NOT group
alignment_int64_array_add(maat_instance->not_grp_hit_cnt, thread_id, 1); alignment_int64_array_add(maat_instance->not_grp_hit_cnt, state->thread_id, 1);
} }
return MAAT_SCAN_HIT; return MAAT_SCAN_HIT;
} else { } else {
@@ -1547,21 +1548,22 @@ int maat_scan_string(struct maat *maat_instance, int table_id, int thread_id,
} }
} }
maat_runtime_ref_dec(maat_instance->maat_rt, thread_id); maat_runtime_ref_dec(maat_instance->maat_rt, state->thread_id);
return MAAT_SCAN_OK; return MAAT_SCAN_OK;
} }
struct maat_stream *maat_scan_stream_open(struct maat *maat_instance, int table_id, int thread_id) struct maat_stream *maat_stream_new(struct maat *maat_instance, int table_id,
struct maat_state *state)
{ {
if (NULL == maat_instance || table_id < 0 || table_id > MAX_TABLE_NUM if (NULL == maat_instance || table_id < 0 || table_id > MAX_TABLE_NUM
|| thread_id < 0) { || NULL == state || state->thread_id < 0) {
return NULL; return NULL;
} }
struct maat_stream *stream = ALLOC(struct maat_stream, 1); struct maat_stream *stream = ALLOC(struct maat_stream, 1);
stream->ref_maat_instance = maat_instance; stream->ref_maat_instance = maat_instance;
stream->thread_id = thread_id; stream->thread_id = state->thread_id;
stream->logger = maat_instance->logger; stream->logger = maat_instance->logger;
enum table_type table_type = table_manager_get_table_type(maat_instance->tbl_mgr, table_id); enum table_type table_type = table_manager_get_table_type(maat_instance->tbl_mgr, table_id);
@@ -1586,7 +1588,8 @@ struct maat_stream *maat_scan_stream_open(struct maat *maat_instance, int table_
stream->physical_table_id); stream->physical_table_id);
assert(expr_rt != NULL); assert(expr_rt != NULL);
struct adapter_hs_stream *handle = expr_runtime_stream_open((struct expr_runtime *)expr_rt, thread_id); struct adapter_hs_stream *handle = expr_runtime_stream_open((struct expr_runtime *)expr_rt,
state->thread_id);
if (NULL == handle) { if (NULL == handle) {
goto error; goto error;
} }
@@ -1599,7 +1602,7 @@ error:
return NULL; return NULL;
} }
int maat_scan_stream(struct maat_stream **maat_stream, const char *data, int data_len, int maat_stream_scan(struct maat_stream *maat_stream, const char *data, int data_len,
long long *results, size_t n_result, size_t *n_hit_result, long long *results, size_t n_result, size_t *n_hit_result,
struct maat_state *state) struct maat_state *state)
{ {
@@ -1609,25 +1612,24 @@ int maat_scan_stream(struct maat_stream **maat_stream, const char *data, int dat
} }
state->scan_cnt++; state->scan_cnt++;
struct maat_stream *stream = *maat_stream;
int valid_table_id = -1; int valid_table_id = -1;
if (stream->vtable_id != 0) { if (maat_stream->vtable_id != 0) {
valid_table_id = stream->vtable_id; valid_table_id = maat_stream->vtable_id;
} else { } else {
valid_table_id = stream->physical_table_id; valid_table_id = maat_stream->physical_table_id;
} }
if (NULL == stream->ref_maat_instance->maat_rt) { if (NULL == maat_stream->ref_maat_instance->maat_rt) {
log_error(stream->logger, MODULE_MAAT_API, log_error(maat_stream->logger, MODULE_MAAT_API,
"[%s:%d] table(table_id:%d) thread_id:%d maat_scan_stream error because of maat_runtime is NULL", "[%s:%d] table(table_id:%d) thread_id:%d maat_scan_stream error because of maat_runtime is NULL",
__FUNCTION__, __LINE__, valid_table_id, stream->thread_id); __FUNCTION__, __LINE__, valid_table_id, maat_stream->thread_id);
return MAAT_SCAN_OK; return MAAT_SCAN_OK;
} }
alignment_int64_array_add(stream->ref_maat_instance->thread_call_cnt, stream->thread_id, 1); alignment_int64_array_add(maat_stream->ref_maat_instance->thread_call_cnt, maat_stream->thread_id, 1);
int hit_group_cnt = expr_stream_scan(stream, data, data_len, state); int hit_group_cnt = expr_stream_scan(maat_stream, data, data_len, state);
if (hit_group_cnt < 0) { if (hit_group_cnt < 0) {
return MAAT_SCAN_ERR; return MAAT_SCAN_ERR;
} }
@@ -1635,15 +1637,15 @@ int maat_scan_stream(struct maat_stream **maat_stream, const char *data, int dat
size_t sum_hit_compile_cnt = 0; size_t sum_hit_compile_cnt = 0;
if (hit_group_cnt > 0 || scan_status_should_compile_NOT(state)) { if (hit_group_cnt > 0 || scan_status_should_compile_NOT(state)) {
// come here means group_hit_cnt > 0, at least MAAT_SCAN_HALF_HIT, or MAAT_SCAN_HIT // come here means group_hit_cnt > 0, at least MAAT_SCAN_HALF_HIT, or MAAT_SCAN_HIT
sum_hit_compile_cnt = group_to_compile(stream->ref_maat_instance, results, n_result, state); sum_hit_compile_cnt = group_to_compile(maat_stream->ref_maat_instance, results, n_result, state);
*n_hit_result = sum_hit_compile_cnt; *n_hit_result = sum_hit_compile_cnt;
} }
if (sum_hit_compile_cnt > 0) { if (sum_hit_compile_cnt > 0) {
alignment_int64_array_add(stream->ref_maat_instance->hit_cnt, stream->thread_id, 1); alignment_int64_array_add(maat_stream->ref_maat_instance->hit_cnt, maat_stream->thread_id, 1);
if (0 == hit_group_cnt) { if (0 == hit_group_cnt) {
//hit NOT group //hit NOT group
alignment_int64_array_add(stream->ref_maat_instance->not_grp_hit_cnt, stream->thread_id, 1); alignment_int64_array_add(maat_stream->ref_maat_instance->not_grp_hit_cnt, maat_stream->thread_id, 1);
} }
return MAAT_SCAN_HIT; return MAAT_SCAN_HIT;
} else { } else {
@@ -1656,12 +1658,14 @@ int maat_scan_stream(struct maat_stream **maat_stream, const char *data, int dat
return sum_hit_compile_cnt; return sum_hit_compile_cnt;
} }
void maat_scan_stream_close(struct maat_stream **maat_stream) void maat_stream_free(struct maat_stream *maat_stream)
{ {
struct maat_stream *stream = *maat_stream; if (NULL == maat_stream) {
return;
}
expr_runtime_stream_close(stream->s_handle); expr_runtime_stream_close(maat_stream->s_handle);
FREE(stream); FREE(maat_stream);
} }
struct maat_state *maat_state_new(struct maat *maat_instance, int thread_id) struct maat_state *maat_state_new(struct maat *maat_instance, int thread_id)

59
src/maat_command.c
View File

@@ -22,6 +22,7 @@
#define MODULE_MAAT_COMMAND module_name_str("maat.command") #define MODULE_MAAT_COMMAND module_name_str("maat.command")
extern const char *foreign_source_prefix; extern const char *foreign_source_prefix;
extern const char *foreign_key_prefix;
extern const char *mr_key_prefix; extern const char *mr_key_prefix;
extern const char *mr_expire_lock; extern const char *mr_expire_lock;
@@ -31,6 +32,8 @@ extern const char *mr_status_sset;
extern const char *mr_version_sset; extern const char *mr_version_sset;
extern const char *mr_label_sset; extern const char *mr_label_sset;
extern const int MAAT_REDIS_SYNC_TIME;
redisReply *maat_cmd_wrap_redis_command(redisContext *c, const char *format, ...) redisReply *maat_cmd_wrap_redis_command(redisContext *c, const char *format, ...)
{ {
va_list ap; va_list ap;
@@ -383,6 +386,62 @@ error_out:
return ret; return ret;
} }
int maat_cmd_set_file(struct maat *maat_instance, const char *key, const char *value,
size_t size, enum maat_operation op)
{
redisContext *ctx = maat_instance->mr_ctx.write_ctx;
if (NULL == ctx) {
log_error(maat_instance->logger, MODULE_MAAT_COMMAND,
"[%s:%d] failed: Redis is not connected.",
__FUNCTION__, __LINE__);
return -1;
}
const char *arg_vec[3];
size_t len_vec[3];
arg_vec[0] = "SET";
len_vec[0] = strlen("SET");
arg_vec[1] = key;
len_vec[1] = strlen(key);
arg_vec[2] = value;
len_vec[2] = size;
redisReply *reply = NULL;
if (0 != strncmp(key, foreign_key_prefix, strlen(foreign_key_prefix))) {
log_error(maat_instance->logger, MODULE_MAAT_COMMAND,
"Invalid File key, prefix %s is mandatory.", foreign_key_prefix);
return -1;
}
switch (op) {
case MAAT_OP_ADD:
reply = (redisReply *)redisCommandArgv(ctx, sizeof(arg_vec) / sizeof(arg_vec[0]),
arg_vec, len_vec);
break;
case MAAT_OP_DEL:
reply = maat_cmd_wrap_redis_command(ctx, "EXPIRE %s %d", key, MAAT_REDIS_SYNC_TIME);
break;
default:
return -1;
break;
}
if (NULL == reply || reply->type == REDIS_REPLY_NIL || reply->type == REDIS_REPLY_ERROR) {
log_error(maat_instance->logger, MODULE_MAAT_COMMAND,
"Set file failed, maybe Redis is busy.");
freeReplyObject(reply);
reply = NULL;
return -1;
}
freeReplyObject(reply);
reply = NULL;
return 1;
}
long long maat_cmd_incrby(struct maat *maat_instance, const char *key, int increment) long long maat_cmd_incrby(struct maat *maat_instance, const char *key, int increment)
{ {
long long result = 0; long long result = 0;

2
src/maat_redis_monitor.c
View File

@@ -24,7 +24,7 @@
#define MODULE_REDIS_MONITOR module_name_str("maat.redis_monitor") #define MODULE_REDIS_MONITOR module_name_str("maat.redis_monitor")
const time_t MAAT_REDIS_RECONNECT_INTERVAL_S = 5; const time_t MAAT_REDIS_RECONNECT_INTERVAL_S = 5;
const static int MAAT_REDIS_SYNC_TIME = 30 * 60; const int MAAT_REDIS_SYNC_TIME = 30 * 60;
const char *mr_expire_lock = "EXPIRE_OP_LOCK"; const char *mr_expire_lock = "EXPIRE_OP_LOCK";
const long mr_expire_lock_timeout_ms = 300 * 1000; const long mr_expire_lock_timeout_ms = 300 * 1000;

805
test/maat_framework_gtest.cpp
View File

File diff suppressed because it is too large Load Diff

6
test/maat_input_mode_gtest.cpp
View File

@@ -47,7 +47,7 @@ TEST(json_mode, maat_scan_string) {
size_t n_hit_result = 0; size_t n_hit_result = 0;
int thread_id = 0; int thread_id = 0;
struct maat_state *state = maat_state_new(maat_instance, thread_id); struct maat_state *state = maat_state_new(maat_instance, thread_id);
int ret = maat_scan_string(maat_instance, table_id, thread_id, scan_data, strlen(scan_data), int ret = maat_scan_string(maat_instance, table_id, scan_data, strlen(scan_data),
results, sizeof(results), &n_hit_result, state); results, sizeof(results), &n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT); EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1); EXPECT_EQ(n_hit_result, 1);
@@ -103,7 +103,7 @@ TEST(iris_mode, maat_scan_string) {
size_t n_hit_result = 0; size_t n_hit_result = 0;
int thread_id = 0; int thread_id = 0;
struct maat_state *state = maat_state_new(maat_instance, thread_id); struct maat_state *state = maat_state_new(maat_instance, thread_id);
int ret = maat_scan_string(maat_instance, table_id, thread_id, scan_data, strlen(scan_data), int ret = maat_scan_string(maat_instance, table_id, scan_data, strlen(scan_data),
results, sizeof(results), &n_hit_result, state); results, sizeof(results), &n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT); EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1); EXPECT_EQ(n_hit_result, 1);
@@ -223,7 +223,7 @@ TEST(redis_mode, maat_scan_string) {
size_t n_hit_result = 0; size_t n_hit_result = 0;
int thread_id = 0; int thread_id = 0;
struct maat_state *state = maat_state_new(maat_instance, thread_id); struct maat_state *state = maat_state_new(maat_instance, thread_id);
int ret = maat_scan_string(maat_instance, table_id, thread_id, scan_data, strlen(scan_data), int ret = maat_scan_string(maat_instance, table_id, scan_data, strlen(scan_data),
results, sizeof(results), &n_hit_result, state); results, sizeof(results), &n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT); EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1); EXPECT_EQ(n_hit_result, 1);