godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Merge pull request #69119 from lawnjelly/faster_variant_parser_master

Browse Source 
Add readahead to VariantParser [4.x]
This commit is contained in:
Rémi Verschelde
2022-12-05 00:06:14 +01:00
parent 408bd0aa92 5df29fec20
commit f4bccf90a3
2 changed files with 80 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
core/variant/variant_parser.cpp
View File

@@ -35,37 +35,76 @@
#include "core/os/keyboard.h"
#include "core/string/string_buffer.h"
char32_t VariantParser::StreamFile::get_char() {
return f->get_8();
char32_t VariantParser::Stream::get_char() {
// is within buffer?
if (readahead_pointer < readahead_filled) {
return readahead_buffer[readahead_pointer++];
}
// attempt to readahead
readahead_filled = _read_buffer(readahead_buffer, READAHEAD_SIZE);
if (readahead_filled) {
readahead_pointer = 0;
} else {
// EOF
readahead_pointer = 1;
eof = true;
return 0;
}
return get_char();
}
bool VariantParser::StreamFile::is_utf8() const {
return true;
}
bool VariantParser::StreamFile::is_eof() const {
return f->eof_reached();
}
uint32_t VariantParser::StreamFile::_read_buffer(char32_t *p_buffer, uint32_t p_num_chars) {
// The buffer is assumed to include at least one character (for null terminator)
ERR_FAIL_COND_V(!p_num_chars, 0);
char32_t VariantParser::StreamString::get_char() {
if (pos > s.length()) {
return 0;
} else if (pos == s.length()) {
// You need to try to read again when you have reached the end for EOF to be reported,
// so this works the same as files (like StreamFile does)
pos++;
return 0;
} else {
return s[pos++];
uint8_t *temp = (uint8_t *)alloca(p_num_chars);
uint64_t num_read = f->get_buffer(temp, p_num_chars);
ERR_FAIL_COND_V(num_read == UINT64_MAX, 0);
// translate to wchar
for (uint32_t n = 0; n < num_read; n++) {
p_buffer[n] = temp[n];
}
// could be less than p_num_chars, or zero
return num_read;
}
bool VariantParser::StreamString::is_utf8() const {
return false;
}
bool VariantParser::StreamString::is_eof() const {
return pos > s.length();
uint32_t VariantParser::StreamString::_read_buffer(char32_t *p_buffer, uint32_t p_num_chars) {
// The buffer is assumed to include at least one character (for null terminator)
ERR_FAIL_COND_V(!p_num_chars, 0);
int available = MAX(s.length() - pos, 0);
if (available >= (int)p_num_chars) {
const char32_t *src = s.ptr();
src += pos;
memcpy(p_buffer, src, p_num_chars * sizeof(char32_t));
pos += p_num_chars;
return p_num_chars;
}
// going to reach EOF
if (available) {
const char32_t *src = s.ptr();
src += pos;
memcpy(p_buffer, src, available * sizeof(char32_t));
pos += available;
}
// add a zero
p_buffer[available] = 0;
return available;
}
/////////////////////////////////////////////////////////////////////////////////////////////////