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

Rose: make all NFA callbacks take scratch as ctx

Browse Source
This commit is contained in:
Justin Viiret 2016-03-03 14:23:08 +11:00 committed by Matthew Barr
parent 6af1ead0aa
commit 24ccefa3d3
2 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/rose/catchup.c
View File

@ -272,8 +272,8 @@ restart:
/* for use by mpv (chained) only */ /* for use by mpv (chained) only */
static UNUSED static UNUSED
int roseNfaFinalBlastAdaptor(u64a offset, ReportID id, void *context) { int roseNfaFinalBlastAdaptor(u64a offset, ReportID id, void *context) {
struct RoseContext *tctxt = context; struct hs_scratch *scratch = context;
struct hs_scratch *scratch = tctxtToScratch(tctxt); struct RoseContext *tctxt = &scratch->tctxt;
const struct RoseEngine *t = scratch->core_info.rose; const struct RoseEngine *t = scratch->core_info.rose;
DEBUG_PRINTF("called\n"); DEBUG_PRINTF("called\n");
@ -302,8 +302,8 @@ int roseNfaFinalBlastAdaptor(u64a offset, ReportID id, void *context) {
static UNUSED static UNUSED
int roseNfaFinalBlastAdaptorNoInternal(u64a offset, ReportID id, int roseNfaFinalBlastAdaptorNoInternal(u64a offset, ReportID id,
void *context) { void *context) {
struct RoseContext *tctxt = context; struct hs_scratch *scratch = context;
struct hs_scratch *scratch = tctxtToScratch(tctxt); struct RoseContext *tctxt = &scratch->tctxt;
const struct RoseEngine *t = scratch->core_info.rose; const struct RoseEngine *t = scratch->core_info.rose;
DEBUG_PRINTF("called\n"); DEBUG_PRINTF("called\n");
@ -468,8 +468,8 @@ done:
static UNUSED static UNUSED
int roseNfaBlastAdaptor(u64a offset, ReportID id, void *context) { int roseNfaBlastAdaptor(u64a offset, ReportID id, void *context) {
struct RoseContext *tctxt = context; struct hs_scratch *scratch = context;
struct hs_scratch *scratch = tctxtToScratch(tctxt); struct RoseContext *tctxt = &scratch->tctxt;
const struct RoseEngine *t = scratch->core_info.rose; const struct RoseEngine *t = scratch->core_info.rose;
const struct internal_report *ri = getInternalReport(t, id); const struct internal_report *ri = getInternalReport(t, id);
@ -507,8 +507,8 @@ int roseNfaBlastAdaptor(u64a offset, ReportID id, void *context) {
static UNUSED static UNUSED
int roseNfaBlastAdaptorNoInternal(u64a offset, ReportID id, void *context) { int roseNfaBlastAdaptorNoInternal(u64a offset, ReportID id, void *context) {
struct RoseContext *tctxt = context; struct hs_scratch *scratch = context;
struct hs_scratch *scratch = tctxtToScratch(tctxt); struct RoseContext *tctxt = &scratch->tctxt;
const struct RoseEngine *t = scratch->core_info.rose; const struct RoseEngine *t = scratch->core_info.rose;
DEBUG_PRINTF("called\n"); DEBUG_PRINTF("called\n");
@ -536,8 +536,8 @@ int roseNfaBlastAdaptorNoInternal(u64a offset, ReportID id, void *context) {
static UNUSED static UNUSED
int roseNfaBlastAdaptorNoChain(u64a offset, ReportID id, void *context) { int roseNfaBlastAdaptorNoChain(u64a offset, ReportID id, void *context) {
struct RoseContext *tctxt = context; struct hs_scratch *scratch = context;
struct hs_scratch *scratch = tctxtToScratch(tctxt); struct RoseContext *tctxt = &scratch->tctxt;
const struct RoseEngine *t = scratch->core_info.rose; const struct RoseEngine *t = scratch->core_info.rose;
DEBUG_PRINTF("masky got himself a blasted match @%llu id %u !woot!\n", DEBUG_PRINTF("masky got himself a blasted match @%llu id %u !woot!\n",
@ -564,8 +564,8 @@ int roseNfaBlastAdaptorNoChain(u64a offset, ReportID id, void *context) {
static UNUSED static UNUSED
int roseNfaBlastAdaptorNoInternalNoChain(u64a offset, ReportID id, int roseNfaBlastAdaptorNoInternalNoChain(u64a offset, ReportID id,
void *context) { void *context) {
struct RoseContext *tctxt = context; struct hs_scratch *scratch = context;
struct hs_scratch *scratch = tctxtToScratch(tctxt); struct RoseContext *tctxt = &scratch->tctxt;
const struct RoseEngine *t = scratch->core_info.rose; const struct RoseEngine *t = scratch->core_info.rose;
/* chained nfas are run under the control of the anchored catchup */ /* chained nfas are run under the control of the anchored catchup */
@ -589,8 +589,8 @@ int roseNfaBlastAdaptorNoInternalNoChain(u64a offset, ReportID id,
static UNUSED static UNUSED
int roseNfaBlastSomAdaptor(u64a from_offset, u64a offset, ReportID id, int roseNfaBlastSomAdaptor(u64a from_offset, u64a offset, ReportID id,
void *context) { void *context) {
struct RoseContext *tctxt = context; struct hs_scratch *scratch = context;
struct hs_scratch *scratch = tctxtToScratch(tctxt); struct RoseContext *tctxt = &scratch->tctxt;
const struct RoseEngine *t = scratch->core_info.rose; const struct RoseEngine *t = scratch->core_info.rose;
DEBUG_PRINTF("called\n"); DEBUG_PRINTF("called\n");
@ -618,12 +618,12 @@ int roseNfaBlastSomAdaptor(u64a from_offset, u64a offset, ReportID id,
} }
int roseNfaAdaptor(u64a offset, ReportID id, void *context) { int roseNfaAdaptor(u64a offset, ReportID id, void *context) {
struct RoseContext *tctxt = context; struct hs_scratch *scratch = context;
struct RoseContext *tctxt = &scratch->tctxt;
DEBUG_PRINTF("masky got himself a match @%llu id %u !woot!\n", offset, id); DEBUG_PRINTF("masky got himself a match @%llu id %u !woot!\n", offset, id);
updateLastMatchOffset(tctxt, offset); updateLastMatchOffset(tctxt, offset);
struct hs_scratch *scratch = tctxtToScratch(tctxt);
const struct RoseEngine *t = scratch->core_info.rose; const struct RoseEngine *t = scratch->core_info.rose;
if (handleReportInternally(t, scratch, id, offset)) { if (handleReportInternally(t, scratch, id, offset)) {
return MO_CONTINUE_MATCHING; return MO_CONTINUE_MATCHING;
@ -633,21 +633,23 @@ int roseNfaAdaptor(u64a offset, ReportID id, void *context) {
} }
int roseNfaAdaptorNoInternal(u64a offset, ReportID id, void *context) { int roseNfaAdaptorNoInternal(u64a offset, ReportID id, void *context) {
struct RoseContext *tctxt = context; struct hs_scratch *scratch = context;
struct RoseContext *tctxt = &scratch->tctxt;
DEBUG_PRINTF("masky got himself a match @%llu id %u !woot!\n", offset, id); DEBUG_PRINTF("masky got himself a match @%llu id %u !woot!\n", offset, id);
updateLastMatchOffset(tctxt, offset); updateLastMatchOffset(tctxt, offset);
return tctxt->cb(offset, id, tctxtToScratch(tctxt)); return tctxt->cb(offset, id, scratch);
} }
int roseNfaSomAdaptor(u64a from_offset, u64a offset, ReportID id, int roseNfaSomAdaptor(u64a from_offset, u64a offset, ReportID id,
void *context) { void *context) {
struct RoseContext *tctxt = context; struct hs_scratch *scratch = context;
struct RoseContext *tctxt = &scratch->tctxt;
DEBUG_PRINTF("masky got himself a match @%llu id %u !woot!\n", offset, id); DEBUG_PRINTF("masky got himself a match @%llu id %u !woot!\n", offset, id);
updateLastMatchOffset(tctxt, offset); updateLastMatchOffset(tctxt, offset);
/* must be a external report as haig cannot directly participate in chain */ /* must be a external report as haig cannot directly participate in chain */
return tctxt->cb_som(from_offset, offset, id, tctxtToScratch(tctxt)); return tctxt->cb_som(from_offset, offset, id, scratch);
} }
static really_inline static really_inline

2
src/rose/match.h
View File

@ -84,7 +84,7 @@ void initQueue(struct mq *q, u32 qi, const struct RoseEngine *t,
q->cb = roseNfaAdaptor; q->cb = roseNfaAdaptor;
} }
q->som_cb = roseNfaSomAdaptor; q->som_cb = roseNfaSomAdaptor;
q->context = &scratch->tctxt; q->context = scratch;
q->report_current = 0; q->report_current = 0;
DEBUG_PRINTF("qi=%u, offset=%llu, fullState=%u, streamState=%u, " DEBUG_PRINTF("qi=%u, offset=%llu, fullState=%u, streamState=%u, "