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

reduceInfixQueue: factor out any_work check

Browse Source
This commit is contained in:
Justin Viiret 2016-02-11 14:54:10 +11:00 committed by Matthew Barr
parent 4d5710a84a
commit 7a775e5fab
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/rose/infix.h
View File

@ -44,6 +44,26 @@ int infixTooOld(struct mq *q, s64a curr_loc) {
return q_last_loc(q) + maxAge < curr_loc; return q_last_loc(q) + maxAge < curr_loc;
} }
static really_inline
int canReduceQueue(const struct mq *q, s64a curr_loc, u32 maxTops, u32 maxAge) {
u32 qlen = q->end - q->cur; /* includes MQE_START */
if (maxAge && q->items[q->cur].location + maxAge < curr_loc) {
return 1;
}
if (qlen - 1 > maxTops) {
return 1;
}
if (qlen - 1 == maxTops
&& q->items[q->cur].location != q->items[q->cur + 1].location) {
/* we can advance start to the first top location */
return 1;
}
return 0;
}
/** /**
* Removes tops which are known not to affect the final state from the queue. * Removes tops which are known not to affect the final state from the queue.
@ -70,22 +90,7 @@ void reduceInfixQueue(struct mq *q, s64a curr_loc, u32 maxTops, u32 maxAge) {
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; if (!canReduceQueue(q, curr_loc, maxTops, maxAge)) {
if (maxAge && q->items[q->cur].location + maxAge < curr_loc) {
any_work = 1;
}
if (qlen - 1 > maxTops) {
any_work = 1;
}
if (qlen - 1 == maxTops
&& q->items[q->cur].location != q->items[q->cur + 1].location) {
/* we can advance start to the first top location */
any_work = 1;
}
if (!any_work) {
DEBUG_PRINTF("nothing to do\n"); DEBUG_PRINTF("nothing to do\n");
return; return;
} }