github_mirrors/vectorscan
3
0
Fork 1
mirror of https://github.com/VectorCamp/vectorscan.git synced 2026-01-01 14:15:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

rose: reduce anchored program dep on final_id

Browse Source 
We only need to build anchored programs for cases where a
RECORD_ANCHORED instruction has been generated, and we can key those
directly rather than using final_id.
This commit is contained in:
Justin Viiret
2017-02-14 10:19:25 +11:00
committed by Matthew Barr
parent ea8d0bcb1c
commit c426d2dc7d
2 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/rose/program_runtime.h
View File

@@ -103,7 +103,7 @@ void rosePushDelayedMatch(const struct RoseEngine *t,
static rose_inline
void recordAnchoredLiteralMatch(const struct RoseEngine *t,
struct hs_scratch *scratch, u32 literal_id,
struct hs_scratch *scratch, u32 anch_id,
u64a end) {
assert(end);
@@ -113,7 +113,7 @@ void recordAnchoredLiteralMatch(const struct RoseEngine *t,
struct fatbit **anchoredLiteralRows = getAnchoredLiteralLog(scratch);
DEBUG_PRINTF("record %u @ %llu\n", literal_id, end);
DEBUG_PRINTF("record %u (of %u) @ %llu\n", anch_id, t->anchored_count, end);
if (!bf64_set(&scratch->al_log_sum, end - 1)) {
// first time, clear row
@@ -121,11 +121,8 @@ void recordAnchoredLiteralMatch(const struct RoseEngine *t,
fatbit_clear(anchoredLiteralRows[end - 1]);
}
u32 rel_idx = literal_id - t->anchored_base_id;
DEBUG_PRINTF("record %u @ %llu index %u/%u\n", literal_id, end, rel_idx,
t->anchored_count);
assert(rel_idx < t->anchored_count);
fatbit_set(anchoredLiteralRows[end - 1], t->anchored_count, rel_idx);
assert(anch_id < t->anchored_count);
fatbit_set(anchoredLiteralRows[end - 1], t->anchored_count, anch_id);
}
static rose_inline