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

Rename reduceQueue to reduceInfixQueue

Browse Source
This commit is contained in:
Justin Viiret 2016-02-11 14:38:12 +11:00 committed by Matthew Barr
parent bba8b62635
commit 8f3471dd4e
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/rose/infix.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015, Intel Corporation * Copyright (c) 2015-2016, Intel Corporation
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
@ -63,12 +63,13 @@ int infixTooOld(struct mq *q, s64a curr_loc) {
* engine. * engine.
*/ */
static really_inline static really_inline
void reduceQueue(struct mq *q, s64a curr_loc, u32 maxTops, u32 maxAge) { void reduceInfixQueue(struct mq *q, s64a curr_loc, u32 maxTops, u32 maxAge) {
assert(q->end > q->cur); assert(q->end > q->cur);
assert(maxTops); assert(maxTops);
u32 qlen = q->end - q->cur; /* includes MQE_START */ u32 qlen = q->end - q->cur; /* includes MQE_START */
DEBUG_PRINTF("q=%p, len=%u, maxTops=%u maxAge=%u\n", q, qlen, maxTops, DEBUG_PRINTF("q=%p, len=%u, maxTops=%u maxAge=%u\n", q, qlen, maxTops,
maxAge); maxAge);
char any_work = 0; char any_work = 0;
if (maxAge && q->items[q->cur].location + maxAge < curr_loc) { if (maxAge && q->items[q->cur].location + maxAge < curr_loc) {
any_work = 1; any_work = 1;

6
src/rose/program_runtime.h
View File

@ -442,7 +442,7 @@ char roseTestLeftfix(const struct RoseEngine *t, struct hs_scratch *scratch,
goto nfa_dead; goto nfa_dead;
} }
reduceQueue(q, loc, left->maxQueueLen, q->nfa->maxWidth); reduceInfixQueue(q, loc, left->maxQueueLen, q->nfa->maxWidth);
} }
if (!rosePrefixCheckMiracles(t, left, ci, q, end)) { if (!rosePrefixCheckMiracles(t, left, ci, q, end)) {
@ -540,10 +540,10 @@ void roseTriggerInfix(const struct RoseEngine *t, struct hs_scratch *scratch,
pushQueueAt(q, 0, MQE_START, loc); pushQueueAt(q, 0, MQE_START, loc);
nfaQueueInitState(q->nfa, q); nfaQueueInitState(q->nfa, q);
} else if (isQueueFull(q)) { } else if (isQueueFull(q)) {
reduceQueue(q, loc, left->maxQueueLen, q->nfa->maxWidth); reduceInfixQueue(q, loc, left->maxQueueLen, q->nfa->maxWidth);
if (isQueueFull(q)) { if (isQueueFull(q)) {
/* still full - reduceQueue did nothing */ /* still full - reduceInfixQueue did nothing */
DEBUG_PRINTF("queue %u full (%u items) -> catching up nfa\n", qi, DEBUG_PRINTF("queue %u full (%u items) -> catching up nfa\n", qi,
q->end - q->cur); q->end - q->cur);
pushQueueNoMerge(q, MQE_END, loc); pushQueueNoMerge(q, MQE_END, loc);

2
src/rose/stream.c
View File

@ -291,7 +291,7 @@ char roseCatchUpLeftfix(const struct RoseEngine *t, char *state,
DEBUG_PRINTF("infix died of old age\n"); DEBUG_PRINTF("infix died of old age\n");
return 0; return 0;
} }
reduceQueue(q, last_loc, left->maxQueueLen, q->nfa->maxWidth); reduceInfixQueue(q, last_loc, left->maxQueueLen, q->nfa->maxWidth);
} }
DEBUG_PRINTF("end scan at %lld\n", last_loc); DEBUG_PRINTF("end scan at %lld\n", last_loc);