diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2020-11-13 16:45:52 +0900 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-11-13 16:45:52 +0900 |
| commit | f8ce3bec13cb506b014c358ac114f0a91862d4c5 (patch) | |
| tree | f5b8231c3b74dfdf81c9d18b6bbdd93905c6b39d | |
| parent | af13cfb7d5b7ddbadada80931d2f0d856d72170b (diff) | |
| parent | ac4eb9962967b0f11a4c7b3ff0c5cb3c2303716f (diff) | |
| download | mruby-f8ce3bec13cb506b014c358ac114f0a91862d4c5.tar.gz mruby-f8ce3bec13cb506b014c358ac114f0a91862d4c5.zip | |
Merge pull request #5125 from shuujii/rename-mrb_os_memsize_of_hash_table-to-mrb_hash_memsize
Rename `mrb_os_memsize_of_hash_table` to `mrb_hash_memsize`
| -rw-r--r-- | include/mruby/hash.h | 2 | ||||
| -rw-r--r-- | mrbgems/mruby-os-memsize/src/memsize.c | 2 | ||||
| -rw-r--r-- | src/hash.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/mruby/hash.h b/include/mruby/hash.h index c2af3b976..7383de5ac 100644 --- a/include/mruby/hash.h +++ b/include/mruby/hash.h @@ -35,7 +35,7 @@ struct RHash { #define mrb_hash_ptr(v) ((struct RHash*)(mrb_ptr(v))) #define mrb_hash_value(p) mrb_obj_value((void*)(p)) -size_t mrb_os_memsize_of_hash_table(mrb_value obj); +size_t mrb_hash_memsize(mrb_value obj); MRB_API mrb_value mrb_hash_new_capa(mrb_state *mrb, mrb_int capa); MRB_API mrb_value mrb_ensure_hash_type(mrb_state *mrb, mrb_value hash); MRB_API mrb_value mrb_check_hash_type(mrb_state *mrb, mrb_value hash); diff --git a/mrbgems/mruby-os-memsize/src/memsize.c b/mrbgems/mruby-os-memsize/src/memsize.c index 4714318bc..0bdd2c516 100644 --- a/mrbgems/mruby-os-memsize/src/memsize.c +++ b/mrbgems/mruby-os-memsize/src/memsize.c @@ -84,7 +84,7 @@ os_memsize_of_object(mrb_state* mrb, mrb_value obj) } case MRB_TT_HASH: { size += mrb_objspace_page_slot_size() + - mrb_os_memsize_of_hash_table(obj); + mrb_hash_memsize(obj); break; } case MRB_TT_ARRAY: { diff --git a/src/hash.c b/src/hash.c index f797f8823..5b5fc65b6 100644 --- a/src/hash.c +++ b/src/hash.c @@ -1031,7 +1031,7 @@ mrb_gc_free_hash(mrb_state *mrb, struct RHash *h) } size_t -mrb_os_memsize_of_hash_table(mrb_value self) +mrb_hash_memsize(mrb_value self) { struct RHash *h = mrb_hash_ptr(self); return h_ar_p(h) ? (ar_ea_capa(h) * sizeof(hash_entry)) : |