github_mirrors/vectorscan
3
0
Fork 1
mirror of https://github.com/VectorCamp/vectorscan.git synced 2025-11-16 09:21:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

rose: build a separate delay rebuild matcher

Browse Source
This commit is contained in:
Justin Viiret
2017-01-25 14:45:12 +11:00
committed by Matthew Barr
parent 5706acf5c0
commit ac858cd47c
7 changed files with 100 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/rose/stream.c
View File

@@ -412,16 +412,22 @@ void ensureStreamNeatAndTidy(const struct RoseEngine *t, char *state,
}
static really_inline
void do_rebuild(const struct RoseEngine *t, const struct HWLM *ftable,
struct hs_scratch *scratch) {
void do_rebuild(const struct RoseEngine *t, struct hs_scratch *scratch) {
assert(!can_stop_matching(scratch));
if (!t->drmatcherOffset) {
DEBUG_PRINTF("no delayed rebuild table\n");
return;
}
const struct HWLM *hwlm = getByOffset(t, t->drmatcherOffset);
size_t len = MIN(scratch->core_info.hlen, t->delayRebuildLength);
const u8 *buf = scratch->core_info.hbuf + scratch->core_info.hlen - len;
DEBUG_PRINTF("BEGIN FLOATING REBUILD over %zu bytes\n", len);
scratch->core_info.status &= ~STATUS_DELAY_DIRTY;
hwlmExec(ftable, buf, len, 0, roseDelayRebuildCallback, scratch,
hwlmExec(hwlm, buf, len, 0, roseDelayRebuildCallback, scratch,
scratch->tctxt.groups);
assert(!can_stop_matching(scratch));
}
@@ -637,13 +643,13 @@ void roseStreamExec(const struct RoseEngine *t, struct hs_scratch *scratch) {
if (!flen) {
if (rebuild) { /* rebuild floating delayed match stuff */
do_rebuild(t, ftable, scratch);
do_rebuild(t, scratch);
}
goto flush_delay_and_exit;
}
if (rebuild) { /* rebuild floating delayed match stuff */
do_rebuild(t, ftable, scratch);
do_rebuild(t, scratch);
}
if (flen + offset <= t->floatingMinDistance) {