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

更新测试用例。

Browse Source
This commit is contained in:
zhengchao
2017-10-14 12:48:14 +08:00
parent 7605450f0f
commit 4badb10949
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/entry/Maat_rule.cpp
View File

@@ -3228,10 +3228,18 @@ void *thread_rule_monitor(void *arg)
feather->scanner=feather->update_tmp_scanner; feather->scanner=feather->update_tmp_scanner;
if(old_scanner!=NULL) if(old_scanner!=NULL)
{ {
//assert(feather->scanner->version>old_scanner->version); if(feather->scanner->version>old_scanner->version)
MESA_handle_runtime_log(feather->logger,RLOG_LV_FATAL,maat_module, {
"Maat version rool back %d -> %d.", MESA_handle_runtime_log(feather->logger,RLOG_LV_INFO,maat_module,
old_scanner->version, feather->scanner->version); "Maat version updated %d -> %d.",
old_scanner->version, feather->scanner->version);
}
else
{
MESA_handle_runtime_log(feather->logger,RLOG_LV_FATAL,maat_module,
"Maat version roll back %d -> %d.",
old_scanner->version, feather->scanner->version);
}
assert(old_scanner->tomb_ref==feather->garbage_q); assert(old_scanner->tomb_ref==feather->garbage_q);
feather->zombie_rs_stream+=aligment_int64_array_sum(old_scanner->ref_cnt,old_scanner->max_thread_num); feather->zombie_rs_stream+=aligment_int64_array_sum(old_scanner->ref_cnt,old_scanner->max_thread_num);
garbage_bagging(GARBAGE_SCANNER, old_scanner, feather->garbage_q); garbage_bagging(GARBAGE_SCANNER, old_scanner, feather->garbage_q);

2
test/maat_test.cpp
View File

@@ -474,7 +474,7 @@ int test_offset_str_scan_with_chunk(Maat_feather_t feather,const char* table_nam
struct Maat_rule_t result[4]; struct Maat_rule_t result[4];
scan_status_t mid=NULL; scan_status_t mid=NULL;
//const char* fn="./testdata/mesa_logo.jpg"; //const char* fn="./testdata/mesa_logo.jpg";
const char* fn="./testdata/100719.jpg"; const char* fn="./testdata/mesa_logo.jpg";
FILE*fp=fopen(fn,"r"); FILE*fp=fopen(fn,"r");
if(fp==NULL) if(fp==NULL)
{ {