github_mirrors/vectorscan
3
0
Fork 1
mirror of https://github.com/VectorCamp/vectorscan.git synced 2025-09-29 19:24:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into wip-isildur-g-cppcheck-47-48-58

Browse Source
This commit is contained in:
g. economou
2024-05-01 10:59:59 +03:00
committed by GitHub
parent 9902ca0e34 27bb2b9134
commit 727cff3621
89 changed files with 1608 additions and 588 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tools/hsbench/engine_chimera.h
View File

@@ -66,32 +66,32 @@ public:
explicit EngineChimera(ch_database_t *db, CompileCHStats cs);
~EngineChimera();
std::unique_ptr<EngineContext> makeContext() const;
std::unique_ptr<EngineContext> makeContext() const override;
void scan(const char *data, unsigned int len, unsigned int id,
ResultEntry &result, EngineContext &ectx) const;
ResultEntry &result, EngineContext &ectx) const override;
void scan_vectored(const char *const *data, const unsigned int *len,
unsigned int count, unsigned int streamId,
ResultEntry &result, EngineContext &ectx) const;
ResultEntry &result, EngineContext &ectx) const override;
std::unique_ptr<EngineStream> streamOpen(EngineContext &ectx,
unsigned id) const;
unsigned id) const override;
void streamClose(std::unique_ptr<EngineStream> stream,
ResultEntry &result) const;
ResultEntry &result) const override;
void streamCompressExpand(EngineStream &stream,
std::vector<char> &temp) const;
std::vector<char> &temp) const override;
void streamScan(EngineStream &stream, const char *data, unsigned int len,
unsigned int id, ResultEntry &result) const;
unsigned int id, ResultEntry &result) const override;
void printStats() const;
void printStats() const override;
void printCsvStats() const;
void printCsvStats() const override;
void sqlStats(SqlDB &db) const;
void sqlStats(SqlDB &db) const override;
private:
ch_database_t *db;

4
tools/hsbench/engine_hyperscan.cpp
View File

@@ -248,7 +248,7 @@ void EngineHyperscan::printStats() const {
printf("Signature set: %s\n", compile_stats.sigs_name.c_str());
}
printf("Signatures: %s\n", compile_stats.signatures.c_str());
printf("Hyperscan info: %s\n", compile_stats.db_info.c_str());
printf("Vectorscan info: %s\n", compile_stats.db_info.c_str());
printf("Expression count: %'zu\n", compile_stats.expressionCount);
printf("Bytecode size: %'zu bytes\n", compile_stats.compiledSize);
printf("Database CRC: 0x%x\n", compile_stats.crc32);
@@ -456,7 +456,7 @@ buildEngineHyperscan(const ExpressionMap &expressions, ScanMode scan_mode,
if (err == HS_COMPILER_ERROR) {
if (compile_err->expression >= 0) {
printf("Compile error for signature #%u: %s\n",
printf("Compile error for signature #%d: %s\n",
compile_err->expression, compile_err->message);
} else {
printf("Compile error: %s\n", compile_err->message);

20
tools/hsbench/engine_hyperscan.h
View File

@@ -75,32 +75,32 @@ public:
explicit EngineHyperscan(hs_database_t *db, CompileHSStats cs);
~EngineHyperscan();
std::unique_ptr<EngineContext> makeContext() const;
std::unique_ptr<EngineContext> makeContext() const override;
void scan(const char *data, unsigned int len, unsigned int id,
ResultEntry &result, EngineContext &ectx) const;
ResultEntry &result, EngineContext &ectx) const override;
void scan_vectored(const char *const *data, const unsigned int *len,
unsigned int count, unsigned int streamId,
ResultEntry &result, EngineContext &ectx) const;
ResultEntry &result, EngineContext &ectx) const override;
std::unique_ptr<EngineStream> streamOpen(EngineContext &ectx,
unsigned id) const;
unsigned id) const override;
void streamClose(std::unique_ptr<EngineStream> stream,
ResultEntry &result) const;
ResultEntry &result) const override;
void streamCompressExpand(EngineStream &stream,
std::vector<char> &temp) const;
std::vector<char> &temp) const override;
void streamScan(EngineStream &stream, const char *data, unsigned int len,
unsigned int id, ResultEntry &result) const;
unsigned int id, ResultEntry &result) const override;
void printStats() const;
void printStats() const override;
void printCsvStats() const;
void printCsvStats() const override;
void sqlStats(SqlDB &db) const;
void sqlStats(SqlDB &db) const override;
private:
hs_database_t *db;

20
tools/hsbench/engine_pcre.h
View File

@@ -74,32 +74,32 @@ public:
CompilePCREStats cs, int capture_cnt_in);
~EnginePCRE();
std::unique_ptr<EngineContext> makeContext() const;
std::unique_ptr<EngineContext> makeContext() const override;
void scan(const char *data, unsigned int len, unsigned int id,
ResultEntry &result, EngineContext &ectx) const;
ResultEntry &result, EngineContext &ectx) const override;
void scan_vectored(const char *const *data, const unsigned int *len,
unsigned int count, unsigned int streamId,
ResultEntry &result, EngineContext &ectx) const;
ResultEntry &result, EngineContext &ectx) const override;
std::unique_ptr<EngineStream> streamOpen(EngineContext &ectx,
unsigned id) const;
unsigned id) const override;
void streamClose(std::unique_ptr<EngineStream> stream,
ResultEntry &result) const;
ResultEntry &result) const override;
void streamCompressExpand(EngineStream &stream,
std::vector<char> &temp) const;
std::vector<char> &temp) const override;
void streamScan(EngineStream &stream, const char *data, unsigned int len,
unsigned int id, ResultEntry &result) const;
unsigned int id, ResultEntry &result) const override;
void printStats() const;
void printStats() const override;
void printCsvStats() const;
void printCsvStats() const override;
void sqlStats(SqlDB &db) const;
void sqlStats(SqlDB &db) const override;
private:
std::vector<std::unique_ptr<PcreDB>> dbs;

4
tools/hsbench/main.cpp
View File

@@ -465,7 +465,7 @@ void processArgs(int argc, char *argv[], vector<BenchmarkSigs> &sigSets,
/** Start the global timer. */
static
void startTotalTimer(ThreadContext *ctx) {
void startTotalTimer(const ThreadContext *ctx) {
if (ctx->num != 0) {
return; // only runs in the first thread
}
@@ -474,7 +474,7 @@ void startTotalTimer(ThreadContext *ctx) {
/** Stop the global timer and calculate totals. */
static
void stopTotalTimer(ThreadContext *ctx) {
void stopTotalTimer(const ThreadContext *ctx) {
if (ctx->num != 0) {
return; // only runs in the first thread
}

4
tools/hscheck/main.cpp
View File

@@ -97,12 +97,12 @@ unsigned int countFailures = 0;
class ParsedExpr {
public:
ParsedExpr(string regex_in, unsigned int flags_in, hs_expr_ext ext_in)
ParsedExpr(string regex_in, unsigned int flags_in, const hs_expr_ext& ext_in)
: regex(regex_in), flags(flags_in), ext(ext_in) {}
~ParsedExpr() {}
string regex;
unsigned int flags;
hs_expr_ext ext;
const hs_expr_ext& ext;
};
typedef map<unsigned int, ParsedExpr> ExprExtMap;