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

* string.c (rb_str_modify_expand, rb_str_resize): get rid of

Browse Source 
repeating malloc and realloc.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28827 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-08-01 14:04:39 +00:00
parent 6da48ad997
commit 4be5721dcb
2 changed files with 43 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Sun Aug 1 23:04:35 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (rb_str_modify_expand, rb_str_resize): get rid of
repeating malloc and realloc.
Sun Aug 1 22:16:30 2010 Kenta Murata <mrkn@mrkn.jp> Sun Aug 1 22:16:30 2010 Kenta Murata <mrkn@mrkn.jp>
* ext/bigdecimal/bigdecimal.c (BigDecimal_hash): use rb_memhash and * ext/bigdecimal/bigdecimal.c (BigDecimal_hash): use rb_memhash and

57
string.c
View File

@ -1264,12 +1264,12 @@ str_independent(VALUE str)
} }
static void static void
str_make_independent(VALUE str) str_make_independent_expand(VALUE str, long expand)
{ {
char *ptr; char *ptr;
long len = RSTRING_LEN(str); long len = RSTRING_LEN(str);
ptr = ALLOC_N(char, len+1); ptr = ALLOC_N(char, len+expand+1);
if (RSTRING_PTR(str)) { if (RSTRING_PTR(str)) {
memcpy(ptr, RSTRING_PTR(str), len); memcpy(ptr, RSTRING_PTR(str), len);
} }
@ -1281,6 +1281,8 @@ str_make_independent(VALUE str)
STR_UNSET_NOCAPA(str); STR_UNSET_NOCAPA(str);
} }
#define str_make_independent(str) str_make_independent_expand(str, 0L)
void void
rb_str_modify(VALUE str) rb_str_modify(VALUE str)
{ {
@ -1289,6 +1291,21 @@ rb_str_modify(VALUE str)
ENC_CODERANGE_CLEAR(str); ENC_CODERANGE_CLEAR(str);
} }
void
rb_str_modify_expand(VALUE str, long expand)
{
if (expand < 0) {
rb_raise(rb_eArgError, "negative expanding string size");
}
if (!str_independent(str) ||
(expand > 0 &&
(!STR_EMBED_P(str) ||
RSTRING_LEN(str) + expand > RSTRING_EMBED_LEN_MAX))) {
str_make_independent_expand(str, expand);
}
ENC_CODERANGE_CLEAR(str);
}
/* As rb_str_modify(), but don't clear coderange */ /* As rb_str_modify(), but don't clear coderange */
static void static void
str_modify_keep_cr(VALUE str) str_modify_keep_cr(VALUE str)
@ -1684,24 +1701,23 @@ VALUE
rb_str_resize(VALUE str, long len) rb_str_resize(VALUE str, long len)
{ {
long slen; long slen;
int independent;
if (len < 0) { if (len < 0) {
rb_raise(rb_eArgError, "negative string size (or size too big)"); rb_raise(rb_eArgError, "negative string size (or size too big)");
} }
rb_str_modify(str); independent = str_independent(str);
ENC_CODERANGE_CLEAR(str);
slen = RSTRING_LEN(str); slen = RSTRING_LEN(str);
if (len != slen) { if (len != slen) {
if (STR_EMBED_P(str)) { if (STR_EMBED_P(str)) {
char *ptr;
if (len <= RSTRING_EMBED_LEN_MAX) { if (len <= RSTRING_EMBED_LEN_MAX) {
STR_SET_EMBED_LEN(str, len); STR_SET_EMBED_LEN(str, len);
RSTRING(str)->as.ary[len] = '\0'; RSTRING(str)->as.ary[len] = '\0';
return str; return str;
} }
ptr = ALLOC_N(char,len+1); str_make_independent_expand(str, len - slen);
MEMCPY(ptr, RSTRING(str)->as.ary, char, slen);
RSTRING(str)->as.heap.ptr = ptr;
STR_SET_NOEMBED(str); STR_SET_NOEMBED(str);
} }
else if (len <= RSTRING_EMBED_LEN_MAX) { else if (len <= RSTRING_EMBED_LEN_MAX) {
@ -1710,9 +1726,12 @@ rb_str_resize(VALUE str, long len)
if (slen > 0) MEMCPY(RSTRING(str)->as.ary, ptr, char, len); if (slen > 0) MEMCPY(RSTRING(str)->as.ary, ptr, char, len);
RSTRING(str)->as.ary[len] = '\0'; RSTRING(str)->as.ary[len] = '\0';
STR_SET_EMBED_LEN(str, len); STR_SET_EMBED_LEN(str, len);
xfree(ptr); if (independent) xfree(ptr);
return str; return str;
} }
else if (!independent) {
str_make_independent_expand(str, len - slen);
}
else if (slen < len || slen - len > 1024) { else if (slen < len || slen - len > 1024) {
REALLOC_N(RSTRING(str)->as.heap.ptr, char, len+1); REALLOC_N(RSTRING(str)->as.heap.ptr, char, len+1);
} }
@ -1794,12 +1813,12 @@ rb_str_cat(VALUE str, const char *ptr, long len)
rb_raise(rb_eArgError, "negative string size (or size too big)"); rb_raise(rb_eArgError, "negative string size (or size too big)");
} }
if (STR_ASSOC_P(str)) { if (STR_ASSOC_P(str)) {
rb_str_modify(str); char *p;
if (STR_EMBED_P(str)) str_make_independent(str); rb_str_modify_expand(str, len);
REALLOC_N(RSTRING(str)->as.heap.ptr, char, RSTRING(str)->as.heap.len+len+1); p = RSTRING(str)->as.heap.ptr;
memcpy(RSTRING(str)->as.heap.ptr + RSTRING(str)->as.heap.len, ptr, len); memcpy(p + RSTRING(str)->as.heap.len, ptr, len);
RSTRING(str)->as.heap.len += len; len = RSTRING(str)->as.heap.len += len;
RSTRING(str)->as.heap.ptr[RSTRING(str)->as.heap.len] = '\0'; /* sentinel */ p[len] = '\0'; /* sentinel */
return str; return str;
} }
@ -1951,17 +1970,17 @@ rb_str_append(VALUE str, VALUE str2)
{ {
rb_encoding *enc; rb_encoding *enc;
int cr, cr2; int cr, cr2;
long len2;
StringValue(str2); StringValue(str2);
if (RSTRING_LEN(str2) > 0 && STR_ASSOC_P(str)) { if ((len2 = RSTRING_LEN(str2)) > 0 && STR_ASSOC_P(str)) {
long len = RSTRING_LEN(str)+RSTRING_LEN(str2); long len = RSTRING_LEN(str) + len2;
enc = rb_enc_check(str, str2); enc = rb_enc_check(str, str2);
cr = ENC_CODERANGE(str); cr = ENC_CODERANGE(str);
if ((cr2 = ENC_CODERANGE(str2)) > cr) cr = cr2; if ((cr2 = ENC_CODERANGE(str2)) > cr) cr = cr2;
rb_str_modify(str); rb_str_modify_expand(str, len2);
REALLOC_N(RSTRING(str)->as.heap.ptr, char, len+1);
memcpy(RSTRING(str)->as.heap.ptr + RSTRING(str)->as.heap.len, memcpy(RSTRING(str)->as.heap.ptr + RSTRING(str)->as.heap.len,
RSTRING_PTR(str2), RSTRING_LEN(str2)+1); RSTRING_PTR(str2), len2+1);
RSTRING(str)->as.heap.len = len; RSTRING(str)->as.heap.len = len;
rb_enc_associate(str, enc); rb_enc_associate(str, enc);
ENC_CODERANGE_SET(str, cr); ENC_CODERANGE_SET(str, cr);