summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog9
-rw-r--r--array.c12
-rw-r--r--gc.c8
-rw-r--r--internal.h6
-rw-r--r--string.c10
5 files changed, 27 insertions, 18 deletions
diff --git a/ChangeLog b/ChangeLog
index 2561e84b67..d2ac5f49a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Thu Oct 17 17:38:36 2013 Koichi Sasada <ko1@atdot.net>
+
+ * gc.c, internal.h: rename ruby_xsizefree/realloc to
+ rb_sized_free/realloc.
+
+ * array.c: catch up these changes.
+
+ * string.c: ditto.
+
Thu Oct 17 17:32:51 2013 Koichi Sasada <ko1@atdot.net>
* array.c, string.c: use ruby_xsizedfree() and ruby_xsizedrealloc().
diff --git a/array.c b/array.c
index 2224a5c417..54ddff47e6 100644
--- a/array.c
+++ b/array.c
@@ -225,7 +225,7 @@ ary_resize_capa(VALUE ary, long capacity)
MEMCPY((VALUE *)RARRAY(ary)->as.ary, ptr, VALUE, len);
FL_SET_EMBED(ary);
ARY_SET_LEN(ary, len);
- ruby_xsizedfree((VALUE *)ptr, size);
+ ruby_sized_xfree((VALUE *)ptr, size);
}
}
}
@@ -536,7 +536,7 @@ void
rb_ary_free(VALUE ary)
{
if (ARY_OWNS_HEAP_P(ary)) {
- ruby_xsizedfree((void *)ARY_HEAP_PTR(ary), ARY_HEAP_SIZE(ary));
+ ruby_sized_xfree((void *)ARY_HEAP_PTR(ary), ARY_HEAP_SIZE(ary));
}
}
@@ -716,7 +716,7 @@ rb_ary_initialize(int argc, VALUE *argv, VALUE ary)
rb_ary_modify(ary);
if (argc == 0) {
if (ARY_OWNS_HEAP_P(ary) && RARRAY_CONST_PTR(ary) != 0) {
- ruby_xsizedfree((void *)RARRAY_CONST_PTR(ary), ARY_HEAP_SIZE(ary));
+ ruby_sized_xfree((void *)RARRAY_CONST_PTR(ary), ARY_HEAP_SIZE(ary));
}
rb_ary_unshare_safe(ary);
FL_SET_EMBED(ary);
@@ -2436,7 +2436,7 @@ rb_ary_sort_bang(VALUE ary)
rb_ary_unshare(ary);
}
else {
- ruby_xsizedfree((void *)ARY_HEAP_PTR(ary), ARY_HEAP_SIZE(ary));
+ ruby_sized_xfree((void *)ARY_HEAP_PTR(ary), ARY_HEAP_SIZE(ary));
}
ARY_SET_PTR(ary, RARRAY_CONST_PTR(tmp));
ARY_SET_HEAP_LEN(ary, len);
@@ -3300,7 +3300,7 @@ rb_ary_replace(VALUE copy, VALUE orig)
VALUE shared = 0;
if (ARY_OWNS_HEAP_P(copy)) {
- RARRAY_PTR_USE(copy, ptr, ruby_xsizedfree(ptr, ARY_HEAP_SIZE(copy)));
+ RARRAY_PTR_USE(copy, ptr, ruby_sized_xfree(ptr, ARY_HEAP_SIZE(copy)));
}
else if (ARY_SHARED_P(copy)) {
shared = ARY_SHARED(copy);
@@ -3316,7 +3316,7 @@ rb_ary_replace(VALUE copy, VALUE orig)
else {
VALUE shared = ary_make_shared(orig);
if (ARY_OWNS_HEAP_P(copy)) {
- RARRAY_PTR_USE(copy, ptr, ruby_xsizedfree(ptr, ARY_HEAP_SIZE(copy)));
+ RARRAY_PTR_USE(copy, ptr, ruby_sized_xfree(ptr, ARY_HEAP_SIZE(copy)));
}
else {
rb_ary_unshare_safe(copy);
diff --git a/gc.c b/gc.c
index 819d93fcf5..405365f85c 100644
--- a/gc.c
+++ b/gc.c
@@ -5045,7 +5045,7 @@ ruby_xcalloc(size_t n, size_t size)
}
void *
-ruby_xsizedrealloc(void *ptr, size_t new_size, size_t old_size)
+ruby_sized_xrealloc(void *ptr, size_t new_size, size_t old_size)
{
return vm_xrealloc(&rb_objspace, ptr, new_size, old_size);
}
@@ -5053,7 +5053,7 @@ ruby_xsizedrealloc(void *ptr, size_t new_size, size_t old_size)
void *
ruby_xrealloc(void *ptr, size_t new_size)
{
- return ruby_xsizedrealloc(ptr, new_size, 0);
+ return ruby_sized_xrealloc(ptr, new_size, 0);
}
void *
@@ -5067,7 +5067,7 @@ ruby_xrealloc2(void *ptr, size_t n, size_t size)
}
void
-ruby_xsizedfree(void *x, size_t size)
+ruby_sized_xfree(void *x, size_t size)
{
if (x) {
vm_xfree(&rb_objspace, x, size);
@@ -5077,7 +5077,7 @@ ruby_xsizedfree(void *x, size_t size)
void
ruby_xfree(void *x)
{
- ruby_xsizedfree(x, 0);
+ ruby_sized_xfree(x, 0);
}
/* Mimic ruby_xmalloc, but need not rb_objspace.
diff --git a/internal.h b/internal.h
index efa5c1e83f..b4c10af0ae 100644
--- a/internal.h
+++ b/internal.h
@@ -432,9 +432,9 @@ void *ruby_mimmalloc(size_t size);
void rb_objspace_set_event_hook(const rb_event_flag_t event);
void rb_gc_writebarrier_remember_promoted(VALUE obj);
-void *ruby_xsizedrealloc(void *ptr, size_t new_size, size_t old_size) RUBY_ATTR_ALLOC_SIZE((2));;
-void ruby_xsizedfree(void *x, size_t size);
-#define SIZED_REALLOC_N(var,type,n,old_n) ((var)=(type*)ruby_xsizedrealloc((char*)(var), (n) * sizeof(type), (old_n) * sizeof(type)))
+void *ruby_sized_xrealloc(void *ptr, size_t new_size, size_t old_size) RUBY_ATTR_ALLOC_SIZE((2));;
+void ruby_sized_xfree(void *x, size_t size);
+#define SIZED_REALLOC_N(var,type,n,old_n) ((var)=(type*)ruby_sized_xrealloc((char*)(var), (n) * sizeof(type), (old_n) * sizeof(type)))
/* hash.c */
struct st_table *rb_hash_tbl_raw(VALUE hash);
diff --git a/string.c b/string.c
index fce8a05183..b81f839eb4 100644
--- a/string.c
+++ b/string.c
@@ -883,7 +883,7 @@ rb_str_free(VALUE str)
st_delete(frozen_strings, &fstr, NULL);
}
if (!STR_EMBED_P(str) && !STR_SHARED_P(str)) {
- ruby_xsizedfree(STR_HEAP_PTR(str), STR_HEAP_SIZE(str));
+ ruby_sized_xfree(STR_HEAP_PTR(str), STR_HEAP_SIZE(str));
}
}
@@ -1466,7 +1466,7 @@ str_discard(VALUE str)
{
str_modifiable(str);
if (!STR_SHARED_P(str) && !STR_EMBED_P(str)) {
- ruby_xsizedfree(STR_HEAP_PTR(str), STR_HEAP_SIZE(str));
+ ruby_sized_xfree(STR_HEAP_PTR(str), STR_HEAP_SIZE(str));
RSTRING(str)->as.heap.ptr = 0;
RSTRING(str)->as.heap.len = 0;
}
@@ -1990,7 +1990,7 @@ rb_str_resize(VALUE str, long len)
if (slen > 0) MEMCPY(RSTRING(str)->as.ary, ptr, char, slen);
TERM_FILL(RSTRING(str)->as.ary + len, termlen);
STR_SET_EMBED_LEN(str, len);
- if (independent) ruby_xsizedfree(ptr, size);
+ if (independent) ruby_sized_xfree(ptr, size);
return str;
}
else if (!independent) {
@@ -5501,7 +5501,7 @@ tr_trans(VALUE str, VALUE src, VALUE repl, int sflag)
t += tlen;
}
if (!STR_EMBED_P(str)) {
- ruby_xsizedfree(STR_HEAP_PTR(str), STR_HEAP_SIZE(str));
+ ruby_sized_xfree(STR_HEAP_PTR(str), STR_HEAP_SIZE(str));
}
*t = '\0';
RSTRING(str)->as.heap.ptr = buf;
@@ -5577,7 +5577,7 @@ tr_trans(VALUE str, VALUE src, VALUE repl, int sflag)
t += tlen;
}
if (!STR_EMBED_P(str)) {
- ruby_xsizedfree(STR_HEAP_PTR(str), STR_HEAP_SIZE(str));
+ ruby_sized_xfree(STR_HEAP_PTR(str), STR_HEAP_SIZE(str));
}
*t = '\0';
RSTRING(str)->as.heap.ptr = buf;
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 17:40:30 +0000