github_mirrors/vectorscan
3
0
Fork 1
mirror of https://github.com/VectorCamp/vectorscan.git synced 2025-06-28 16:41:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

tools: fix compile issue for RELEASE_BUILD code

Browse Source 
Fixes github issue #186
This commit is contained in:
Hong, Yang A 2019-08-22 21:54:54 +08:00
parent 52e19cb61c
commit e811a8dbb8
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tools/hsbench/engine_hyperscan.cpp
View File

@ -414,6 +414,7 @@ buildEngineHyperscan(const ExpressionMap &expressions, ScanMode scan_mode,
hs_compile_error_t *compile_err; hs_compile_error_t *compile_err;
Timer timer; Timer timer;
#ifndef RELEASE_BUILD
if (useLiteralApi) { if (useLiteralApi) {
// Pattern length computation should be done before timer start. // Pattern length computation should be done before timer start.
vector<size_t> lens(count); vector<size_t> lens(count);
@ -434,6 +435,26 @@ buildEngineHyperscan(const ExpressionMap &expressions, ScanMode scan_mode,
grey); grey);
timer.complete(); timer.complete();
} }
#else
if (useLiteralApi) {
// Pattern length computation should be done before timer start.
vector<size_t> lens(count);
for (unsigned int i = 0; i < count; i++) {
lens[i] = strlen(patterns[i]);
}
timer.start();
err = hs_compile_lit_multi(patterns.data(), flags.data(),
ids.data(), lens.data(), count,
full_mode, nullptr, &db, &compile_err);
timer.complete();
} else {
timer.start();
err = hs_compile_ext_multi(patterns.data(), flags.data(),
ids.data(), ext_ptr.data(), count,
full_mode, nullptr, &db, &compile_err);
timer.complete();
}
#endif
compileSecs = timer.seconds(); compileSecs = timer.seconds();
peakMemorySize = getPeakHeap(); peakMemorySize = getPeakHeap();

5
tools/hscheck/main.cpp
View File

@ -336,9 +336,8 @@ void checkExpression(UNUSED void *threadarg) {
#else #else
if (use_literal_api) { if (use_literal_api) {
size_t len = strlen(regexp); size_t len = strlen(regexp);
err = hs_compile_lit_multi_int(&regexp, &flags, nullptr, &extp, err = hs_compile_lit_multi(&regexp, &flags, nullptr, &len, 1,
&len, 1, mode, nullptr, &db, mode, nullptr, &db, &compile_err);
&compile_err, *g_grey);
} else { } else {
err = hs_compile_ext_multi(&regexp, &flags, nullptr, &extp, 1, err = hs_compile_ext_multi(&regexp, &flags, nullptr, &extp, 1,
mode, nullptr, &db, &compile_err); mode, nullptr, &db, &compile_err);