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

HyperscanScanGigabytesMatch: use a vector

Browse Source
This commit is contained in:
Justin Viiret 2015-10-14 12:38:13 +11:00 committed by Matthew Barr
parent 9578ae6ee2
commit 4a98c664b4
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
unit/hyperscan/behaviour.cpp
View File

@ -86,8 +86,7 @@ TEST(HyperscanTestBehaviour, ScanSeveralGigabytesNoMatch) {
hs_error_t err; hs_error_t err;
const size_t datalen = 1024 * 1024; const size_t datalen = 1024 * 1024;
size_t megabytes = 5 * 1024; size_t megabytes = 5 * 1024;
char * data = new char[datalen]; vector<char> data(datalen, 'X');
memset(data, 'X', datalen);
// build a database // build a database
hs_database_t *db = nullptr; hs_database_t *db = nullptr;
@ -110,8 +109,8 @@ TEST(HyperscanTestBehaviour, ScanSeveralGigabytesNoMatch) {
ASSERT_TRUE(stream != nullptr); ASSERT_TRUE(stream != nullptr);
while (megabytes-- > 0) { while (megabytes-- > 0) {
err = hs_scan_stream(stream, data, datalen, 0, scratch, dummyHandler, err = hs_scan_stream(stream, data.data(), data.size(), 0, scratch,
nullptr); dummyHandler, nullptr);
ASSERT_EQ(HS_SUCCESS, err); ASSERT_EQ(HS_SUCCESS, err);
} }
@ -121,7 +120,6 @@ TEST(HyperscanTestBehaviour, ScanSeveralGigabytesNoMatch) {
// teardown // teardown
hs_free_scratch(scratch); hs_free_scratch(scratch);
hs_free_database(db); hs_free_database(db);
delete [] data;
} }
struct HugeScanMatchingData { struct HugeScanMatchingData {
@ -141,8 +139,7 @@ TEST_P(HyperscanScanGigabytesMatch, StreamingMatch) {
hs_error_t err; hs_error_t err;
const size_t datalen = 1024*1024; const size_t datalen = 1024*1024;
char * data = new char[datalen]; vector<char> data(datalen, 'X');
memset(data, 'X', datalen);
// build a database // build a database
hs_database_t *db = nullptr; hs_database_t *db = nullptr;
@ -178,7 +175,7 @@ TEST_P(HyperscanScanGigabytesMatch, StreamingMatch) {
// streaming mode scan of our megabyte of data gb*1024 times // streaming mode scan of our megabyte of data gb*1024 times
unsigned long remaining = gb * 1024; unsigned long remaining = gb * 1024;
while (remaining-- > 0) { while (remaining-- > 0) {
err = hs_scan_stream(stream, data, datalen, 0, scratch, err = hs_scan_stream(stream, data.data(), data.size(), 0, scratch,
singleHandler, nullptr); singleHandler, nullptr);
ASSERT_EQ(HS_SUCCESS, err); ASSERT_EQ(HS_SUCCESS, err);
ASSERT_EQ(0ULL, lastMatchTo); ASSERT_EQ(0ULL, lastMatchTo);
@ -202,7 +199,6 @@ TEST_P(HyperscanScanGigabytesMatch, StreamingMatch) {
// teardown // teardown
hs_free_scratch(scratch); hs_free_scratch(scratch);
hs_free_database(db); hs_free_database(db);
delete[] data;
} }
// Helper function to actually perform scans for BlockMatch test below // Helper function to actually perform scans for BlockMatch test below