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

roseSuffixesEod: trust the queue structure

Browse Source
This commit is contained in:
Justin Viiret 2016-06-14 14:22:42 +10:00 committed by Matthew Barr
parent 3e0232f0d6
commit d9bd6d5dee
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/rose/program_runtime.h
View File

@ -859,32 +859,25 @@ hwlmcb_rv_t roseSuffixesEod(const struct RoseEngine *rose,
for (u32 qi = mmbit_iterate(aa, aaCount, MMB_INVALID); qi != MMB_INVALID; for (u32 qi = mmbit_iterate(aa, aaCount, MMB_INVALID); qi != MMB_INVALID;
qi = mmbit_iterate(aa, aaCount, qi)) { qi = mmbit_iterate(aa, aaCount, qi)) {
const struct NfaInfo *info = getNfaInfoByQueue(rose, qi);
const struct NFA *nfa = getNfaByInfo(rose, info);
assert(nfaAcceptsEod(nfa));
DEBUG_PRINTF("checking nfa %u\n", qi); DEBUG_PRINTF("checking nfa %u\n", qi);
struct mq *q = scratch->queues + qi;
assert(q->nfa == getNfaByQueue(rose, qi));
assert(nfaAcceptsEod(q->nfa));
/* We have just been triggered. */ /* We have just been triggered. */
assert(fatbit_isset(scratch->aqa, rose->queueCount, qi)); assert(fatbit_isset(scratch->aqa, rose->queueCount, qi));
char *fstate = scratch->fullState + info->fullStateOffset;
const char *sstate = scratch->core_info.state + info->stateOffset;
struct mq *q = scratch->queues + qi;
pushQueueNoMerge(q, MQE_END, scratch->core_info.len); pushQueueNoMerge(q, MQE_END, scratch->core_info.len);
q->context = NULL; q->context = NULL;
/* rose exec is used as we don't want to / can't raise matches in the /* rose exec is used as we don't want to / can't raise matches in the
* history buffer. */ * history buffer. */
if (!nfaQueueExecRose(q->nfa, q, MO_INVALID_IDX)) { if (!nfaQueueExecRose(q->nfa, q, MO_INVALID_IDX)) {
DEBUG_PRINTF("nfa is dead\n"); DEBUG_PRINTF("nfa is dead\n");
continue; continue;
} }
if (nfaCheckFinalState(nfa, fstate, sstate, offset, roseReportAdaptor, if (nfaCheckFinalState(q->nfa, q->state, q->streamState, offset,
roseReportSomAdaptor, roseReportAdaptor, roseReportSomAdaptor,
scratch) == MO_HALT_MATCHING) { scratch) == MO_HALT_MATCHING) {
DEBUG_PRINTF("user instructed us to stop\n"); DEBUG_PRINTF("user instructed us to stop\n");
return HWLM_TERMINATE_MATCHING; return HWLM_TERMINATE_MATCHING;