jasder
/
simdjson
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Stop caching the buffer index

This commit is contained in:
John Keiser 2020-06-06 13:08:34 -07:00
parent 8a8792d47f
commit 5f00b37e21
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/generic/stage2/logger.h
View File

@ -64,7 +64,7 @@ namespace logger {
printf("| %c ", printable_char(structurals.peek_char()));
printf("| %5u ", structurals.parser.structural_indexes[*structurals.next_structural]);
printf("| %-*s ", LOG_DETAIL_LEN, detail);
printf("| %*zu ", LOG_INDEX_LEN, structurals.idx);
printf("| %*u ", LOG_INDEX_LEN, *(structurals.next_structural-1));
printf("|\n");
}
}

13
src/generic/stage2/structural_iterator.h
View File

@ -4,7 +4,6 @@ class structural_iterator {
public:
const uint8_t* const buf;
uint32_t *next_structural;
size_t idx{0}; // location of the structural character in the input (buf)
uint8_t c{0}; // used to track the (structural) character we are looking at
dom_parser_implementation &parser;
@ -14,9 +13,8 @@ public:
parser{_parser} {
}
really_inline char advance_char() {
idx = *next_structural;
c = buf[*next_structural];
next_structural++;
c = *current();
return c;
}
really_inline char current_char() {
@ -26,10 +24,13 @@ public:
return buf[*next_structural];
}
really_inline const uint8_t* current() {
return &buf[idx];
return &buf[current_structural_index()];
}
really_inline size_t remaining_len() {
return parser.len - idx;
return parser.len - current_structural_index();
}
really_inline uint32_t current_structural_index() {
return *(next_structural-1);
}
template<typename F>
really_inline bool with_space_terminated_copy(const F& f) {
@ -52,7 +53,7 @@ public:
}
memcpy(copy, buf, parser.len);
memset(copy + parser.len, ' ', SIMDJSON_PADDING);
bool result = f(reinterpret_cast<const uint8_t*>(copy), idx);
bool result = f(reinterpret_cast<const uint8_t*>(copy), current_structural_index());
free(copy);
return result;
}