From: Hong, Yang A <yang.a.hong@intel.com>
Date: Thu, 22 Aug 2019 13:54:54 +0000 (+0800)
Subject: tools: fix compile issue for RELEASE_BUILD code
X-Git-Tag: v5.2.1^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e811a8dbb8679b048313e0b67bdf5a15dae81f51;p=thirdparty%2Fvectorscan.git

tools: fix compile issue for RELEASE_BUILD code

Fixes github issue #186
---

diff --git a/tools/hsbench/engine_hyperscan.cpp b/tools/hsbench/engine_hyperscan.cpp
index c1f1e8c4..79c58f77 100644
--- a/tools/hsbench/engine_hyperscan.cpp
+++ b/tools/hsbench/engine_hyperscan.cpp
@@ -414,6 +414,7 @@ buildEngineHyperscan(const ExpressionMap &expressions, ScanMode scan_mode,
         hs_compile_error_t *compile_err;
         Timer timer;
 
+#ifndef RELEASE_BUILD
         if (useLiteralApi) {
             // Pattern length computation should be done before timer start.
             vector<size_t> lens(count);
@@ -434,6 +435,26 @@ buildEngineHyperscan(const ExpressionMap &expressions, ScanMode scan_mode,
                                        grey);
             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();
         peakMemorySize = getPeakHeap();
diff --git a/tools/hscheck/main.cpp b/tools/hscheck/main.cpp
index 9cfe73df..197087bb 100644
--- a/tools/hscheck/main.cpp
+++ b/tools/hscheck/main.cpp
@@ -336,9 +336,8 @@ void checkExpression(UNUSED void *threadarg) {
 #else
             if (use_literal_api) {
                 size_t len = strlen(regexp);
-                err = hs_compile_lit_multi_int(&regexp, &flags, nullptr, &extp,
-                                               &len, 1, mode, nullptr, &db,
-                                               &compile_err, *g_grey);
+                err = hs_compile_lit_multi(&regexp, &flags, nullptr, &len, 1,
+                                           mode, nullptr, &db, &compile_err);
             } else {
                 err = hs_compile_ext_multi(&regexp, &flags, nullptr, &extp, 1,
                                            mode, nullptr, &db, &compile_err);