1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Feature #18239] Add struct for embedded strings

Browse Source
This commit is contained in:
Peter Zhu 2021-08-02 12:16:24 -04:00
parent 09fa773e04
commit 46b66eb9e8
Notes: git 2021-10-26 02:26:50 +09:00 
Merged: https://github.com/ruby/ruby/pull/4933
2 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/ruby/internal/core/rstring.h
View File

@ -270,15 +270,16 @@ struct RString {
VALUE shared; VALUE shared;
} aux; } aux;
} heap; } heap;
struct {
/** /**
* Embedded contents. When a string is short enough, it uses this area * Embedded contents. When a string is short enough, it uses this area
* to store the contents themselves. This was impractical in the 20th * to store the contents themselves. This was impractical in the 20th
* century, but these days 64 bit machines can typically hold 48 bytes * century, but these days 64 bit machines can typically hold 48 bytes
* here. Could be sufficiently large. In this case the length is * here. Could be sufficiently large. In this case the length is
* encoded into the flags. * encoded into the flags.
*/ */
char ary[RSTRING_EMBED_LEN_MAX + 1]; char ary[RSTRING_EMBED_LEN_MAX + 1];
} embed;
} as; } as;
}; };
@ -440,7 +441,7 @@ rbimpl_rstring_getmem(VALUE str)
/* Expecting compilers to optimize this on-stack struct away. */ /* Expecting compilers to optimize this on-stack struct away. */
struct RString retval; struct RString retval;
retval.as.heap.len = RSTRING_EMBED_LEN(str); retval.as.heap.len = RSTRING_EMBED_LEN(str);
retval.as.heap.ptr = RSTRING(str)->as.ary; retval.as.heap.ptr = RSTRING(str)->as.embed.ary;
return retval; return retval;
} }
} }

22
string.c
View File

@ -1229,7 +1229,7 @@ str_replace_shared_without_enc(VALUE str2, VALUE str)
RSTRING_GETMEM(str, ptr, len); RSTRING_GETMEM(str, ptr, len);
if (STR_EMBEDDABLE_P(len, termlen)) { if (STR_EMBEDDABLE_P(len, termlen)) {
char *ptr2 = RSTRING(str2)->as.ary; char *ptr2 = RSTRING(str2)->as.embed.ary;
STR_SET_EMBED(str2); STR_SET_EMBED(str2);
memcpy(ptr2, RSTRING_PTR(str), len); memcpy(ptr2, RSTRING_PTR(str), len);
STR_SET_EMBED_LEN(str2, len); STR_SET_EMBED_LEN(str2, len);
@ -1598,7 +1598,7 @@ str_duplicate_setup(VALUE klass, VALUE str, VALUE dup)
; ;
VALUE flags = FL_TEST_RAW(str, flag_mask); VALUE flags = FL_TEST_RAW(str, flag_mask);
int encidx = 0; int encidx = 0;
MEMCPY(RSTRING(dup)->as.ary, RSTRING(str)->as.ary, MEMCPY(RSTRING(dup)->as.embed.ary, RSTRING(str)->as.embed.ary,
char, embed_size); char, embed_size);
if (flags & STR_NOEMBED) { if (flags & STR_NOEMBED) {
if (FL_TEST_RAW(str, STR_SHARED)) { if (FL_TEST_RAW(str, STR_SHARED)) {
@ -1613,7 +1613,7 @@ str_duplicate_setup(VALUE klass, VALUE str, VALUE dup)
flags |= STR_SHARED; flags |= STR_SHARED;
} }
else { else {
MEMCPY(RSTRING(dup)->as.ary, RSTRING(str)->as.ary, MEMCPY(RSTRING(dup)->as.embed.ary, RSTRING(str)->as.embed.ary,
char, embed_size); char, embed_size);
} }
} }
@ -1745,7 +1745,7 @@ rb_str_init(int argc, VALUE *argv, VALUE str)
str_modifiable(str); str_modifiable(str);
if (STR_EMBED_P(str)) { /* make noembed always */ if (STR_EMBED_P(str)) { /* make noembed always */
char *new_ptr = ALLOC_N(char, (size_t)capa + termlen); char *new_ptr = ALLOC_N(char, (size_t)capa + termlen);
memcpy(new_ptr, RSTRING(str)->as.ary, RSTRING_EMBED_LEN_MAX + 1); memcpy(new_ptr, RSTRING(str)->as.embed.ary, RSTRING_EMBED_LEN_MAX + 1);
RSTRING(str)->as.heap.ptr = new_ptr; RSTRING(str)->as.heap.ptr = new_ptr;
} }
else if (FL_TEST(str, STR_SHARED|STR_NOFREE)) { else if (FL_TEST(str, STR_SHARED|STR_NOFREE)) {
@ -2247,8 +2247,8 @@ str_make_independent_expand(VALUE str, long len, long expand, const int termlen)
if (!STR_EMBED_P(str) && STR_EMBEDDABLE_P(capa, termlen)) { if (!STR_EMBED_P(str) && STR_EMBEDDABLE_P(capa, termlen)) {
ptr = RSTRING(str)->as.heap.ptr; ptr = RSTRING(str)->as.heap.ptr;
STR_SET_EMBED(str); STR_SET_EMBED(str);
memcpy(RSTRING(str)->as.ary, ptr, len); memcpy(RSTRING(str)->as.embed.ary, ptr, len);
TERM_FILL(RSTRING(str)->as.ary + len, termlen); TERM_FILL(RSTRING(str)->as.embed.ary + len, termlen);
STR_SET_EMBED_LEN(str, len); STR_SET_EMBED_LEN(str, len);
return; return;
} }
@ -2887,7 +2887,7 @@ rb_str_resize(VALUE str, long len)
if (len == slen) return str; if (len == slen) return str;
if (STR_EMBEDDABLE_P(len, termlen)) { if (STR_EMBEDDABLE_P(len, termlen)) {
STR_SET_EMBED_LEN(str, len); STR_SET_EMBED_LEN(str, len);
TERM_FILL(RSTRING(str)->as.ary + len, termlen); TERM_FILL(RSTRING(str)->as.embed.ary + len, termlen);
return str; return str;
} }
str_make_independent_expand(str, slen, len - slen, termlen); str_make_independent_expand(str, slen, len - slen, termlen);
@ -2896,8 +2896,8 @@ rb_str_resize(VALUE str, long len)
char *ptr = STR_HEAP_PTR(str); char *ptr = STR_HEAP_PTR(str);
STR_SET_EMBED(str); STR_SET_EMBED(str);
if (slen > len) slen = len; if (slen > len) slen = len;
if (slen > 0) MEMCPY(RSTRING(str)->as.ary, ptr, char, slen); if (slen > 0) MEMCPY(RSTRING(str)->as.embed.ary, ptr, char, slen);
TERM_FILL(RSTRING(str)->as.ary + len, termlen); TERM_FILL(RSTRING(str)->as.embed.ary + len, termlen);
STR_SET_EMBED_LEN(str, len); STR_SET_EMBED_LEN(str, len);
if (independent) ruby_xfree(ptr); if (independent) ruby_xfree(ptr);
return str; return str;
@ -2935,7 +2935,7 @@ str_buf_cat(VALUE str, const char *ptr, long len)
if (len == 0) return 0; if (len == 0) return 0;
if (STR_EMBED_P(str)) { if (STR_EMBED_P(str)) {
capa = RSTRING_EMBED_LEN_MAX + 1 - termlen; capa = RSTRING_EMBED_LEN_MAX + 1 - termlen;
sptr = RSTRING(str)->as.ary; sptr = RSTRING(str)->as.embed.ary;
olen = RSTRING_EMBED_LEN(str); olen = RSTRING_EMBED_LEN(str);
} }
else { else {
@ -4802,7 +4802,7 @@ rb_str_drop_bytes(VALUE str, long len)
int fl = (int)(RBASIC(str)->flags & (STR_NOEMBED|STR_SHARED|STR_NOFREE)); int fl = (int)(RBASIC(str)->flags & (STR_NOEMBED|STR_SHARED|STR_NOFREE));
STR_SET_EMBED(str); STR_SET_EMBED(str);
STR_SET_EMBED_LEN(str, nlen); STR_SET_EMBED_LEN(str, nlen);
ptr = RSTRING(str)->as.ary; ptr = RSTRING(str)->as.embed.ary;
memmove(ptr, oldptr + len, nlen); memmove(ptr, oldptr + len, nlen);
if (fl == STR_NOEMBED) xfree(oldptr); if (fl == STR_NOEMBED) xfree(oldptr);
} }