From 8acb0225acb189957e8be3340bc5b7d05115b408 Mon Sep 17 00:00:00 2001 From: zhengchao Date: Mon, 21 Nov 2016 17:56:59 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4rulescan=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=9A=84=E7=BB=9F=E8=AE=A1=E7=B2=BE=E5=BA=A6?= =?UTF-8?q?=E4=B8=BA=E7=BA=B3=E7=A7=92=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/entry/Maat_api.cpp | 2 +- src/entry/Maat_rule.cpp | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/entry/Maat_api.cpp b/src/entry/Maat_api.cpp index 6045274..8fe33f5 100644 --- a/src/entry/Maat_api.cpp +++ b/src/entry/Maat_api.cpp @@ -1,7 +1,7 @@ #include #include #include - #include +#include #include #include "rulescan.h" diff --git a/src/entry/Maat_rule.cpp b/src/entry/Maat_rule.cpp index e0dfcf8..66ba591 100644 --- a/src/entry/Maat_rule.cpp +++ b/src/entry/Maat_rule.cpp @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -1097,6 +1098,8 @@ void rulescan_batch_update(rule_scanner_t scanner,MESA_lqueue_head expr_queue,vo memset(failed_ids,0,sizeof(failed_ids)); memset(failed_info,0,sizeof(failed_info)); const long q_cnt=MESA_lqueue_get_count(expr_queue); + struct timespec start,end; + unsigned long long update_interval=0; if(q_cnt==0) { return; @@ -1127,8 +1130,9 @@ void rulescan_batch_update(rule_scanner_t scanner,MESA_lqueue_head expr_queue,vo } MESA_handle_runtime_log(logger,RLOG_LV_INFO,maat_module , "scanner %p rulescan_update %ld rules.",scanner,q_cnt); + clock_gettime(CLOCK_MONOTONIC,&start); ret=rulescan_update(scanner, to_update_expr,q_cnt, failed_ids,MAX_FAILED_NUM); - + clock_gettime(CLOCK_MONOTONIC,&end); if(ret!=1) { p=failed_info; @@ -1139,8 +1143,12 @@ void rulescan_batch_update(rule_scanner_t scanner,MESA_lqueue_head expr_queue,vo MESA_handle_runtime_log(logger,RLOG_LV_FATAL,maat_module , "rulescan_update error,when batch update %ld rules,regex error %u.",q_cnt,failed_ids[0]); } + update_interval=(end.tv_sec-start.tv_sec)*1000000000+end.tv_nsec-start.tv_nsec; MESA_handle_runtime_log(logger,RLOG_LV_INFO,maat_module , - "scanner %p rulescan_update sucess.",scanner); + "scanner %p rulescan_update with %2.2e (%llu) ns." + ,scanner + ,(double)update_interval + ,update_interval); for(i=0;i