From 48a2b96d2b8228a1c7dd49425fccd8b1202bf905 Mon Sep 17 00:00:00 2001 From: normal Date: Fri, 25 Jul 2014 21:34:35 +0000 Subject: introduce ZALLOC{,_N} to replace ALLOC{,_N}+MEMZERO use Using calloc where possible reduces code and binary sizes. * include/ruby/ruby.h (ZALLOC, ZALLOC_N): implement (Data_Make_Struct, TypedData_Make_Struct): ZALLOC replaces ALLOC+memset * compile.c (iseq_seq_sequence): ZALLOC_N replaces ALLOC_N+MEMZERO * cont.c (fiber_t_alloc): ZALLOC replaces ALLOC+MEMZERO * io.c (rb_io_reopen): ditto * iseq.c (prepare_iseq_build): ditto * parse.y (new_args_tail_gen, parser_new, ripper_s_allocate): ditto * re.c (match_alloc): ditto * variable.c (rb_const_set): ditto * ext/socket/raddrinfo.c (get_addrinfo): ditto * ext/strscan/strscan.c (strscan_s_allocate): ditto * gc.c (rb_objspace_alloc): calloc replaces malloc+MEMZERO git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46952 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- gc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'gc.c') diff --git a/gc.c b/gc.c index ae3f570ad1..f67caa62d7 100644 --- a/gc.c +++ b/gc.c @@ -920,8 +920,7 @@ RVALUE_DEMOTE_FROM_OLD(rb_objspace_t *objspace, VALUE obj) rb_objspace_t * rb_objspace_alloc(void) { - rb_objspace_t *objspace = malloc(sizeof(rb_objspace_t)); - memset(objspace, 0, sizeof(*objspace)); + rb_objspace_t *objspace = calloc(1, sizeof(rb_objspace_t)); ruby_gc_stress = ruby_initial_gc_stress; malloc_limit = gc_params.malloc_limit_min; @@ -1087,13 +1086,12 @@ heap_page_allocate(rb_objspace_t *objspace) } /* assign heap_page entry */ - page = (struct heap_page *)malloc(sizeof(struct heap_page)); + page = (struct heap_page *)calloc(1, sizeof(struct heap_page)); if (page == 0) { aligned_free(page_body); during_gc = 0; rb_memerror(); } - MEMZERO((void*)page, struct heap_page, 1); page->body = page_body; -- cgit v1.2.3