diff options
Diffstat (limited to 'darray.h')
| -rw-r--r-- | darray.h | 23 |
1 files changed, 20 insertions, 3 deletions
@@ -4,6 +4,7 @@ #include <stdint.h> #include <stddef.h> #include <stdlib.h> +#include "ruby/ruby.h" // Type for a dynamic array. Use to declare a dynamic array. // It is a pointer so it fits in st_table nicely. Designed @@ -133,6 +134,9 @@ rb_darray_size(const void *ary) return meta ? meta->size : 0; } +/* Estimate of the amount of memory used by this darray. + * Useful for TypedData objects. */ +#define rb_darray_memsize(ary) (sizeof(*(ary)) + (rb_darray_size(ary) * sizeof((ary)->data[0]))) static inline void rb_darray_pop(void *ary, size_t count) @@ -158,6 +162,16 @@ rb_darray_free(void *ary) } static inline void +rb_darray_free_sized0(void *ary, size_t element_size) +{ + const rb_darray_meta_t *meta = ary; + if (meta) { + ruby_xfree_sized(ary, sizeof(*meta) + (element_size * meta->capa)); + } +} +#define rb_darray_free_sized(ary, T) rb_darray_free_sized0((ary), sizeof(T)) + +static inline void rb_darray_free_without_gc(void *ary) { free(ary); @@ -187,13 +201,16 @@ rb_darray_calloc_mul_add_without_gc(size_t x, size_t y, size_t z) return ptr; } +void *ruby_xrealloc_sized(void *ptr, size_t new_size, size_t old_size); + /* Internal function. Like rb_xrealloc_mul_add. */ static inline void * -rb_darray_realloc_mul_add(void *orig_ptr, size_t x, size_t y, size_t z) +rb_darray_realloc_mul_add(void *orig_ptr, size_t capa, size_t element_size, size_t header_size) { - size_t size = rbimpl_size_add_or_raise(rbimpl_size_mul_or_raise(x, y), z); + size_t size = rbimpl_size_add_or_raise(rbimpl_size_mul_or_raise(capa, element_size), header_size); + size_t old_size = (rb_darray_capa(orig_ptr) * element_size) + header_size; // We know it won't overflow - void *ptr = xrealloc(orig_ptr, size); + void *ptr = ruby_xrealloc_sized(orig_ptr, size, old_size); RUBY_ASSERT(ptr != NULL); return ptr; |