kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* gc.c (ruby_mimmalloc): defined for objects need not rb_objspace,

Browse source 
but should return pointer suitable for ruby_xfree;
  main vm and main thread.
  patched by Sokolov Yura. https://github.com/ruby/ruby/pull/79

* internal.h: ditto.

* vm.c (Init_BareVM): use ruby_mimmalloc.

* ext/dl/cfunc.c: #include <ruby/util.h>.

* ext/syslog/syslog.c: use xfree because it is allocated by
  ruby_strdup.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34257 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2012-01-10 03:49:10 +00:00
parent 107b713438
commit 56dc6f5acc
6 changed files with 42 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ChangeLog
View file

@ -1,3 +1,19 @@
Tue Jan 10 12:44:11 2012 NARUSE, Yui <naruse@ruby-lang.org>
* gc.c (ruby_mimmalloc): defined for objects need not rb_objspace,
but should return pointer suitable for ruby_xfree;
main vm and main thread.
patched by Sokolov Yura. https://github.com/ruby/ruby/pull/79
* internal.h: ditto.
* vm.c (Init_BareVM): use ruby_mimmalloc.
* ext/dl/cfunc.c: #include <ruby/util.h>.
* ext/syslog/syslog.c: use xfree because it is allocated by
ruby_strdup.
Tue Jan 10 12:13:56 2012 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
* ext/readline/readline.c (readline_attempted_completion_function):

3
ext/dl/cfunc.c
View file

@ -2,7 +2,8 @@
* $Id$
*/
#include <ruby.h>
#include <ruby/ruby.h>
#include <ruby/util.h>
#include <errno.h>
#include "dl.h"

2
ext/syslog/syslog.c
View file

@ -49,7 +49,7 @@ static VALUE mSyslog_close(VALUE self)
closelog();
free((void *)syslog_ident);
xfree((void *)syslog_ident);
syslog_ident = NULL;
syslog_options = syslog_facility = syslog_mask = -1;
syslog_opened = 0;

18
gc.c
View file

@ -941,6 +941,24 @@ ruby_xfree(void *x)
}
/* Mimic ruby_xmalloc, but need not rb_objspace.
* should return pointer suitable for ruby_xfree
*/
void *
ruby_mimmalloc(size_t size)
{
void *mem;
#if CALC_EXACT_MALLOC_SIZE
size += sizeof(size_t);
#endif
mem = malloc(size);
#if CALC_EXACT_MALLOC_SIZE
((size_t *)mem)[0] = size;
mem = (size_t *)mem + 1;
#endif
return mem;
}
/*
* call-seq:
* GC.enable -> true or false

1
internal.h
View file

@ -93,6 +93,7 @@ void Init_File(void);
/* gc.c */
void Init_heap(void);
void *ruby_mimmalloc(size_t size);
/* inits.c */
void rb_call_inits(void);

8
vm.c
View file

@ -1620,7 +1620,7 @@ ruby_vm_destruct(rb_vm_t *vm)
#endif
ruby_vm_run_at_exit_hooks(vm);
rb_vm_gvl_destroy(vm);
free(vm);
ruby_xfree(vm);
ruby_current_vm = 0;
}
RUBY_FREE_LEAVE("vm");
@ -1795,7 +1795,7 @@ thread_free(void *ptr)
free(th->altstack);
}
#endif
free(ptr);
ruby_xfree(ptr);
}
if (ruby_current_thread == th)
ruby_current_thread = NULL;
@ -2198,8 +2198,8 @@ void
Init_BareVM(void)
{
/* VM bootstrap: phase 1 */
rb_vm_t * vm = malloc(sizeof(*vm));
rb_thread_t * th = malloc(sizeof(*th));
rb_vm_t * vm = ruby_mimmalloc(sizeof(*vm));
rb_thread_t * th = ruby_mimmalloc(sizeof(*th));
if (!vm || !th) {
fprintf(stderr, "[FATAL] failed to allocate memory\n");
exit(EXIT_FAILURE);