Skip to content

Commit

Permalink
Optimize StringBuilder append for static strings, and as_string().
Browse files Browse the repository at this point in the history
  • Loading branch information
Ivorforce committed Nov 29, 2024
1 parent f128f38 commit 77b1a06
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 16 deletions.
22 changes: 10 additions & 12 deletions core/string/string_builder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ StringBuilder &StringBuilder::append(const String &p_string) {
}

StringBuilder &StringBuilder::append(const char *p_cstring) {
int32_t len = strlen(p_cstring);
const int32_t len = strlen(p_cstring);

c_strings.push_back(p_cstring);
appended_strings.push_back(len);
Expand All @@ -62,31 +62,29 @@ String StringBuilder::as_string() const {
}

char32_t *buffer = memnew_arr(char32_t, string_length);

int current_position = 0;
char32_t *buffer_ptr = buffer;

int godot_string_elem = 0;
int c_string_elem = 0;

for (int i = 0; i < appended_strings.size(); i++) {
if (appended_strings[i] == -1) {
for (uint32_t i = 0; i < appended_strings.size(); i++) {
const int c_string_len = appended_strings[i];

if (c_string_len == -1) {
// Godot string
const String &s = strings[godot_string_elem];

memcpy(buffer + current_position, s.ptr(), s.length() * sizeof(char32_t));

current_position += s.length();
memcpy(buffer_ptr, s.ptr(), s.length() * sizeof(char32_t));
buffer_ptr += s.length();

godot_string_elem++;
} else {
const char *s = c_strings[c_string_elem];

for (int32_t j = 0; j < appended_strings[i]; j++) {
buffer[current_position + j] = s[j];
for (int32_t j = 0; j < c_string_len; ++j, ++buffer_ptr, ++s) {
*buffer_ptr = *s;
}

current_position += appended_strings[i];

c_string_elem++;
}
}
Expand Down
8 changes: 4 additions & 4 deletions core/string/string_builder.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,17 @@
#define STRING_BUILDER_H

#include "core/string/ustring.h"
#include "core/templates/vector.h"
#include "core/templates/local_vector.h"

class StringBuilder {
uint32_t string_length = 0;

Vector<String> strings;
Vector<const char *> c_strings;
LocalVector<String> strings;
LocalVector<const char *> c_strings;

// -1 means it's a Godot String
// a natural number means C string.
Vector<int32_t> appended_strings;
LocalVector<int32_t> appended_strings;

public:
StringBuilder &append(const String &p_string);
Expand Down

0 comments on commit 77b1a06

Please sign in to comment.