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

runtime: hoist broken check in streaming mode

Browse Source
This commit is contained in:
Justin Viiret 2015-12-18 15:50:56 +11:00 committed by Matthew Barr
parent b460f47476
commit 04dfed2602
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/runtime.c
View File

@ -1184,13 +1184,7 @@ void rawStreamExec(struct hs_stream *stream_state, struct hs_scratch *scratch) {
assert(scratch); assert(scratch);
char *state = getMultiState(stream_state); char *state = getMultiState(stream_state);
assert(!getBroken(state));
u8 broken = getBroken(state);
if (unlikely(broken)) {
assert(broken == BROKEN_FROM_USER || broken == BROKEN_EXHAUSTED);
scratch->core_info.broken = broken;
return;
}
DEBUG_PRINTF("::: streaming rose ::: offset = %llu len = %zu\n", DEBUG_PRINTF("::: streaming rose ::: offset = %llu len = %zu\n",
stream_state->offset, scratch->core_info.len); stream_state->offset, scratch->core_info.len);
@ -1215,13 +1209,7 @@ void pureLiteralStreamExec(struct hs_stream *stream_state,
assert(scratch); assert(scratch);
char *state = getMultiState(stream_state); char *state = getMultiState(stream_state);
assert(!getBroken(state));
u8 broken = getBroken(state);
if (unlikely(broken)) {
assert(broken == BROKEN_FROM_USER || broken == BROKEN_EXHAUSTED);
scratch->core_info.broken = broken;
return;
}
const struct RoseEngine *rose = stream_state->rose; const struct RoseEngine *rose = stream_state->rose;
const struct HWLM *ftable = getFLiteralMatcher(rose); const struct HWLM *ftable = getFLiteralMatcher(rose);
@ -1335,6 +1323,16 @@ hs_error_t hs_scan_stream_internal(hs_stream_t *id, const char *data,
if (!id->offset && rose->boundary.reportZeroOffset) { if (!id->offset && rose->boundary.reportZeroOffset) {
DEBUG_PRINTF("zero reports\n"); DEBUG_PRINTF("zero reports\n");
processReportList(rose, rose->boundary.reportZeroOffset, 0, scratch); processReportList(rose, rose->boundary.reportZeroOffset, 0, scratch);
broken = getBroken(state);
if (unlikely(broken)) {
DEBUG_PRINTF("stream is broken, halting scan\n");
if (broken == BROKEN_FROM_USER) {
return HS_SCAN_TERMINATED;
} else {
assert(broken == BROKEN_EXHAUSTED);
return HS_SUCCESS;
}
}
} }
switch (rose->runtimeImpl) { switch (rose->runtimeImpl) {