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

fix maat_stat scan_cpu_time null pointer

Browse Source
This commit is contained in:
liuwentan
2023-04-24 19:18:12 +08:00
parent 6333b326ea
commit eb540b570b
7 changed files with 8 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/maat_bool_plugin.c
View File

@@ -192,6 +192,7 @@ void *bool_plugin_runtime_new(void *bool_plugin_schema, size_t max_thread_num,
bool_plugin_rt->ref_garbage_bin = garbage_bin; bool_plugin_rt->ref_garbage_bin = garbage_bin;
bool_plugin_rt->logger = logger; bool_plugin_rt->logger = logger;
bool_plugin_rt->scan_cnt = alignment_int64_array_alloc(max_thread_num); bool_plugin_rt->scan_cnt = alignment_int64_array_alloc(max_thread_num);
bool_plugin_rt->scan_cpu_time = alignment_int64_array_alloc(max_thread_num);
return bool_plugin_rt; return bool_plugin_rt;
} }
@@ -554,10 +555,6 @@ void bool_plugin_runtime_perf_stat(void *bool_plugin_runtime, struct timespec *s
alignment_int64_array_add(bool_plugin_rt->scan_cnt, thread_id, 1); alignment_int64_array_add(bool_plugin_rt->scan_cnt, thread_id, 1);
if (start != NULL && end != NULL) { if (start != NULL && end != NULL) {
if (NULL == bool_plugin_rt->scan_cpu_time) {
bool_plugin_rt->scan_cpu_time = alignment_int64_array_alloc(bool_plugin_rt->n_worker_thread);
}
long long consume_time = (end->tv_sec - start->tv_sec) * 1000000000 + (end->tv_nsec - start->tv_nsec); long long consume_time = (end->tv_sec - start->tv_sec) * 1000000000 + (end->tv_nsec - start->tv_nsec);
alignment_int64_array_add(bool_plugin_rt->scan_cpu_time, thread_id, consume_time); alignment_int64_array_add(bool_plugin_rt->scan_cpu_time, thread_id, consume_time);
} }

5
src/maat_expr.c
View File

@@ -470,6 +470,7 @@ void *expr_runtime_new(void *expr_schema, size_t max_thread_num,
expr_rt->hit_cnt = alignment_int64_array_alloc(max_thread_num); expr_rt->hit_cnt = alignment_int64_array_alloc(max_thread_num);
expr_rt->scan_cnt = alignment_int64_array_alloc(max_thread_num); expr_rt->scan_cnt = alignment_int64_array_alloc(max_thread_num);
expr_rt->scan_bytes = alignment_int64_array_alloc(max_thread_num); expr_rt->scan_bytes = alignment_int64_array_alloc(max_thread_num);
expr_rt->scan_cpu_time = alignment_int64_array_alloc(max_thread_num);
expr_rt->stream_num = alignment_int64_array_alloc(max_thread_num); expr_rt->stream_num = alignment_int64_array_alloc(max_thread_num);
return expr_rt; return expr_rt;
@@ -1067,10 +1068,6 @@ void expr_runtime_perf_stat(struct expr_runtime *expr_rt, size_t scan_len,
alignment_int64_array_add(expr_rt->scan_bytes, thread_id, scan_len); alignment_int64_array_add(expr_rt->scan_bytes, thread_id, scan_len);
if (start != NULL && end != NULL) { if (start != NULL && end != NULL) {
if (NULL == expr_rt->scan_cpu_time) {
expr_rt->scan_cpu_time = alignment_int64_array_alloc(expr_rt->n_worker_thread);
}
long long consume_time = (end->tv_sec - start->tv_sec) * 1000000000 + (end->tv_nsec - start->tv_nsec); long long consume_time = (end->tv_sec - start->tv_sec) * 1000000000 + (end->tv_nsec - start->tv_nsec);
alignment_int64_array_add(expr_rt->scan_cpu_time, thread_id, consume_time); alignment_int64_array_add(expr_rt->scan_cpu_time, thread_id, consume_time);
} }

5
src/maat_flag.c
View File

@@ -186,6 +186,7 @@ void *flag_runtime_new(void *flag_schema, size_t max_thread_num,
flag_rt->hit_cnt = alignment_int64_array_alloc(max_thread_num); flag_rt->hit_cnt = alignment_int64_array_alloc(max_thread_num);
flag_rt->scan_cnt = alignment_int64_array_alloc(max_thread_num); flag_rt->scan_cnt = alignment_int64_array_alloc(max_thread_num);
flag_rt->scan_cpu_time = alignment_int64_array_alloc(max_thread_num);
return flag_rt; return flag_rt;
} }
@@ -612,10 +613,6 @@ void flag_runtime_perf_stat(struct flag_runtime *flag_rt, struct timespec *start
alignment_int64_array_add(flag_rt->scan_cnt, thread_id, 1); alignment_int64_array_add(flag_rt->scan_cnt, thread_id, 1);
if (start != NULL && end != NULL) { if (start != NULL && end != NULL) {
if (NULL == flag_rt->scan_cpu_time) {
flag_rt->scan_cpu_time = alignment_int64_array_alloc(flag_rt->n_worker_thread);
}
long long consume_time = (end->tv_sec - start->tv_sec) * 1000000000 + long long consume_time = (end->tv_sec - start->tv_sec) * 1000000000 +
(end->tv_nsec - start->tv_nsec); (end->tv_nsec - start->tv_nsec);
alignment_int64_array_add(flag_rt->scan_cpu_time, thread_id, consume_time); alignment_int64_array_add(flag_rt->scan_cpu_time, thread_id, consume_time);

5
src/maat_fqdn_plugin.c
View File

@@ -185,6 +185,7 @@ void *fqdn_plugin_runtime_new(void *fqdn_plugin_schema, size_t max_thread_num,
fqdn_plugin_rt->ref_garbage_bin = garbage_bin; fqdn_plugin_rt->ref_garbage_bin = garbage_bin;
fqdn_plugin_rt->logger = logger; fqdn_plugin_rt->logger = logger;
fqdn_plugin_rt->scan_cnt = alignment_int64_array_alloc(max_thread_num); fqdn_plugin_rt->scan_cnt = alignment_int64_array_alloc(max_thread_num);
fqdn_plugin_rt->scan_cpu_time = alignment_int64_array_alloc(max_thread_num);
return fqdn_plugin_rt; return fqdn_plugin_rt;
} }
@@ -548,10 +549,6 @@ void fqdn_plugin_runtime_perf_stat(void *fqdn_plugin_runtime, struct timespec *s
alignment_int64_array_add(fqdn_plugin_rt->scan_cnt, thread_id, 1); alignment_int64_array_add(fqdn_plugin_rt->scan_cnt, thread_id, 1);
if (start != NULL && end != NULL) { if (start != NULL && end != NULL) {
if (NULL == fqdn_plugin_rt->scan_cpu_time) {
fqdn_plugin_rt->scan_cpu_time = alignment_int64_array_alloc(fqdn_plugin_rt->n_worker_thread);
}
long long consume_time = (end->tv_sec - start->tv_sec) * 1000000000 + (end->tv_nsec - start->tv_nsec); long long consume_time = (end->tv_sec - start->tv_sec) * 1000000000 + (end->tv_nsec - start->tv_nsec);
alignment_int64_array_add(fqdn_plugin_rt->scan_cpu_time, thread_id, consume_time); alignment_int64_array_add(fqdn_plugin_rt->scan_cpu_time, thread_id, consume_time);
} }

5
src/maat_interval.c
View File

@@ -183,6 +183,7 @@ void *interval_runtime_new(void *interval_schema, size_t max_thread_num,
interval_rt->hit_cnt = alignment_int64_array_alloc(max_thread_num); interval_rt->hit_cnt = alignment_int64_array_alloc(max_thread_num);
interval_rt->scan_cnt = alignment_int64_array_alloc(max_thread_num); interval_rt->scan_cnt = alignment_int64_array_alloc(max_thread_num);
interval_rt->scan_cpu_time = alignment_int64_array_alloc(max_thread_num);
return interval_rt; return interval_rt;
} }
@@ -610,10 +611,6 @@ void interval_runtime_perf_stat(struct interval_runtime *interval_rt, struct tim
alignment_int64_array_add(interval_rt->scan_cnt, thread_id, 1); alignment_int64_array_add(interval_rt->scan_cnt, thread_id, 1);
if (start != NULL && end != NULL) { if (start != NULL && end != NULL) {
if (NULL == interval_rt->scan_cpu_time) {
interval_rt->scan_cpu_time = alignment_int64_array_alloc(interval_rt->n_worker_thread);
}
long long consume_time = (end->tv_sec - start->tv_sec) * 1000000000 + end->tv_nsec - start->tv_nsec; long long consume_time = (end->tv_sec - start->tv_sec) * 1000000000 + end->tv_nsec - start->tv_nsec;
alignment_int64_array_add(interval_rt->scan_cpu_time, thread_id, consume_time); alignment_int64_array_add(interval_rt->scan_cpu_time, thread_id, consume_time);
} }

5
src/maat_ip.c
View File

@@ -397,6 +397,7 @@ void *ip_runtime_new(void *ip_schema, size_t max_thread_num,
ip_rt->hit_cnt = alignment_int64_array_alloc(max_thread_num); ip_rt->hit_cnt = alignment_int64_array_alloc(max_thread_num);
ip_rt->scan_cnt = alignment_int64_array_alloc(max_thread_num); ip_rt->scan_cnt = alignment_int64_array_alloc(max_thread_num);
ip_rt->scan_cpu_time = alignment_int64_array_alloc(max_thread_num);
return ip_rt; return ip_rt;
} }
@@ -826,10 +827,6 @@ void ip_runtime_perf_stat(struct ip_runtime *ip_rt, struct timespec *start,
alignment_int64_array_add(ip_rt->scan_cnt, thread_id, 1); alignment_int64_array_add(ip_rt->scan_cnt, thread_id, 1);
if (start != NULL && end != NULL) { if (start != NULL && end != NULL) {
if (NULL == ip_rt->scan_cpu_time) {
ip_rt->scan_cpu_time = alignment_int64_array_alloc(ip_rt->n_worker_thread);
}
long long consume_time = (end->tv_sec - start->tv_sec) * 1000000000 + end->tv_nsec - start->tv_nsec; long long consume_time = (end->tv_sec - start->tv_sec) * 1000000000 + end->tv_nsec - start->tv_nsec;
alignment_int64_array_add(ip_rt->scan_cpu_time, thread_id, consume_time); alignment_int64_array_add(ip_rt->scan_cpu_time, thread_id, consume_time);
} }

5
src/maat_ip_plugin.c
View File

@@ -367,6 +367,7 @@ void *ip_plugin_runtime_new(void *ip_plugin_schema, size_t max_thread_num,
ip_plugin_rt->logger = logger; ip_plugin_rt->logger = logger;
ip_plugin_rt->scan_cnt = alignment_int64_array_alloc(max_thread_num); ip_plugin_rt->scan_cnt = alignment_int64_array_alloc(max_thread_num);
ip_plugin_rt->scan_cpu_time = alignment_int64_array_alloc(max_thread_num);
return ip_plugin_rt; return ip_plugin_rt;
} }
@@ -592,10 +593,6 @@ void ip_plugin_runtime_perf_stat(void *ip_plugin_runtime, struct timespec *start
alignment_int64_array_add(ip_plugin_rt->scan_cnt, thread_id, 1); alignment_int64_array_add(ip_plugin_rt->scan_cnt, thread_id, 1);
if (start != NULL && end != NULL) { if (start != NULL && end != NULL) {
if (NULL == ip_plugin_rt->scan_cpu_time) {
ip_plugin_rt->scan_cpu_time = alignment_int64_array_alloc(ip_plugin_rt->n_worker_thread);
}
long long consume_time = (end->tv_sec - start->tv_sec) * 1000000000 + (end->tv_nsec - start->tv_nsec); long long consume_time = (end->tv_sec - start->tv_sec) * 1000000000 + (end->tv_nsec - start->tv_nsec);
alignment_int64_array_add(ip_plugin_rt->scan_cpu_time, thread_id, consume_time); alignment_int64_array_add(ip_plugin_rt->scan_cpu_time, thread_id, consume_time);
} }