2000-05-01 05:42:38 -04:00
|
|
|
/**********************************************************************
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
gc.c -
|
|
|
|
|
|
|
|
$Author$
|
|
|
|
created at: Tue Oct 5 09:44:46 JST 1993
|
|
|
|
|
* encoding.c: provide basic features for M17N.
* parse.y: encoding aware parsing.
* parse.y (pragma_encoding): encoding specification pragma.
* parse.y (rb_intern3): encoding specified symbols.
* string.c (rb_str_length): length based on characters.
for older behavior, bytesize method added.
* string.c (rb_str_index_m): index based on characters. rindex as
well.
* string.c (succ_char): encoding aware succeeding string.
* string.c (rb_str_reverse): reverse based on characters.
* string.c (rb_str_inspect): encoding aware string description.
* string.c (rb_str_upcase_bang): encoding aware case conversion.
downcase, capitalize, swapcase as well.
* string.c (rb_str_tr_bang): tr based on characters. delete,
squeeze, tr_s, count as well.
* string.c (rb_str_split_m): split based on characters.
* string.c (rb_str_each_line): encoding aware each_line.
* string.c (rb_str_each_char): added. iteration based on
characters.
* string.c (rb_str_strip_bang): encoding aware whitespace
stripping. lstrip, rstrip as well.
* string.c (rb_str_justify): encoding aware justifying (ljust,
rjust, center).
* string.c (str_encoding): get encoding attribute from a string.
* re.c (rb_reg_initialize): encoding aware regular expression
* sprintf.c (rb_str_format): formatting (i.e. length count) based
on characters.
* io.c (rb_io_getc): getc to return one-character string.
for older behavior, getbyte method added.
* ext/stringio/stringio.c (strio_getc): ditto.
* io.c (rb_io_ungetc): allow pushing arbitrary string at the
current reading point.
* ext/stringio/stringio.c (strio_ungetc): ditto.
* ext/strscan/strscan.c: encoding support.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13261 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-08-24 23:29:39 -04:00
|
|
|
Copyright (C) 1993-2007 Yukihiro Matsumoto
|
2000-05-01 05:42:38 -04:00
|
|
|
Copyright (C) 2000 Network Applied Communication Laboratory, Inc.
|
2000-05-09 00:53:16 -04:00
|
|
|
Copyright (C) 2000 Information-technology Promotion Agency, Japan
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2000-05-01 05:42:38 -04:00
|
|
|
**********************************************************************/
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2007-06-09 23:06:15 -04:00
|
|
|
#include "ruby/ruby.h"
|
|
|
|
#include "ruby/signal.h"
|
|
|
|
#include "ruby/st.h"
|
|
|
|
#include "ruby/node.h"
|
|
|
|
#include "ruby/re.h"
|
2007-11-19 22:16:53 -05:00
|
|
|
#include "ruby/io.h"
|
* blockinlining.c: remove "yarv" prefix.
* array.c, numeric.c: ditto.
* insnhelper.ci, insns.def, vm_evalbody.ci: ditto.
* yarvcore.c: removed.
* yarvcore.h: renamed to core.h.
* cont.c, debug.c, error.c, process.c, signal.c : ditto.
* ext/probeprofiler/probeprofiler.c: ditto.
* id.c, id.h: added.
* inits.c: ditto.
* compile.c: rename internal functions.
* compile.h: fix debug flag.
* eval.c, object.c, vm.c: remove ruby_top_self.
use rb_vm_top_self() instead.
* eval_intern.h, eval_load: ditto.
* gc.c: rename yarv_machine_stack_mark() to
rb_gc_mark_machine_stack().
* insnhelper.h: remove unused macros.
* iseq.c: add iseq_compile() to create iseq object
from source string.
* proc.c: rename a internal function.
* template/insns.inc.tmpl: remove YARV prefix.
* thread.c:
* vm.c (rb_iseq_eval): added.
* vm.c: move some functions from yarvcore.c.
* vm_dump.c: fix to remove compiler warning.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12741 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-07-12 00:25:46 -04:00
|
|
|
#include "vm_core.h"
|
2007-05-29 11:49:30 -04:00
|
|
|
#include "gc.h"
|
1998-01-16 07:13:05 -05:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <setjmp.h>
|
2001-11-19 09:42:45 -05:00
|
|
|
#include <sys/types.h>
|
|
|
|
|
|
|
|
#ifdef HAVE_SYS_TIME_H
|
|
|
|
#include <sys/time.h>
|
|
|
|
#endif
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2001-11-19 00:03:03 -05:00
|
|
|
#ifdef HAVE_SYS_RESOURCE_H
|
|
|
|
#include <sys/resource.h>
|
|
|
|
#endif
|
|
|
|
|
2004-07-08 06:27:23 -04:00
|
|
|
#if defined _WIN32 || defined __CYGWIN__
|
|
|
|
#include <windows.h>
|
|
|
|
#endif
|
|
|
|
|
2007-07-14 03:19:59 -04:00
|
|
|
#ifdef HAVE_VALGRIND_MEMCHECK_H
|
|
|
|
# include <valgrind/memcheck.h>
|
|
|
|
# ifndef VALGRIND_MAKE_MEM_DEFINED
|
|
|
|
# define VALGRIND_MAKE_MEM_DEFINED(p, n) VALGRIND_MAKE_READABLE(p, n)
|
|
|
|
# endif
|
2007-08-19 00:34:44 -04:00
|
|
|
# ifndef VALGRIND_MAKE_MEM_UNDEFINED
|
|
|
|
# define VALGRIND_MAKE_MEM_UNDEFINED(p, n) VALGRIND_MAKE_WRITABLE(p, n)
|
|
|
|
# endif
|
2007-07-14 03:19:59 -04:00
|
|
|
#else
|
|
|
|
# define VALGRIND_MAKE_MEM_DEFINED(p, n) /* empty */
|
2007-08-19 00:34:44 -04:00
|
|
|
# define VALGRIND_MAKE_MEM_UNDEFINED(p, n) /* empty */
|
2007-07-14 03:19:59 -04:00
|
|
|
#endif
|
|
|
|
|
* file.c, gc.c, io.c, ruby.h, rubyio.h, win32/win32.h (rb_io_t):
renamed from OpenFile.
* ext/dl/cptr.c, ext/io/wait/wait.c, ext/openssl/ossl.h,
ext/openssl/ossl_bio.c, ext/openssl/ossl_ssl.c, ext/pty/pty.c,
ext/readline/readline.c, ext/socket/socket.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11869 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-24 05:30:50 -05:00
|
|
|
int rb_io_fptr_finalize(struct rb_io_t*);
|
1999-01-19 23:59:39 -05:00
|
|
|
|
2002-08-12 03:39:12 -04:00
|
|
|
#if !defined(setjmp) && defined(HAVE__SETJMP)
|
1998-01-16 07:13:05 -05:00
|
|
|
#define setjmp(env) _setjmp(env)
|
|
|
|
#endif
|
|
|
|
|
2001-02-11 02:12:02 -05:00
|
|
|
/* Make alloca work the best possible way. */
|
2002-10-25 14:39:30 -04:00
|
|
|
#ifdef __GNUC__
|
|
|
|
# ifndef atarist
|
|
|
|
# ifndef alloca
|
|
|
|
# define alloca __builtin_alloca
|
|
|
|
# endif
|
|
|
|
# endif /* atarist */
|
|
|
|
#else
|
|
|
|
# ifdef HAVE_ALLOCA_H
|
2001-02-11 02:12:02 -05:00
|
|
|
# include <alloca.h>
|
2001-03-26 03:57:16 -05:00
|
|
|
# else
|
2006-12-31 10:02:22 -05:00
|
|
|
# ifdef _AIX
|
|
|
|
#pragma alloca
|
|
|
|
# else
|
2001-03-26 03:57:16 -05:00
|
|
|
# ifndef alloca /* predefined by HP cc +Olibcalls */
|
|
|
|
void *alloca ();
|
|
|
|
# endif
|
2002-10-25 14:39:30 -04:00
|
|
|
# endif /* AIX */
|
|
|
|
# endif /* HAVE_ALLOCA_H */
|
|
|
|
#endif /* __GNUC__ */
|
2001-02-11 02:12:02 -05:00
|
|
|
|
2002-10-10 11:26:58 -04:00
|
|
|
#ifndef GC_MALLOC_LIMIT
|
|
|
|
#if defined(MSDOS) || defined(__human68k__)
|
|
|
|
#define GC_MALLOC_LIMIT 200000
|
|
|
|
#else
|
|
|
|
#define GC_MALLOC_LIMIT 8000000
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
2002-10-10 13:11:18 -04:00
|
|
|
static unsigned long malloc_increase = 0;
|
2002-10-10 11:26:58 -04:00
|
|
|
static unsigned long malloc_limit = GC_MALLOC_LIMIT;
|
2002-04-24 00:54:16 -04:00
|
|
|
static VALUE nomem_error;
|
2006-12-31 10:02:22 -05:00
|
|
|
|
|
|
|
static int dont_gc;
|
|
|
|
static int during_gc;
|
|
|
|
static int need_call_final = 0;
|
|
|
|
static st_table *finalizer_table = 0;
|
|
|
|
|
|
|
|
#define MARK_STACK_MAX 1024
|
|
|
|
static VALUE mark_stack[MARK_STACK_MAX];
|
|
|
|
static VALUE *mark_stack_ptr;
|
|
|
|
static int mark_stack_overflow;
|
|
|
|
|
2007-06-24 22:44:20 -04:00
|
|
|
int ruby_gc_debug_indent = 0;
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
#undef GC_DEBUG
|
|
|
|
|
|
|
|
#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__CYGWIN__)
|
|
|
|
#pragma pack(push, 1) /* magic for reducing sizeof(RVALUE): 24 -> 20 */
|
|
|
|
#endif
|
|
|
|
|
|
|
|
typedef struct RVALUE {
|
|
|
|
union {
|
|
|
|
struct {
|
2007-06-25 07:20:45 -04:00
|
|
|
VALUE flags; /* always 0 for freed obj */
|
2006-12-31 10:02:22 -05:00
|
|
|
struct RVALUE *next;
|
|
|
|
} free;
|
|
|
|
struct RBasic basic;
|
|
|
|
struct RObject object;
|
|
|
|
struct RClass klass;
|
|
|
|
struct RFloat flonum;
|
|
|
|
struct RString string;
|
|
|
|
struct RArray array;
|
|
|
|
struct RRegexp regexp;
|
|
|
|
struct RHash hash;
|
|
|
|
struct RData data;
|
|
|
|
struct RStruct rstruct;
|
|
|
|
struct RBignum bignum;
|
|
|
|
struct RFile file;
|
|
|
|
struct RNode node;
|
|
|
|
struct RMatch match;
|
|
|
|
} as;
|
|
|
|
#ifdef GC_DEBUG
|
|
|
|
char *file;
|
|
|
|
int line;
|
|
|
|
#endif
|
|
|
|
} RVALUE;
|
|
|
|
|
|
|
|
#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__CYGWIN__)
|
|
|
|
#pragma pack(pop)
|
|
|
|
#endif
|
|
|
|
|
|
|
|
static RVALUE *freelist = 0;
|
|
|
|
static RVALUE *deferred_final_list = 0;
|
|
|
|
|
|
|
|
#define HEAPS_INCREMENT 10
|
|
|
|
static struct heaps_slot {
|
|
|
|
void *membase;
|
|
|
|
RVALUE *slot;
|
|
|
|
int limit;
|
|
|
|
} *heaps;
|
|
|
|
static int heaps_length = 0;
|
|
|
|
static int heaps_used = 0;
|
|
|
|
|
|
|
|
#define HEAP_MIN_SLOTS 10000
|
|
|
|
static int heap_slots = HEAP_MIN_SLOTS;
|
|
|
|
|
|
|
|
#define FREE_MIN 4096
|
|
|
|
|
|
|
|
static RVALUE *himem, *lomem;
|
|
|
|
|
|
|
|
extern st_table *rb_class_tbl;
|
|
|
|
VALUE *rb_gc_stack_start = 0;
|
|
|
|
#ifdef __ia64
|
|
|
|
VALUE *rb_gc_register_stack_start = 0;
|
|
|
|
#endif
|
|
|
|
|
2007-06-29 03:57:24 -04:00
|
|
|
int ruby_gc_stress = 0;
|
2006-12-31 10:02:22 -05:00
|
|
|
|
|
|
|
|
|
|
|
#ifdef DJGPP
|
|
|
|
/* set stack size (http://www.delorie.com/djgpp/v2faq/faq15_9.html) */
|
|
|
|
unsigned int _stklen = 0x180000; /* 1.5 kB */
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if defined(DJGPP) || defined(_WIN32_WCE)
|
2007-12-14 23:09:24 -05:00
|
|
|
size_t rb_gc_stack_maxsize = 65535*sizeof(VALUE);
|
2006-12-31 10:02:22 -05:00
|
|
|
#else
|
2007-12-14 23:09:24 -05:00
|
|
|
size_t rb_gc_stack_maxsize = 655300*sizeof(VALUE);
|
2006-12-31 10:02:22 -05:00
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void run_final(VALUE obj);
|
2005-09-16 09:44:59 -04:00
|
|
|
static int garbage_collect(void);
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2002-04-24 00:54:16 -04:00
|
|
|
void
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_global_variable(VALUE *var)
|
1999-12-14 01:50:43 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_gc_register_address(var);
|
|
|
|
}
|
2000-12-28 21:47:07 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
void
|
|
|
|
rb_memerror(void)
|
|
|
|
{
|
|
|
|
static int recurse = 0;
|
2005-09-16 09:44:59 -04:00
|
|
|
if (!nomem_error || (recurse > 0 && rb_safe_level() < 4)) {
|
2002-04-24 00:54:16 -04:00
|
|
|
fprintf(stderr, "[FATAL] failed to allocate memory\n");
|
|
|
|
exit(1);
|
1999-12-14 01:50:43 -05:00
|
|
|
}
|
2002-04-24 00:54:16 -04:00
|
|
|
recurse++;
|
|
|
|
rb_exc_raise(nomem_error);
|
1999-12-14 01:50:43 -05:00
|
|
|
}
|
1999-08-13 01:45:20 -04:00
|
|
|
|
2006-01-09 17:32:55 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* GC.stress => true or false
|
|
|
|
*
|
|
|
|
* returns current status of GC stress mode.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
gc_stress_get(VALUE self)
|
|
|
|
{
|
2007-06-29 03:57:24 -04:00
|
|
|
return ruby_gc_stress ? Qtrue : Qfalse;
|
2006-01-09 17:32:55 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* GC.stress = bool => bool
|
|
|
|
*
|
|
|
|
* updates GC stress mode.
|
|
|
|
*
|
|
|
|
* When GC.stress = true, GC is invoked for all GC opportunity:
|
|
|
|
* all memory and object allocation.
|
|
|
|
*
|
|
|
|
* Since it makes Ruby very slow, it is only for debugging.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
gc_stress_set(VALUE self, VALUE bool)
|
|
|
|
{
|
|
|
|
rb_secure(2);
|
2007-06-29 03:57:24 -04:00
|
|
|
ruby_gc_stress = RTEST(bool);
|
2006-01-09 17:32:55 -05:00
|
|
|
return bool;
|
|
|
|
}
|
2005-12-11 19:36:54 -05:00
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
void *
|
2005-12-06 02:52:18 -05:00
|
|
|
ruby_xmalloc(size_t size)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
void *mem;
|
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
if (size < 0) {
|
2000-01-04 23:41:21 -05:00
|
|
|
rb_raise(rb_eNoMemError, "negative allocation size (or too big)");
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
if (size == 0) size = 1;
|
2002-10-10 13:11:18 -04:00
|
|
|
malloc_increase += size;
|
2000-09-25 13:51:29 -04:00
|
|
|
|
2007-06-29 03:57:24 -04:00
|
|
|
if (ruby_gc_stress || malloc_increase > malloc_limit) {
|
2004-10-01 11:56:05 -04:00
|
|
|
garbage_collect();
|
2002-10-10 11:26:58 -04:00
|
|
|
}
|
2000-11-14 02:10:31 -05:00
|
|
|
RUBY_CRITICAL(mem = malloc(size));
|
1998-01-16 07:13:05 -05:00
|
|
|
if (!mem) {
|
2005-09-16 09:44:59 -04:00
|
|
|
if (garbage_collect()) {
|
|
|
|
RUBY_CRITICAL(mem = malloc(size));
|
|
|
|
}
|
1999-12-14 01:50:43 -05:00
|
|
|
if (!mem) {
|
2002-04-24 00:54:16 -04:00
|
|
|
rb_memerror();
|
1999-12-14 01:50:43 -05:00
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
return mem;
|
|
|
|
}
|
|
|
|
|
2005-10-05 12:15:16 -04:00
|
|
|
void *
|
2005-12-06 02:52:18 -05:00
|
|
|
ruby_xmalloc2(size_t n, size_t size)
|
2005-10-05 12:15:16 -04:00
|
|
|
{
|
|
|
|
long len = size * n;
|
2005-12-06 02:52:18 -05:00
|
|
|
if (n != 0 && size != len / n) {
|
2005-10-05 12:15:16 -04:00
|
|
|
rb_raise(rb_eArgError, "malloc: possible integer overflow");
|
|
|
|
}
|
|
|
|
return ruby_xmalloc(len);
|
|
|
|
}
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
void *
|
2005-12-06 02:52:18 -05:00
|
|
|
ruby_xcalloc(size_t n, size_t size)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
void *mem;
|
|
|
|
|
2005-10-05 12:15:16 -04:00
|
|
|
mem = ruby_xmalloc2(n, size);
|
1998-01-16 07:13:05 -05:00
|
|
|
memset(mem, 0, n * size);
|
|
|
|
|
|
|
|
return mem;
|
|
|
|
}
|
|
|
|
|
|
|
|
void *
|
2005-12-06 02:52:18 -05:00
|
|
|
ruby_xrealloc(void *ptr, size_t size)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
void *mem;
|
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
if (size < 0) {
|
|
|
|
rb_raise(rb_eArgError, "negative re-allocation size");
|
|
|
|
}
|
2005-10-05 12:15:16 -04:00
|
|
|
if (!ptr) return ruby_xmalloc(size);
|
1999-01-19 23:59:39 -05:00
|
|
|
if (size == 0) size = 1;
|
2002-10-10 13:11:18 -04:00
|
|
|
malloc_increase += size;
|
2007-06-29 03:57:24 -04:00
|
|
|
if (ruby_gc_stress) garbage_collect();
|
2000-11-14 02:10:31 -05:00
|
|
|
RUBY_CRITICAL(mem = realloc(ptr, size));
|
1998-01-16 07:13:05 -05:00
|
|
|
if (!mem) {
|
2005-09-16 09:44:59 -04:00
|
|
|
if (garbage_collect()) {
|
|
|
|
RUBY_CRITICAL(mem = realloc(ptr, size));
|
|
|
|
}
|
2001-07-20 11:20:25 -04:00
|
|
|
if (!mem) {
|
2002-04-24 00:54:16 -04:00
|
|
|
rb_memerror();
|
2001-07-20 11:20:25 -04:00
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
return mem;
|
|
|
|
}
|
|
|
|
|
2005-10-05 12:15:16 -04:00
|
|
|
void *
|
2005-12-06 02:52:18 -05:00
|
|
|
ruby_xrealloc2(void *ptr, size_t n, size_t size)
|
2005-10-05 12:15:16 -04:00
|
|
|
{
|
2005-12-06 02:52:18 -05:00
|
|
|
size_t len = size * n;
|
|
|
|
if (n != 0 && size != len / n) {
|
2005-10-05 12:15:16 -04:00
|
|
|
rb_raise(rb_eArgError, "realloc: possible integer overflow");
|
|
|
|
}
|
|
|
|
return ruby_xrealloc(ptr, len);
|
|
|
|
}
|
|
|
|
|
2000-02-08 03:54:01 -05:00
|
|
|
void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
ruby_xfree(void *x)
|
1999-08-13 01:45:20 -04:00
|
|
|
{
|
2000-11-14 02:10:31 -05:00
|
|
|
if (x)
|
|
|
|
RUBY_CRITICAL(free(x));
|
1999-08-13 01:45:20 -04:00
|
|
|
}
|
|
|
|
|
2003-12-22 01:20:14 -05:00
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* GC.enable => true or false
|
2005-06-19 13:16:14 -04:00
|
|
|
*
|
2003-12-22 01:20:14 -05:00
|
|
|
* Enables garbage collection, returning <code>true</code> if garbage
|
|
|
|
* collection was previously disabled.
|
2005-06-19 13:16:14 -04:00
|
|
|
*
|
2003-12-22 01:20:14 -05:00
|
|
|
* GC.disable #=> false
|
|
|
|
* GC.enable #=> true
|
|
|
|
* GC.enable #=> false
|
2005-06-19 13:16:14 -04:00
|
|
|
*
|
2003-12-22 01:20:14 -05:00
|
|
|
*/
|
|
|
|
|
2001-01-29 00:10:42 -05:00
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_gc_enable(void)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
int old = dont_gc;
|
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
dont_gc = Qfalse;
|
1998-01-16 07:13:05 -05:00
|
|
|
return old;
|
|
|
|
}
|
|
|
|
|
2003-12-22 01:20:14 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* GC.disable => true or false
|
2005-06-19 13:16:14 -04:00
|
|
|
*
|
2003-12-22 01:20:14 -05:00
|
|
|
* Disables garbage collection, returning <code>true</code> if garbage
|
|
|
|
* collection was already disabled.
|
2005-06-19 13:16:14 -04:00
|
|
|
*
|
2003-12-22 01:20:14 -05:00
|
|
|
* GC.disable #=> false
|
|
|
|
* GC.disable #=> true
|
2005-06-19 13:16:14 -04:00
|
|
|
*
|
2003-12-22 01:20:14 -05:00
|
|
|
*/
|
|
|
|
|
2001-01-29 00:10:42 -05:00
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_gc_disable(void)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
int old = dont_gc;
|
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
dont_gc = Qtrue;
|
1998-01-16 07:13:05 -05:00
|
|
|
return old;
|
|
|
|
}
|
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
VALUE rb_mGC;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
static struct gc_list {
|
|
|
|
VALUE *varptr;
|
|
|
|
struct gc_list *next;
|
2001-10-31 01:53:22 -05:00
|
|
|
} *global_List = 0;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_gc_register_address(VALUE *addr)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
struct gc_list *tmp;
|
|
|
|
|
|
|
|
tmp = ALLOC(struct gc_list);
|
2001-10-31 01:53:22 -05:00
|
|
|
tmp->next = global_List;
|
2000-02-08 03:54:01 -05:00
|
|
|
tmp->varptr = addr;
|
2001-10-31 01:53:22 -05:00
|
|
|
global_List = tmp;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
void
|
|
|
|
rb_register_mark_object(VALUE obj)
|
|
|
|
{
|
|
|
|
VALUE ary = GET_THREAD()->vm->mark_object_ary;
|
|
|
|
rb_ary_push(ary, obj);
|
|
|
|
}
|
|
|
|
|
2000-02-08 03:54:01 -05:00
|
|
|
void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_gc_unregister_address(VALUE *addr)
|
2000-02-08 03:54:01 -05:00
|
|
|
{
|
2001-10-31 01:53:22 -05:00
|
|
|
struct gc_list *tmp = global_List;
|
2000-02-08 03:54:01 -05:00
|
|
|
|
|
|
|
if (tmp->varptr == addr) {
|
2001-10-31 01:53:22 -05:00
|
|
|
global_List = tmp->next;
|
2000-11-14 02:10:31 -05:00
|
|
|
RUBY_CRITICAL(free(tmp));
|
2000-02-08 03:54:01 -05:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
while (tmp->next) {
|
|
|
|
if (tmp->next->varptr == addr) {
|
|
|
|
struct gc_list *t = tmp->next;
|
|
|
|
|
|
|
|
tmp->next = tmp->next->next;
|
2000-11-14 02:10:31 -05:00
|
|
|
RUBY_CRITICAL(free(t));
|
2000-02-08 03:54:01 -05:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
tmp = tmp->next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
add_heap(void)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
RVALUE *p, *pend;
|
|
|
|
|
|
|
|
if (heaps_used == heaps_length) {
|
|
|
|
/* Realloc heaps */
|
2003-10-01 07:49:44 -04:00
|
|
|
struct heaps_slot *p;
|
|
|
|
int length;
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
heaps_length += HEAPS_INCREMENT;
|
2003-10-01 07:49:44 -04:00
|
|
|
length = heaps_length*sizeof(struct heaps_slot);
|
|
|
|
RUBY_CRITICAL(
|
|
|
|
if (heaps_used > 0) {
|
|
|
|
p = (struct heaps_slot *)realloc(heaps, length);
|
|
|
|
if (p) heaps = p;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
p = heaps = (struct heaps_slot *)malloc(length);
|
|
|
|
});
|
|
|
|
if (p == 0) rb_memerror();
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2001-07-02 04:46:28 -04:00
|
|
|
for (;;) {
|
2006-03-02 00:22:30 -05:00
|
|
|
RUBY_CRITICAL(p = (RVALUE*)malloc(sizeof(RVALUE)*(heap_slots+1)));
|
2001-07-02 04:46:28 -04:00
|
|
|
if (p == 0) {
|
|
|
|
if (heap_slots == HEAP_MIN_SLOTS) {
|
2002-04-24 00:54:16 -04:00
|
|
|
rb_memerror();
|
2001-07-02 04:46:28 -04:00
|
|
|
}
|
|
|
|
heap_slots = HEAP_MIN_SLOTS;
|
|
|
|
continue;
|
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
heaps[heaps_used].membase = p;
|
|
|
|
if ((VALUE)p % sizeof(RVALUE) == 0)
|
2007-06-25 07:19:11 -04:00
|
|
|
heap_slots += 1;
|
2006-12-31 10:02:22 -05:00
|
|
|
else
|
2007-06-25 07:19:11 -04:00
|
|
|
p = (RVALUE*)((VALUE)p + sizeof(RVALUE) - ((VALUE)p % sizeof(RVALUE)));
|
2006-12-31 10:02:22 -05:00
|
|
|
heaps[heaps_used].slot = p;
|
|
|
|
heaps[heaps_used].limit = heap_slots;
|
2001-07-02 04:46:28 -04:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
pend = p + heap_slots;
|
1998-01-16 07:13:05 -05:00
|
|
|
if (lomem == 0 || lomem > p) lomem = p;
|
|
|
|
if (himem < pend) himem = pend;
|
2001-07-02 04:46:28 -04:00
|
|
|
heaps_used++;
|
2001-11-02 02:20:58 -05:00
|
|
|
heap_slots *= 1.8;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
while (p < pend) {
|
2001-02-02 06:38:20 -05:00
|
|
|
p->as.free.flags = 0;
|
1998-01-16 07:13:05 -05:00
|
|
|
p->as.free.next = freelist;
|
|
|
|
freelist = p;
|
|
|
|
p++;
|
|
|
|
}
|
|
|
|
}
|
1998-01-16 07:19:22 -05:00
|
|
|
#define RANY(o) ((RVALUE*)(o))
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
static VALUE
|
|
|
|
rb_newobj_from_heap(void)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
1998-01-16 07:19:22 -05:00
|
|
|
VALUE obj;
|
|
|
|
|
2007-06-29 03:57:24 -04:00
|
|
|
if (ruby_gc_stress || !freelist) {
|
2006-12-31 10:02:22 -05:00
|
|
|
if(!garbage_collect()) {
|
|
|
|
rb_memerror();
|
|
|
|
}
|
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2000-08-07 01:05:04 -04:00
|
|
|
obj = (VALUE)freelist;
|
|
|
|
freelist = freelist->as.free.next;
|
2006-12-31 10:02:22 -05:00
|
|
|
|
2000-08-09 00:32:24 -04:00
|
|
|
MEMZERO((void*)obj, RVALUE, 1);
|
2003-12-20 11:59:09 -05:00
|
|
|
#ifdef GC_DEBUG
|
2007-06-24 16:33:04 -04:00
|
|
|
RANY(obj)->file = rb_sourcefile();
|
|
|
|
RANY(obj)->line = rb_sourceline();
|
2003-12-20 11:59:09 -05:00
|
|
|
#endif
|
2000-08-07 01:05:04 -04:00
|
|
|
return obj;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
#if USE_VALUE_CACHE
|
|
|
|
static VALUE
|
* blockinlining.c, error.c, eval.c, eval_error.h, eval_intern.h,
eval_jump.h, eval_load.c, eval_safe.h, gc.c, proc.c, signal.c,
thread.c, thread_pthread.ci, thread_win32.ci, vm.c, vm.h,
vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fix typo (rb_thead_t -> rb_thread_t).
* eval_intern.h: remove unused definitions.
* common.mk: fix around vm_opts.h path
and remove harmful argument passed to insns2vm.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-08 01:37:46 -05:00
|
|
|
rb_fill_value_cache(rb_thread_t *th)
|
2006-12-31 10:02:22 -05:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
VALUE rv;
|
|
|
|
|
* call_cfunc.ci, compile.c, compile.h, debug.h, eval.c,
eval_error.h, eval_jump.h, eval_load.c, eval_thread.c, gc.c,
insnhelper.h, insns.def, iseq.c, main.c, numeric.c, parse.y,
range.c, regenc.h, ruby.h, signal.c, thread.c, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fixed indents and non-C90 comments.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11620 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-02 11:26:04 -05:00
|
|
|
/* LOCK */
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 14:00:03 -05:00
|
|
|
for (i=0; i<RUBY_VM_VALUE_CACHE_SIZE; i++) {
|
2006-12-31 10:02:22 -05:00
|
|
|
VALUE v = rb_newobj_from_heap();
|
|
|
|
|
|
|
|
th->value_cache[i] = v;
|
|
|
|
RBASIC(v)->flags = FL_MARK;
|
|
|
|
}
|
|
|
|
th->value_cache_ptr = &th->value_cache[0];
|
|
|
|
rv = rb_newobj_from_heap();
|
* call_cfunc.ci, compile.c, compile.h, debug.h, eval.c,
eval_error.h, eval_jump.h, eval_load.c, eval_thread.c, gc.c,
insnhelper.h, insns.def, iseq.c, main.c, numeric.c, parse.y,
range.c, regenc.h, ruby.h, signal.c, thread.c, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fixed indents and non-C90 comments.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11620 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-02 11:26:04 -05:00
|
|
|
/* UNLOCK */
|
2006-12-31 10:02:22 -05:00
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_newobj(void)
|
|
|
|
{
|
2007-05-23 22:47:22 -04:00
|
|
|
#if USE_VALUE_CACHE
|
* blockinlining.c, error.c, eval.c, eval_error.h, eval_intern.h,
eval_jump.h, eval_load.c, eval_safe.h, gc.c, proc.c, signal.c,
thread.c, thread_pthread.ci, thread_win32.ci, vm.c, vm.h,
vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fix typo (rb_thead_t -> rb_thread_t).
* eval_intern.h: remove unused definitions.
* common.mk: fix around vm_opts.h path
and remove harmful argument passed to insns2vm.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-08 01:37:46 -05:00
|
|
|
rb_thread_t *th = GET_THREAD();
|
2006-12-31 10:02:22 -05:00
|
|
|
VALUE v = *th->value_cache_ptr;
|
|
|
|
|
|
|
|
if (v) {
|
|
|
|
RBASIC(v)->flags = 0;
|
|
|
|
th->value_cache_ptr++;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
v = rb_fill_value_cache(th);
|
|
|
|
}
|
|
|
|
|
|
|
|
#if defined(GC_DEBUG)
|
|
|
|
printf("cache index: %d, v: %p, th: %p\n",
|
|
|
|
th->value_cache_ptr - th->value_cache, v, th);
|
|
|
|
#endif
|
|
|
|
return v;
|
|
|
|
#else
|
|
|
|
return rb_newobj_from_heap();
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
* include/ruby/{intern,ruby}.h, compile.[ch], error.c, eval.c,
eval_load.c, gc.c, iseq.c, main.c, parse.y, re.c, ruby.c,
yarvcore.[ch] (ruby_eval_tree, ruby_sourcefile, ruby_sourceline,
ruby_nerrs): purge global variables.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12700 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-07-05 04:12:18 -04:00
|
|
|
NODE*
|
|
|
|
rb_node_newnode(enum node_type type, VALUE a0, VALUE a1, VALUE a2)
|
|
|
|
{
|
|
|
|
NODE *n = (NODE*)rb_newobj();
|
|
|
|
|
|
|
|
n->flags |= T_NODE;
|
|
|
|
nd_set_type(n, type);
|
|
|
|
|
|
|
|
n->u1.value = a0;
|
|
|
|
n->u2.value = a1;
|
|
|
|
n->u3.value = a2;
|
|
|
|
|
|
|
|
return n;
|
|
|
|
}
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_data_object_alloc(VALUE klass, void *datap, RUBY_DATA_FUNC dmark, RUBY_DATA_FUNC dfree)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
1998-01-16 07:19:22 -05:00
|
|
|
NEWOBJ(data, struct RData);
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 01:47:45 -05:00
|
|
|
if (klass) Check_Type(klass, T_CLASS);
|
1999-01-19 23:59:39 -05:00
|
|
|
OBJSETUP(data, klass, T_DATA);
|
1998-01-16 07:13:05 -05:00
|
|
|
data->data = datap;
|
|
|
|
data->dfree = dfree;
|
|
|
|
data->dmark = dmark;
|
|
|
|
|
|
|
|
return (VALUE)data;
|
|
|
|
}
|
|
|
|
|
2007-06-14 04:35:20 -04:00
|
|
|
#ifdef __ia64
|
2007-07-14 03:19:59 -04:00
|
|
|
#define SET_STACK_END (SET_MACHINE_STACK_END(&th->machine_stack_end), th->machine_register_stack_end = rb_ia64_bsp())
|
2007-06-14 04:35:20 -04:00
|
|
|
#else
|
2007-07-14 03:19:59 -04:00
|
|
|
#define SET_STACK_END SET_MACHINE_STACK_END(&th->machine_stack_end)
|
2007-06-14 04:35:20 -04:00
|
|
|
#endif
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
#define STACK_START (th->machine_stack_start)
|
|
|
|
#define STACK_END (th->machine_stack_end)
|
2007-12-14 23:09:24 -05:00
|
|
|
#define STACK_LEVEL_MAX (th->machine_stack_maxsize/sizeof(VALUE))
|
2004-12-13 04:57:41 -05:00
|
|
|
|
2003-01-04 13:48:24 -05:00
|
|
|
#if defined(sparc) || defined(__sparc__)
|
2006-12-31 10:02:22 -05:00
|
|
|
# define STACK_LENGTH (STACK_START - STACK_END + 0x80)
|
2003-06-27 23:29:00 -04:00
|
|
|
#elif STACK_GROW_DIRECTION < 0
|
2006-12-31 10:02:22 -05:00
|
|
|
# define STACK_LENGTH (STACK_START - STACK_END)
|
2003-06-27 23:29:00 -04:00
|
|
|
#elif STACK_GROW_DIRECTION > 0
|
2006-12-31 10:02:22 -05:00
|
|
|
# define STACK_LENGTH (STACK_END - STACK_START + 1)
|
2001-11-19 00:03:03 -05:00
|
|
|
#else
|
2006-12-31 10:02:22 -05:00
|
|
|
# define STACK_LENGTH ((STACK_END < STACK_START) ? STACK_START - STACK_END\
|
|
|
|
: STACK_END - STACK_START + 1)
|
2001-11-19 00:03:03 -05:00
|
|
|
#endif
|
2003-06-27 23:29:00 -04:00
|
|
|
#if STACK_GROW_DIRECTION > 0
|
|
|
|
# define STACK_UPPER(x, a, b) a
|
|
|
|
#elif STACK_GROW_DIRECTION < 0
|
|
|
|
# define STACK_UPPER(x, a, b) b
|
|
|
|
#else
|
2004-06-16 03:01:32 -04:00
|
|
|
static int grow_direction;
|
2003-06-27 23:29:00 -04:00
|
|
|
static int
|
2006-08-13 05:44:16 -04:00
|
|
|
stack_grow_direction(VALUE *addr)
|
2003-06-27 23:29:00 -04:00
|
|
|
{
|
* blockinlining.c, error.c, eval.c, eval_error.h, eval_intern.h,
eval_jump.h, eval_load.c, eval_safe.h, gc.c, proc.c, signal.c,
thread.c, thread_pthread.ci, thread_win32.ci, vm.c, vm.h,
vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fix typo (rb_thead_t -> rb_thread_t).
* eval_intern.h: remove unused definitions.
* common.mk: fix around vm_opts.h path
and remove harmful argument passed to insns2vm.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-08 01:37:46 -05:00
|
|
|
rb_thread_t *th = GET_THREAD();
|
2007-02-05 07:21:01 -05:00
|
|
|
SET_STACK_END;
|
2003-06-27 23:29:00 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
if (STACK_END > addr) return grow_direction = 1;
|
|
|
|
return grow_direction = -1;
|
2003-06-27 23:29:00 -04:00
|
|
|
}
|
2004-06-16 03:01:32 -04:00
|
|
|
# define stack_growup_p(x) ((grow_direction ? grow_direction : stack_grow_direction(x)) > 0)
|
2003-06-27 23:29:00 -04:00
|
|
|
# define STACK_UPPER(x, a, b) (stack_growup_p(x) ? a : b)
|
|
|
|
#endif
|
2001-11-19 00:03:03 -05:00
|
|
|
|
2003-12-13 04:13:39 -05:00
|
|
|
#define GC_WATER_MARK 512
|
2003-04-09 02:44:34 -04:00
|
|
|
|
2001-11-19 00:03:03 -05:00
|
|
|
int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
ruby_stack_length(VALUE **p)
|
2001-11-19 00:03:03 -05:00
|
|
|
{
|
* blockinlining.c, error.c, eval.c, eval_error.h, eval_intern.h,
eval_jump.h, eval_load.c, eval_safe.h, gc.c, proc.c, signal.c,
thread.c, thread_pthread.ci, thread_win32.ci, vm.c, vm.h,
vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fix typo (rb_thead_t -> rb_thread_t).
* eval_intern.h: remove unused definitions.
* common.mk: fix around vm_opts.h path
and remove harmful argument passed to insns2vm.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-08 01:37:46 -05:00
|
|
|
rb_thread_t *th = GET_THREAD();
|
2007-02-05 07:21:01 -05:00
|
|
|
SET_STACK_END;
|
2006-12-31 10:02:22 -05:00
|
|
|
if (p) *p = STACK_UPPER(STACK_END, STACK_START, STACK_END);
|
|
|
|
return STACK_LENGTH;
|
2001-11-19 00:03:03 -05:00
|
|
|
}
|
|
|
|
|
2001-11-21 10:42:12 -05:00
|
|
|
int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
ruby_stack_check(void)
|
2001-11-19 00:03:03 -05:00
|
|
|
{
|
2007-12-14 23:09:24 -05:00
|
|
|
int ret;
|
|
|
|
rb_thread_t *th = GET_THREAD();
|
|
|
|
SET_STACK_END;
|
|
|
|
ret = STACK_LENGTH > STACK_LEVEL_MAX + GC_WATER_MARK;
|
|
|
|
#ifdef __ia64
|
|
|
|
if (!ret) {
|
|
|
|
ret = (VALUE*)rb_ia64_bsp() - th->machine_register_stack_start >
|
|
|
|
th->machine_register_stack_maxsize/sizeof(VALUE) + GC_WATER_MARK;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
return ret;
|
2001-11-19 00:03:03 -05:00
|
|
|
}
|
2001-11-13 03:19:52 -05:00
|
|
|
|
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
init_mark_stack(void)
|
2001-11-13 03:19:52 -05:00
|
|
|
{
|
|
|
|
mark_stack_overflow = 0;
|
|
|
|
mark_stack_ptr = mark_stack;
|
|
|
|
}
|
|
|
|
|
|
|
|
#define MARK_STACK_EMPTY (mark_stack_ptr == mark_stack)
|
2005-04-29 22:59:44 -04:00
|
|
|
|
2002-03-07 06:19:37 -05:00
|
|
|
static st_table *source_filenames;
|
|
|
|
|
|
|
|
char *
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_source_filename(const char *f)
|
2002-03-07 06:19:37 -05:00
|
|
|
{
|
2007-05-29 11:49:30 -04:00
|
|
|
st_data_t name;
|
2002-03-07 06:19:37 -05:00
|
|
|
|
2007-05-29 11:49:30 -04:00
|
|
|
if (!st_lookup(source_filenames, (st_data_t)f, &name)) {
|
2002-03-07 06:19:37 -05:00
|
|
|
long len = strlen(f) + 1;
|
2007-05-29 11:49:30 -04:00
|
|
|
char *ptr = ALLOC_N(char, len + 1);
|
|
|
|
|
|
|
|
name = (st_data_t)ptr;
|
2002-03-07 06:19:37 -05:00
|
|
|
*ptr++ = 0;
|
|
|
|
MEMCPY(ptr, f, char, len);
|
2007-05-29 11:49:30 -04:00
|
|
|
st_add_direct(source_filenames, (st_data_t)ptr, name);
|
2002-03-07 06:19:37 -05:00
|
|
|
return ptr;
|
|
|
|
}
|
2007-05-29 11:49:30 -04:00
|
|
|
return (char *)name + 1;
|
2002-03-07 06:19:37 -05:00
|
|
|
}
|
|
|
|
|
* include/ruby/{intern,ruby}.h, compile.[ch], error.c, eval.c,
eval_load.c, gc.c, iseq.c, main.c, parse.y, re.c, ruby.c,
yarvcore.[ch] (ruby_eval_tree, ruby_sourcefile, ruby_sourceline,
ruby_nerrs): purge global variables.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12700 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-07-05 04:12:18 -04:00
|
|
|
void
|
|
|
|
rb_mark_source_filename(char *f)
|
2002-03-07 06:19:37 -05:00
|
|
|
{
|
|
|
|
if (f) {
|
|
|
|
f[-1] = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
* st.h, st.c: Introduce new conventional typedef's, st_data_t,
st_compare_func_t, st_hash_func_t and st_each_func_t.
* st.h, st.c: Do explicit function declarations and do not rely on
implicit declarations. On such platforms as IA64, int argument
values are NOT automatically promoted to long (64bit) values, so
explicit declarations are mandatory for those functions that
take long values or pointers. This fixes miniruby's coredump on
FreeBSD/IA64.
* class.c, eval.c, gc.c, hash.c, marshal.c, parse.y, variable.c:
Add proper casts to avoid warnings.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3303 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-01-06 10:55:43 -05:00
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
sweep_source_filename(char *key, char *value)
|
2002-03-07 06:19:37 -05:00
|
|
|
{
|
|
|
|
if (*value) {
|
|
|
|
*value = 0;
|
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
free(value);
|
|
|
|
return ST_DELETE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
* bignum.c: changed `foo _((boo))' to `foo(boo)`. [ruby-dev:27056]
* defines.h, dir.c, dln.h, enumerator.c, env.h, error.c, eval.c, file.c,
gc.c, hash.c, inits.c, intern.h, io.c, lex.c, marshal.c, missing.h,
node.h, numeric.c, pack.c, process.c, re.h, ruby.c, ruby.h, rubyio.h,
rubysig.h, signal.c, sprintf.c, st.h, string.c, struct.c, time.c,
util.c, util.h, variable.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9155 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-14 02:32:32 -04:00
|
|
|
static void gc_mark(VALUE ptr, int lev);
|
|
|
|
static void gc_mark_children(VALUE ptr, int lev);
|
2003-04-09 02:44:34 -04:00
|
|
|
|
2001-11-13 03:19:52 -05:00
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
gc_mark_all(void)
|
2001-11-13 03:19:52 -05:00
|
|
|
{
|
|
|
|
RVALUE *p, *pend;
|
|
|
|
int i;
|
2001-11-27 05:00:35 -05:00
|
|
|
|
|
|
|
init_mark_stack();
|
|
|
|
for (i = 0; i < heaps_used; i++) {
|
2003-10-01 07:49:44 -04:00
|
|
|
p = heaps[i].slot; pend = p + heaps[i].limit;
|
2001-11-27 05:00:35 -05:00
|
|
|
while (p < pend) {
|
|
|
|
if ((p->as.basic.flags & FL_MARK) &&
|
|
|
|
(p->as.basic.flags != FL_MARK)) {
|
2003-11-28 09:23:33 -05:00
|
|
|
gc_mark_children((VALUE)p, 0);
|
2001-11-13 03:19:52 -05:00
|
|
|
}
|
2001-11-27 05:00:35 -05:00
|
|
|
p++;
|
2001-11-13 03:19:52 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-04-09 04:27:01 -04:00
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
gc_mark_rest(void)
|
2003-04-09 04:27:01 -04:00
|
|
|
{
|
|
|
|
VALUE tmp_arry[MARK_STACK_MAX];
|
|
|
|
VALUE *p;
|
|
|
|
|
|
|
|
p = (mark_stack_ptr - mark_stack) + tmp_arry;
|
2007-09-21 01:51:43 -04:00
|
|
|
MEMCPY(tmp_arry, mark_stack, VALUE, p - tmp_arry);
|
2003-04-09 04:27:01 -04:00
|
|
|
|
|
|
|
init_mark_stack();
|
2007-09-21 01:51:43 -04:00
|
|
|
while (p != tmp_arry) {
|
2003-04-09 04:27:01 -04:00
|
|
|
p--;
|
2003-11-28 09:23:33 -05:00
|
|
|
gc_mark_children(*p, 0);
|
2003-04-09 04:27:01 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-01-10 05:07:31 -05:00
|
|
|
static inline int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
is_pointer_to_heap(void *ptr)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
1998-01-16 07:19:22 -05:00
|
|
|
register RVALUE *p = RANY(ptr);
|
1998-01-16 07:13:05 -05:00
|
|
|
register RVALUE *heap_org;
|
|
|
|
register long i;
|
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
if (p < lomem || p > himem) return Qfalse;
|
2006-03-02 00:22:30 -05:00
|
|
|
if ((VALUE)p % sizeof(RVALUE) != 0) return Qfalse;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
/* check if p looks like a pointer */
|
|
|
|
for (i=0; i < heaps_used; i++) {
|
2003-10-01 07:49:44 -04:00
|
|
|
heap_org = heaps[i].slot;
|
2006-03-02 00:22:30 -05:00
|
|
|
if (heap_org <= p && p < heap_org + heaps[i].limit)
|
2007-06-25 07:19:11 -04:00
|
|
|
return Qtrue;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
1999-01-19 23:59:39 -05:00
|
|
|
return Qfalse;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
mark_locations_array(register VALUE *x, register long n)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2005-01-07 04:08:19 -05:00
|
|
|
VALUE v;
|
1998-01-16 07:13:05 -05:00
|
|
|
while (n--) {
|
2005-01-07 04:08:19 -05:00
|
|
|
v = *x;
|
2007-07-14 03:19:59 -04:00
|
|
|
VALGRIND_MAKE_MEM_DEFINED(&v, sizeof(v));
|
2005-01-07 04:08:19 -05:00
|
|
|
if (is_pointer_to_heap((void *)v)) {
|
|
|
|
gc_mark(v, 0);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
x++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_gc_mark_locations(VALUE *start, VALUE *end)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
long n;
|
|
|
|
|
2003-06-27 23:29:00 -04:00
|
|
|
n = end - start;
|
1998-01-16 07:13:05 -05:00
|
|
|
mark_locations_array(start,n);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
mark_entry(ID key, VALUE value, int lev)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2003-11-28 09:23:33 -05:00
|
|
|
gc_mark(value, lev);
|
1998-01-16 07:13:05 -05:00
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2005-10-18 13:35:18 -04:00
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
mark_tbl(st_table *tbl, int lev)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
if (!tbl) return;
|
2004-11-03 19:53:21 -05:00
|
|
|
st_foreach(tbl, mark_entry, lev);
|
2003-11-28 09:23:33 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_mark_tbl(st_table *tbl)
|
2003-11-28 09:23:33 -05:00
|
|
|
{
|
|
|
|
mark_tbl(tbl, 0);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2007-09-26 15:40:49 -04:00
|
|
|
static int
|
|
|
|
mark_key(VALUE key, VALUE value, int lev)
|
|
|
|
{
|
|
|
|
gc_mark(key, lev);
|
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
mark_set(st_table *tbl, int lev)
|
|
|
|
{
|
|
|
|
if (!tbl) return;
|
|
|
|
st_foreach(tbl, mark_key, lev);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
rb_mark_set(st_table *tbl)
|
|
|
|
{
|
|
|
|
mark_set(tbl, 0);
|
|
|
|
}
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
mark_keyvalue(VALUE key, VALUE value, int lev)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2003-11-28 09:23:33 -05:00
|
|
|
gc_mark(key, lev);
|
|
|
|
gc_mark(value, lev);
|
1998-01-16 07:13:05 -05:00
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2005-10-18 13:35:18 -04:00
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
mark_hash(st_table *tbl, int lev)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
if (!tbl) return;
|
2004-11-03 19:53:21 -05:00
|
|
|
st_foreach(tbl, mark_keyvalue, lev);
|
2003-11-28 09:23:33 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_mark_hash(st_table *tbl)
|
2003-11-28 09:23:33 -05:00
|
|
|
{
|
|
|
|
mark_hash(tbl, 0);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_gc_mark_maybe(VALUE obj)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2002-05-14 01:59:35 -04:00
|
|
|
if (is_pointer_to_heap((void *)obj)) {
|
2003-11-28 09:23:33 -05:00
|
|
|
gc_mark(obj, 0);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-11-28 09:23:33 -05:00
|
|
|
#define GC_LEVEL_MAX 250
|
|
|
|
|
2005-06-19 13:16:14 -04:00
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
gc_mark(VALUE ptr, int lev)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2003-02-20 19:28:04 -05:00
|
|
|
register RVALUE *obj;
|
2001-11-27 05:00:35 -05:00
|
|
|
|
2003-04-09 04:27:01 -04:00
|
|
|
obj = RANY(ptr);
|
|
|
|
if (rb_special_const_p(ptr)) return; /* special const not marked */
|
|
|
|
if (obj->as.basic.flags == 0) return; /* free cell */
|
2005-06-19 13:16:14 -04:00
|
|
|
if (obj->as.basic.flags & FL_MARK) return; /* already marked */
|
2003-04-09 04:27:01 -04:00
|
|
|
obj->as.basic.flags |= FL_MARK;
|
|
|
|
|
2004-11-10 02:17:53 -05:00
|
|
|
if (lev > GC_LEVEL_MAX || (lev == 0 && ruby_stack_check())) {
|
2001-11-27 05:00:35 -05:00
|
|
|
if (!mark_stack_overflow) {
|
2001-11-13 03:19:52 -05:00
|
|
|
if (mark_stack_ptr - mark_stack < MARK_STACK_MAX) {
|
|
|
|
*mark_stack_ptr = ptr;
|
2001-11-27 05:00:35 -05:00
|
|
|
mark_stack_ptr++;
|
|
|
|
}
|
|
|
|
else {
|
2001-11-13 03:19:52 -05:00
|
|
|
mark_stack_overflow = 1;
|
|
|
|
}
|
|
|
|
}
|
2003-02-20 19:28:04 -05:00
|
|
|
return;
|
2001-11-13 03:19:52 -05:00
|
|
|
}
|
2004-11-03 19:53:21 -05:00
|
|
|
gc_mark_children(ptr, lev+1);
|
2003-11-28 09:23:33 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_gc_mark(VALUE ptr)
|
2003-11-28 09:23:33 -05:00
|
|
|
{
|
|
|
|
gc_mark(ptr, 0);
|
2003-04-09 04:27:01 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
gc_mark_children(VALUE ptr, int lev)
|
2003-04-09 04:27:01 -04:00
|
|
|
{
|
|
|
|
register RVALUE *obj = RANY(ptr);
|
|
|
|
|
|
|
|
goto marking; /* skip */
|
2001-11-13 03:19:52 -05:00
|
|
|
|
2003-02-20 19:28:04 -05:00
|
|
|
again:
|
|
|
|
obj = RANY(ptr);
|
|
|
|
if (rb_special_const_p(ptr)) return; /* special const not marked */
|
|
|
|
if (obj->as.basic.flags == 0) return; /* free cell */
|
2005-06-19 13:16:14 -04:00
|
|
|
if (obj->as.basic.flags & FL_MARK) return; /* already marked */
|
2003-02-20 19:28:04 -05:00
|
|
|
obj->as.basic.flags |= FL_MARK;
|
|
|
|
|
2003-04-09 04:27:01 -04:00
|
|
|
marking:
|
1999-01-19 23:59:39 -05:00
|
|
|
if (FL_TEST(obj, FL_EXIVAR)) {
|
2003-02-20 19:28:04 -05:00
|
|
|
rb_mark_generic_ivar(ptr);
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
switch (obj->as.basic.flags & T_MASK) {
|
|
|
|
case T_NIL:
|
|
|
|
case T_FIXNUM:
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_bug("rb_gc_mark() called for broken object");
|
1998-01-16 07:13:05 -05:00
|
|
|
break;
|
|
|
|
|
|
|
|
case T_NODE:
|
* include/ruby/{intern,ruby}.h, compile.[ch], error.c, eval.c,
eval_load.c, gc.c, iseq.c, main.c, parse.y, re.c, ruby.c,
yarvcore.[ch] (ruby_eval_tree, ruby_sourcefile, ruby_sourceline,
ruby_nerrs): purge global variables.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12700 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-07-05 04:12:18 -04:00
|
|
|
rb_mark_source_filename(obj->as.node.nd_file);
|
1998-01-16 07:13:05 -05:00
|
|
|
switch (nd_type(obj)) {
|
|
|
|
case NODE_IF: /* 1,2,3 */
|
|
|
|
case NODE_FOR:
|
|
|
|
case NODE_ITER:
|
1999-01-19 23:59:39 -05:00
|
|
|
case NODE_WHEN:
|
|
|
|
case NODE_MASGN:
|
|
|
|
case NODE_RESCUE:
|
|
|
|
case NODE_RESBODY:
|
2003-02-19 04:27:49 -05:00
|
|
|
case NODE_CLASS:
|
2006-06-29 10:57:42 -04:00
|
|
|
case NODE_BLOCK_PASS:
|
2003-11-28 09:23:33 -05:00
|
|
|
gc_mark((VALUE)obj->as.node.u2.node, lev);
|
1998-01-16 07:13:05 -05:00
|
|
|
/* fall through */
|
|
|
|
case NODE_BLOCK: /* 1,3 */
|
2006-12-31 10:02:22 -05:00
|
|
|
case NODE_OPTBLOCK:
|
1998-01-16 07:13:05 -05:00
|
|
|
case NODE_ARRAY:
|
|
|
|
case NODE_DSTR:
|
|
|
|
case NODE_DXSTR:
|
|
|
|
case NODE_DREGX:
|
|
|
|
case NODE_DREGX_ONCE:
|
1999-01-19 23:59:39 -05:00
|
|
|
case NODE_ENSURE:
|
1998-01-16 07:13:05 -05:00
|
|
|
case NODE_CALL:
|
1999-01-19 23:59:39 -05:00
|
|
|
case NODE_DEFS:
|
|
|
|
case NODE_OP_ASGN1:
|
* parse.y, node.h, compile.c: change node tree structure. a purpose
of this change is to unify argument structure of method and block.
this change prohibits duplicate block parameter name.
new argument infromation:
NODE_ARGS [m: int, o: NODE_OPT_ARG, ->]
NODE_ARGS_AUX [r: ID, b: ID, ->]
NODE_ARGS_AUX [Pst: id, Plen: int, init: NODE*]
optarg information:
NODE_OPT_ARGS [idx, expr, ->]
* vm_macro.def: ditto.
* gc.c: ditto.
* iseq.c: ditto.
* compile.h: fix debug function name.
* test/ripper/test_scanner_events.rb: |_,_,foo| -> |_1,_2,foo|
* test/ruby/test_lambda.rb: disalbe test temporarily.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11840 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-23 21:07:05 -05:00
|
|
|
case NODE_ARGS:
|
2003-11-28 09:23:33 -05:00
|
|
|
gc_mark((VALUE)obj->as.node.u1.node, lev);
|
1998-01-16 07:13:05 -05:00
|
|
|
/* fall through */
|
|
|
|
case NODE_SUPER: /* 3 */
|
|
|
|
case NODE_FCALL:
|
1999-01-19 23:59:39 -05:00
|
|
|
case NODE_DEFN:
|
* parse.y, node.h, compile.c: change node tree structure. a purpose
of this change is to unify argument structure of method and block.
this change prohibits duplicate block parameter name.
new argument infromation:
NODE_ARGS [m: int, o: NODE_OPT_ARG, ->]
NODE_ARGS_AUX [r: ID, b: ID, ->]
NODE_ARGS_AUX [Pst: id, Plen: int, init: NODE*]
optarg information:
NODE_OPT_ARGS [idx, expr, ->]
* vm_macro.def: ditto.
* gc.c: ditto.
* iseq.c: ditto.
* compile.h: fix debug function name.
* test/ripper/test_scanner_events.rb: |_,_,foo| -> |_1,_2,foo|
* test/ruby/test_lambda.rb: disalbe test temporarily.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11840 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-23 21:07:05 -05:00
|
|
|
case NODE_ARGS_AUX:
|
2003-02-20 19:28:04 -05:00
|
|
|
ptr = (VALUE)obj->as.node.u3.node;
|
|
|
|
goto again;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
case NODE_METHOD: /* 1,2 */
|
|
|
|
case NODE_WHILE:
|
1998-01-16 07:13:05 -05:00
|
|
|
case NODE_UNTIL:
|
1999-01-19 23:59:39 -05:00
|
|
|
case NODE_AND:
|
|
|
|
case NODE_OR:
|
|
|
|
case NODE_CASE:
|
|
|
|
case NODE_SCLASS:
|
|
|
|
case NODE_DOT2:
|
|
|
|
case NODE_DOT3:
|
|
|
|
case NODE_FLIP2:
|
|
|
|
case NODE_FLIP3:
|
1998-01-16 07:19:22 -05:00
|
|
|
case NODE_MATCH2:
|
|
|
|
case NODE_MATCH3:
|
1999-01-19 23:59:39 -05:00
|
|
|
case NODE_OP_ASGN_OR:
|
|
|
|
case NODE_OP_ASGN_AND:
|
2003-02-19 04:27:49 -05:00
|
|
|
case NODE_MODULE:
|
2004-10-30 02:56:18 -04:00
|
|
|
case NODE_ALIAS:
|
|
|
|
case NODE_VALIAS:
|
2007-09-21 01:51:43 -04:00
|
|
|
case NODE_ARGSCAT:
|
2003-11-28 09:23:33 -05:00
|
|
|
gc_mark((VALUE)obj->as.node.u1.node, lev);
|
1998-01-16 07:13:05 -05:00
|
|
|
/* fall through */
|
2006-12-31 10:02:22 -05:00
|
|
|
case NODE_FBODY: /* 2 */
|
1999-01-19 23:59:39 -05:00
|
|
|
case NODE_GASGN:
|
|
|
|
case NODE_LASGN:
|
|
|
|
case NODE_DASGN:
|
2000-01-31 22:12:21 -05:00
|
|
|
case NODE_DASGN_CURR:
|
1999-01-19 23:59:39 -05:00
|
|
|
case NODE_IASGN:
|
2007-02-04 14:17:33 -05:00
|
|
|
case NODE_IASGN2:
|
2000-11-21 09:26:25 -05:00
|
|
|
case NODE_CVASGN:
|
1999-01-19 23:59:39 -05:00
|
|
|
case NODE_COLON3:
|
|
|
|
case NODE_OPT_N:
|
2002-07-26 02:12:39 -04:00
|
|
|
case NODE_EVSTR:
|
2004-10-30 02:56:18 -04:00
|
|
|
case NODE_UNDEF:
|
2006-10-29 22:40:11 -05:00
|
|
|
case NODE_POSTEXE:
|
2003-02-20 19:28:04 -05:00
|
|
|
ptr = (VALUE)obj->as.node.u2.node;
|
|
|
|
goto again;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
case NODE_HASH: /* 1 */
|
|
|
|
case NODE_LIT:
|
|
|
|
case NODE_STR:
|
|
|
|
case NODE_XSTR:
|
|
|
|
case NODE_DEFINED:
|
1998-01-16 07:19:22 -05:00
|
|
|
case NODE_MATCH:
|
1999-01-19 23:59:39 -05:00
|
|
|
case NODE_RETURN:
|
2001-07-02 04:46:28 -04:00
|
|
|
case NODE_BREAK:
|
|
|
|
case NODE_NEXT:
|
1999-01-19 23:59:39 -05:00
|
|
|
case NODE_YIELD:
|
|
|
|
case NODE_COLON2:
|
2003-03-26 02:01:14 -05:00
|
|
|
case NODE_SPLAT:
|
2003-10-06 13:59:53 -04:00
|
|
|
case NODE_TO_ARY:
|
2003-02-20 19:28:04 -05:00
|
|
|
ptr = (VALUE)obj->as.node.u1.node;
|
|
|
|
goto again;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
case NODE_SCOPE: /* 2,3 */
|
2003-02-19 22:35:44 -05:00
|
|
|
case NODE_CDECL:
|
* parse.y, node.h, compile.c: change node tree structure. a purpose
of this change is to unify argument structure of method and block.
this change prohibits duplicate block parameter name.
new argument infromation:
NODE_ARGS [m: int, o: NODE_OPT_ARG, ->]
NODE_ARGS_AUX [r: ID, b: ID, ->]
NODE_ARGS_AUX [Pst: id, Plen: int, init: NODE*]
optarg information:
NODE_OPT_ARGS [idx, expr, ->]
* vm_macro.def: ditto.
* gc.c: ditto.
* iseq.c: ditto.
* compile.h: fix debug function name.
* test/ripper/test_scanner_events.rb: |_,_,foo| -> |_1,_2,foo|
* test/ruby/test_lambda.rb: disalbe test temporarily.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11840 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-23 21:07:05 -05:00
|
|
|
case NODE_OPT_ARG:
|
2003-11-28 09:23:33 -05:00
|
|
|
gc_mark((VALUE)obj->as.node.u3.node, lev);
|
2003-02-20 19:28:04 -05:00
|
|
|
ptr = (VALUE)obj->as.node.u2.node;
|
|
|
|
goto again;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
case NODE_ZARRAY: /* - */
|
1999-01-19 23:59:39 -05:00
|
|
|
case NODE_ZSUPER:
|
1998-01-16 07:13:05 -05:00
|
|
|
case NODE_CFUNC:
|
|
|
|
case NODE_VCALL:
|
|
|
|
case NODE_GVAR:
|
|
|
|
case NODE_LVAR:
|
|
|
|
case NODE_DVAR:
|
|
|
|
case NODE_IVAR:
|
|
|
|
case NODE_CVAR:
|
|
|
|
case NODE_NTH_REF:
|
|
|
|
case NODE_BACK_REF:
|
1999-01-19 23:59:39 -05:00
|
|
|
case NODE_REDO:
|
|
|
|
case NODE_RETRY:
|
1998-01-16 07:13:05 -05:00
|
|
|
case NODE_SELF:
|
|
|
|
case NODE_NIL:
|
1999-01-19 23:59:39 -05:00
|
|
|
case NODE_TRUE:
|
|
|
|
case NODE_FALSE:
|
2004-01-22 03:31:33 -05:00
|
|
|
case NODE_ERRINFO:
|
1999-01-19 23:59:39 -05:00
|
|
|
case NODE_ATTRSET:
|
|
|
|
case NODE_BLOCK_ARG:
|
1998-01-16 07:13:05 -05:00
|
|
|
break;
|
1999-01-19 23:59:39 -05:00
|
|
|
case NODE_ALLOCA:
|
|
|
|
mark_locations_array((VALUE*)obj->as.node.u1.value,
|
|
|
|
obj->as.node.u3.cnt);
|
2003-02-20 19:28:04 -05:00
|
|
|
ptr = (VALUE)obj->as.node.u2.node;
|
|
|
|
goto again;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2003-02-20 19:28:04 -05:00
|
|
|
default: /* unlisted NODE */
|
2000-05-09 00:53:16 -04:00
|
|
|
if (is_pointer_to_heap(obj->as.node.u1.node)) {
|
2003-11-28 09:23:33 -05:00
|
|
|
gc_mark((VALUE)obj->as.node.u1.node, lev);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2000-05-09 00:53:16 -04:00
|
|
|
if (is_pointer_to_heap(obj->as.node.u2.node)) {
|
2003-11-28 09:23:33 -05:00
|
|
|
gc_mark((VALUE)obj->as.node.u2.node, lev);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2000-05-09 00:53:16 -04:00
|
|
|
if (is_pointer_to_heap(obj->as.node.u3.node)) {
|
2003-11-28 09:23:33 -05:00
|
|
|
gc_mark((VALUE)obj->as.node.u3.node, lev);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return; /* no need to mark class. */
|
|
|
|
}
|
|
|
|
|
2003-11-28 09:23:33 -05:00
|
|
|
gc_mark(obj->as.basic.klass, lev);
|
1998-01-16 07:13:05 -05:00
|
|
|
switch (obj->as.basic.flags & T_MASK) {
|
|
|
|
case T_ICLASS:
|
|
|
|
case T_CLASS:
|
|
|
|
case T_MODULE:
|
2007-09-28 02:21:46 -04:00
|
|
|
mark_tbl(RCLASS_M_TBL(obj), lev);
|
|
|
|
mark_tbl(RCLASS_IV_TBL(obj), lev);
|
|
|
|
ptr = RCLASS_SUPER(obj);
|
2003-02-20 19:28:04 -05:00
|
|
|
goto again;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
case T_ARRAY:
|
2002-09-04 05:23:51 -04:00
|
|
|
if (FL_TEST(obj, ELTS_SHARED)) {
|
2006-11-01 09:42:39 -05:00
|
|
|
ptr = obj->as.array.aux.shared;
|
2003-02-20 19:28:04 -05:00
|
|
|
goto again;
|
2002-09-04 05:23:51 -04:00
|
|
|
}
|
|
|
|
else {
|
2006-09-02 10:42:08 -04:00
|
|
|
long i, len = RARRAY_LEN(obj);
|
|
|
|
VALUE *ptr = RARRAY_PTR(obj);
|
2002-09-04 05:23:51 -04:00
|
|
|
for (i=0; i < len; i++) {
|
2003-11-28 09:23:33 -05:00
|
|
|
gc_mark(*ptr++, lev);
|
2002-09-04 05:23:51 -04:00
|
|
|
}
|
2001-11-13 03:19:52 -05:00
|
|
|
}
|
|
|
|
break;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
case T_HASH:
|
2007-08-29 19:12:21 -04:00
|
|
|
mark_hash(obj->as.hash.ntbl, lev);
|
2003-02-20 19:28:04 -05:00
|
|
|
ptr = obj->as.hash.ifnone;
|
|
|
|
goto again;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
case T_STRING:
|
2001-12-10 22:48:08 -05:00
|
|
|
#define STR_ASSOC FL_USER3 /* copied from string.c */
|
2006-09-02 10:42:08 -04:00
|
|
|
if (FL_TEST(obj, RSTRING_NOEMBED) && FL_ANY(obj, ELTS_SHARED|STR_ASSOC)) {
|
2006-08-31 06:47:44 -04:00
|
|
|
ptr = obj->as.string.as.heap.aux.shared;
|
2003-02-20 19:28:04 -05:00
|
|
|
goto again;
|
2001-11-13 03:19:52 -05:00
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
break;
|
|
|
|
|
|
|
|
case T_DATA:
|
|
|
|
if (obj->as.data.dmark) (*obj->as.data.dmark)(DATA_PTR(obj));
|
|
|
|
break;
|
|
|
|
|
|
|
|
case T_OBJECT:
|
2007-09-28 02:21:46 -04:00
|
|
|
{
|
|
|
|
long i, len = ROBJECT_LEN(obj);
|
|
|
|
VALUE *ptr = ROBJECT_PTR(obj);
|
|
|
|
for (i = 0; i < len; i++) {
|
|
|
|
gc_mark(*ptr++, lev);
|
|
|
|
}
|
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
break;
|
|
|
|
|
|
|
|
case T_FILE:
|
2007-11-20 02:25:07 -05:00
|
|
|
if (obj->as.file.fptr)
|
|
|
|
gc_mark(obj->as.file.fptr->tied_io_for_writing, lev);
|
2007-11-19 22:16:53 -05:00
|
|
|
break;
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
case T_REGEXP:
|
|
|
|
case T_FLOAT:
|
|
|
|
case T_BIGNUM:
|
2004-03-10 02:05:19 -05:00
|
|
|
case T_BLOCK:
|
1998-01-16 07:13:05 -05:00
|
|
|
break;
|
|
|
|
|
|
|
|
case T_MATCH:
|
2006-12-31 10:02:22 -05:00
|
|
|
gc_mark(obj->as.match.regexp, lev);
|
1998-01-16 07:13:05 -05:00
|
|
|
if (obj->as.match.str) {
|
2003-02-20 19:28:04 -05:00
|
|
|
ptr = obj->as.match.str;
|
|
|
|
goto again;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case T_STRUCT:
|
2001-11-13 03:19:52 -05:00
|
|
|
{
|
2006-02-05 09:40:01 -05:00
|
|
|
long len = RSTRUCT_LEN(obj);
|
|
|
|
VALUE *ptr = RSTRUCT_PTR(obj);
|
2001-10-31 01:53:22 -05:00
|
|
|
|
2003-02-20 19:28:04 -05:00
|
|
|
while (len--) {
|
2003-11-28 09:23:33 -05:00
|
|
|
gc_mark(*ptr++, lev);
|
2003-02-20 19:28:04 -05:00
|
|
|
}
|
2001-11-13 03:19:52 -05:00
|
|
|
}
|
|
|
|
break;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
case T_VALUES:
|
|
|
|
{
|
|
|
|
rb_gc_mark(RVALUES(obj)->v1);
|
|
|
|
rb_gc_mark(RVALUES(obj)->v2);
|
|
|
|
ptr = RVALUES(obj)->v3;
|
|
|
|
goto again;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
default:
|
2005-12-15 23:58:51 -05:00
|
|
|
rb_bug("rb_gc_mark(): unknown data type 0x%lx(%p) %s",
|
1999-01-19 23:59:39 -05:00
|
|
|
obj->as.basic.flags & T_MASK, obj,
|
2005-12-15 23:58:51 -05:00
|
|
|
is_pointer_to_heap(obj) ? "corrupted object" : "non object");
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
* bignum.c: changed `foo _((boo))' to `foo(boo)`. [ruby-dev:27056]
* defines.h, dir.c, dln.h, enumerator.c, env.h, error.c, eval.c, file.c,
gc.c, hash.c, inits.c, intern.h, io.c, lex.c, marshal.c, missing.h,
node.h, numeric.c, pack.c, process.c, re.h, ruby.c, ruby.h, rubyio.h,
rubysig.h, signal.c, sprintf.c, st.h, string.c, struct.c, time.c,
util.c, util.h, variable.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9155 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-14 02:32:32 -04:00
|
|
|
static void obj_free(VALUE);
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2004-09-27 08:25:21 -04:00
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
finalize_list(RVALUE *p)
|
2004-09-27 08:25:21 -04:00
|
|
|
{
|
|
|
|
while (p) {
|
|
|
|
RVALUE *tmp = p->as.free.next;
|
|
|
|
run_final((VALUE)p);
|
|
|
|
if (!FL_TEST(p, FL_SINGLETON)) { /* not freeing page */
|
2007-08-19 00:34:44 -04:00
|
|
|
VALGRIND_MAKE_MEM_UNDEFINED((void*)p, sizeof(RVALUE));
|
2004-09-27 08:25:21 -04:00
|
|
|
p->as.free.flags = 0;
|
|
|
|
p->as.free.next = freelist;
|
|
|
|
freelist = p;
|
|
|
|
}
|
|
|
|
p = tmp;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
free_unused_heaps(void)
|
2004-09-27 08:25:21 -04:00
|
|
|
{
|
|
|
|
int i, j;
|
|
|
|
|
|
|
|
for (i = j = 1; j < heaps_used; i++) {
|
|
|
|
if (heaps[i].limit == 0) {
|
2006-03-02 00:22:30 -05:00
|
|
|
free(heaps[i].membase);
|
2004-09-27 08:25:21 -04:00
|
|
|
heaps_used--;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (i != j) {
|
|
|
|
heaps[j] = heaps[i];
|
|
|
|
}
|
|
|
|
j++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-12-29 12:11:28 -05:00
|
|
|
void rb_gc_abort_threads(void);
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
gc_sweep(void)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
1999-01-19 23:59:39 -05:00
|
|
|
RVALUE *p, *pend, *final_list;
|
1998-01-16 07:13:05 -05:00
|
|
|
int freed = 0;
|
2004-10-06 03:40:06 -04:00
|
|
|
int i;
|
2003-01-16 02:38:40 -05:00
|
|
|
unsigned long live = 0;
|
2007-06-16 08:39:35 -04:00
|
|
|
unsigned long free_min = 0;
|
|
|
|
|
|
|
|
for (i = 0; i < heaps_used; i++) {
|
|
|
|
free_min += heaps[i].limit;
|
|
|
|
}
|
|
|
|
free_min = free_min * 0.2;
|
|
|
|
if (free_min < FREE_MIN)
|
|
|
|
free_min = FREE_MIN;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2005-12-11 22:08:35 -05:00
|
|
|
if (source_filenames) {
|
|
|
|
st_foreach(source_filenames, sweep_source_filename, 0);
|
|
|
|
}
|
2002-03-07 06:19:37 -05:00
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
freelist = 0;
|
2000-11-20 03:26:48 -05:00
|
|
|
final_list = deferred_final_list;
|
|
|
|
deferred_final_list = 0;
|
2002-10-02 02:02:17 -04:00
|
|
|
for (i = 0; i < heaps_used; i++) {
|
1998-01-16 07:13:05 -05:00
|
|
|
int n = 0;
|
2002-10-02 02:02:17 -04:00
|
|
|
RVALUE *free = freelist;
|
|
|
|
RVALUE *final = final_list;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2003-10-01 07:49:44 -04:00
|
|
|
p = heaps[i].slot; pend = p + heaps[i].limit;
|
1998-01-16 07:13:05 -05:00
|
|
|
while (p < pend) {
|
|
|
|
if (!(p->as.basic.flags & FL_MARK)) {
|
1999-01-19 23:59:39 -05:00
|
|
|
if (p->as.basic.flags) {
|
|
|
|
obj_free((VALUE)p);
|
|
|
|
}
|
2000-08-07 02:11:34 -04:00
|
|
|
if (need_call_final && FL_TEST(p, FL_FINALIZE)) {
|
2001-02-02 06:38:20 -05:00
|
|
|
p->as.free.flags = FL_MARK; /* remain marked */
|
1999-01-19 23:59:39 -05:00
|
|
|
p->as.free.next = final_list;
|
|
|
|
final_list = p;
|
|
|
|
}
|
|
|
|
else {
|
2007-08-19 00:34:44 -04:00
|
|
|
VALGRIND_MAKE_MEM_UNDEFINED((void*)p, sizeof(RVALUE));
|
2001-02-02 06:38:20 -05:00
|
|
|
p->as.free.flags = 0;
|
1999-01-19 23:59:39 -05:00
|
|
|
p->as.free.next = freelist;
|
|
|
|
freelist = p;
|
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
n++;
|
|
|
|
}
|
1999-01-19 23:59:39 -05:00
|
|
|
else if (RBASIC(p)->flags == FL_MARK) {
|
|
|
|
/* objects to be finalized */
|
2006-02-05 21:49:37 -05:00
|
|
|
/* do nothing remain marked */
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
|
|
|
else {
|
1998-01-16 07:13:05 -05:00
|
|
|
RBASIC(p)->flags &= ~FL_MARK;
|
2002-12-29 09:51:22 -05:00
|
|
|
live++;
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
p++;
|
|
|
|
}
|
2007-06-16 08:39:35 -04:00
|
|
|
if (n == heaps[i].limit && freed > free_min) {
|
2002-10-02 02:02:17 -04:00
|
|
|
RVALUE *pp;
|
|
|
|
|
2003-10-01 07:49:44 -04:00
|
|
|
heaps[i].limit = 0;
|
2002-10-02 02:02:17 -04:00
|
|
|
for (pp = final_list; pp != final; pp = pp->as.free.next) {
|
2006-12-31 10:02:22 -05:00
|
|
|
p->as.free.flags |= FL_SINGLETON; /* freeing page mark */
|
2002-10-02 02:02:17 -04:00
|
|
|
}
|
|
|
|
freelist = free; /* cancel this page from freelist */
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
freed += n;
|
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2003-10-19 22:06:42 -04:00
|
|
|
if (malloc_increase > malloc_limit) {
|
|
|
|
malloc_limit += (malloc_increase - malloc_limit) * (double)live / (live + freed);
|
|
|
|
if (malloc_limit < GC_MALLOC_LIMIT) malloc_limit = GC_MALLOC_LIMIT;
|
|
|
|
}
|
2002-10-10 13:11:18 -04:00
|
|
|
malloc_increase = 0;
|
2007-06-16 08:39:35 -04:00
|
|
|
if (freed < free_min) {
|
1998-01-16 07:13:05 -05:00
|
|
|
add_heap();
|
|
|
|
}
|
1999-01-19 23:59:39 -05:00
|
|
|
during_gc = 0;
|
|
|
|
|
|
|
|
/* clear finalization list */
|
2001-01-23 04:55:10 -05:00
|
|
|
if (final_list) {
|
2004-09-27 08:25:21 -04:00
|
|
|
deferred_final_list = final_list;
|
|
|
|
return;
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
2004-09-27 08:25:21 -04:00
|
|
|
free_unused_heaps();
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_gc_force_recycle(VALUE p)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2007-08-19 00:34:44 -04:00
|
|
|
VALGRIND_MAKE_MEM_UNDEFINED((void*)p, sizeof(RVALUE));
|
2001-02-02 06:38:20 -05:00
|
|
|
RANY(p)->as.free.flags = 0;
|
1998-01-16 07:19:22 -05:00
|
|
|
RANY(p)->as.free.next = freelist;
|
|
|
|
freelist = RANY(p);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
obj_free(VALUE obj)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
1998-01-16 07:19:22 -05:00
|
|
|
switch (RANY(obj)->as.basic.flags & T_MASK) {
|
1998-01-16 07:13:05 -05:00
|
|
|
case T_NIL:
|
|
|
|
case T_FIXNUM:
|
|
|
|
case T_TRUE:
|
|
|
|
case T_FALSE:
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_bug("obj_free() called for broken object");
|
1998-01-16 07:13:05 -05:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
if (FL_TEST(obj, FL_EXIVAR)) {
|
|
|
|
rb_free_generic_ivar((VALUE)obj);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
1999-01-19 23:59:39 -05:00
|
|
|
|
1998-01-16 07:19:22 -05:00
|
|
|
switch (RANY(obj)->as.basic.flags & T_MASK) {
|
1998-01-16 07:13:05 -05:00
|
|
|
case T_OBJECT:
|
2007-09-28 02:21:46 -04:00
|
|
|
if (!(RANY(obj)->as.basic.flags & ROBJECT_EMBED) &&
|
|
|
|
RANY(obj)->as.object.as.heap.ptr) {
|
|
|
|
RUBY_CRITICAL(free(RANY(obj)->as.object.as.heap.ptr));
|
1998-01-16 07:19:22 -05:00
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
break;
|
|
|
|
case T_MODULE:
|
|
|
|
case T_CLASS:
|
2003-07-07 04:28:19 -04:00
|
|
|
rb_clear_cache_by_class((VALUE)obj);
|
2007-09-28 02:21:46 -04:00
|
|
|
st_free_table(RCLASS_M_TBL(obj));
|
|
|
|
if (RCLASS_IV_TBL(obj)) {
|
|
|
|
st_free_table(RCLASS_IV_TBL(obj));
|
|
|
|
}
|
|
|
|
if (RCLASS_IV_INDEX_TBL(obj)) {
|
|
|
|
st_free_table(RCLASS_IV_INDEX_TBL(obj));
|
1998-01-16 07:19:22 -05:00
|
|
|
}
|
2007-09-28 02:21:46 -04:00
|
|
|
RUBY_CRITICAL(free(RANY(obj)->as.klass.ptr));
|
1998-01-16 07:13:05 -05:00
|
|
|
break;
|
|
|
|
case T_STRING:
|
2006-09-26 18:46:16 -04:00
|
|
|
rb_str_free(obj);
|
1998-01-16 07:13:05 -05:00
|
|
|
break;
|
|
|
|
case T_ARRAY:
|
2006-09-26 18:46:16 -04:00
|
|
|
rb_ary_free(obj);
|
1998-01-16 07:13:05 -05:00
|
|
|
break;
|
|
|
|
case T_HASH:
|
2007-08-29 19:12:21 -04:00
|
|
|
if (RANY(obj)->as.hash.ntbl) {
|
|
|
|
st_free_table(RANY(obj)->as.hash.ntbl);
|
2000-09-26 23:43:15 -04:00
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
break;
|
|
|
|
case T_REGEXP:
|
2000-09-26 23:43:15 -04:00
|
|
|
if (RANY(obj)->as.regexp.ptr) {
|
2005-02-17 09:43:38 -05:00
|
|
|
onig_free(RANY(obj)->as.regexp.ptr);
|
2000-09-26 23:43:15 -04:00
|
|
|
}
|
|
|
|
if (RANY(obj)->as.regexp.str) {
|
2000-11-14 02:10:31 -05:00
|
|
|
RUBY_CRITICAL(free(RANY(obj)->as.regexp.str));
|
2000-09-26 23:43:15 -04:00
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
break;
|
|
|
|
case T_DATA:
|
1999-01-19 23:59:39 -05:00
|
|
|
if (DATA_PTR(obj)) {
|
|
|
|
if ((long)RANY(obj)->as.data.dfree == -1) {
|
2000-11-14 02:10:31 -05:00
|
|
|
RUBY_CRITICAL(free(DATA_PTR(obj)));
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
|
|
|
else if (RANY(obj)->as.data.dfree) {
|
|
|
|
(*RANY(obj)->as.data.dfree)(DATA_PTR(obj));
|
|
|
|
}
|
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
break;
|
|
|
|
case T_MATCH:
|
1999-08-13 01:45:20 -04:00
|
|
|
if (RANY(obj)->as.match.regs) {
|
2005-02-17 09:43:38 -05:00
|
|
|
onig_region_free(RANY(obj)->as.match.regs, 0);
|
2000-11-14 02:10:31 -05:00
|
|
|
RUBY_CRITICAL(free(RANY(obj)->as.match.regs));
|
1999-08-13 01:45:20 -04:00
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
break;
|
|
|
|
case T_FILE:
|
1999-01-19 23:59:39 -05:00
|
|
|
if (RANY(obj)->as.file.fptr) {
|
|
|
|
rb_io_fptr_finalize(RANY(obj)->as.file.fptr);
|
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
break;
|
|
|
|
case T_ICLASS:
|
|
|
|
/* iClass shares table with the module */
|
|
|
|
break;
|
|
|
|
|
|
|
|
case T_FLOAT:
|
2004-03-10 02:05:19 -05:00
|
|
|
case T_BLOCK:
|
1998-01-16 07:13:05 -05:00
|
|
|
break;
|
2006-12-31 10:02:22 -05:00
|
|
|
case T_VALUES:
|
|
|
|
break;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
case T_BIGNUM:
|
2007-09-01 08:02:36 -04:00
|
|
|
if (!(RBASIC(obj)->flags & RBIGNUM_EMBED_FLAG) && RBIGNUM_DIGITS(obj)) {
|
|
|
|
RUBY_CRITICAL(free(RBIGNUM_DIGITS(obj)));
|
2000-09-26 23:43:15 -04:00
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
break;
|
|
|
|
case T_NODE:
|
1999-01-19 23:59:39 -05:00
|
|
|
switch (nd_type(obj)) {
|
|
|
|
case NODE_SCOPE:
|
|
|
|
if (RANY(obj)->as.node.u1.tbl) {
|
2000-11-14 02:10:31 -05:00
|
|
|
RUBY_CRITICAL(free(RANY(obj)->as.node.u1.tbl));
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case NODE_ALLOCA:
|
2001-03-26 03:57:16 -05:00
|
|
|
RUBY_CRITICAL(free(RANY(obj)->as.node.u1.node));
|
1999-01-19 23:59:39 -05:00
|
|
|
break;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
return; /* no need to free iv_tbl */
|
|
|
|
|
|
|
|
case T_STRUCT:
|
2007-05-29 11:49:30 -04:00
|
|
|
if ((RBASIC(obj)->flags & RSTRUCT_EMBED_LEN_MASK) == 0 &&
|
2006-02-05 09:40:01 -05:00
|
|
|
RANY(obj)->as.rstruct.as.heap.ptr) {
|
|
|
|
RUBY_CRITICAL(free(RANY(obj)->as.rstruct.as.heap.ptr));
|
2000-09-26 23:43:15 -04:00
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
2005-07-27 10:30:09 -04:00
|
|
|
rb_bug("gc_sweep(): unknown data type 0x%lx(%p)",
|
2006-09-17 21:59:00 -04:00
|
|
|
RANY(obj)->as.basic.flags & T_MASK, (void*)obj);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef __GNUC__
|
|
|
|
#if defined(__human68k__) || defined(DJGPP)
|
|
|
|
#if defined(__human68k__)
|
|
|
|
typedef unsigned long rb_jmp_buf[8];
|
2001-06-19 11:42:00 -04:00
|
|
|
__asm__ (".even\n\
|
|
|
|
_rb_setjmp:\n\
|
|
|
|
move.l 4(sp),a0\n\
|
|
|
|
movem.l d3-d7/a3-a5,(a0)\n\
|
|
|
|
moveq.l #0,d0\n\
|
1998-01-16 07:13:05 -05:00
|
|
|
rts");
|
2000-01-04 23:41:21 -05:00
|
|
|
#ifdef setjmp
|
|
|
|
#undef setjmp
|
|
|
|
#endif
|
1998-01-16 07:13:05 -05:00
|
|
|
#else
|
|
|
|
#if defined(DJGPP)
|
|
|
|
typedef unsigned long rb_jmp_buf[6];
|
2001-06-19 11:42:00 -04:00
|
|
|
__asm__ (".align 4\n\
|
|
|
|
_rb_setjmp:\n\
|
|
|
|
pushl %ebp\n\
|
|
|
|
movl %esp,%ebp\n\
|
|
|
|
movl 8(%ebp),%ebp\n\
|
|
|
|
movl %eax,(%ebp)\n\
|
|
|
|
movl %ebx,4(%ebp)\n\
|
|
|
|
movl %ecx,8(%ebp)\n\
|
|
|
|
movl %edx,12(%ebp)\n\
|
|
|
|
movl %esi,16(%ebp)\n\
|
|
|
|
movl %edi,20(%ebp)\n\
|
|
|
|
popl %ebp\n\
|
|
|
|
xorl %eax,%eax\n\
|
1998-01-16 07:13:05 -05:00
|
|
|
ret");
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
int rb_setjmp (rb_jmp_buf);
|
|
|
|
#define jmp_buf rb_jmp_buf
|
|
|
|
#define setjmp rb_setjmp
|
|
|
|
#endif /* __human68k__ or DJGPP */
|
|
|
|
#endif /* __GNUC__ */
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
#define GC_NOTIFY 0
|
|
|
|
|
2007-05-23 22:47:22 -04:00
|
|
|
void rb_vm_mark(void *ptr);
|
|
|
|
|
2007-07-14 03:48:54 -04:00
|
|
|
static void
|
2007-07-14 05:47:05 -04:00
|
|
|
mark_current_machine_context(rb_thread_t *th)
|
2007-07-14 03:19:59 -04:00
|
|
|
{
|
|
|
|
jmp_buf save_regs_gc_mark;
|
|
|
|
VALUE *stack_start, *stack_end;
|
|
|
|
|
|
|
|
SET_STACK_END;
|
|
|
|
#if STACK_GROW_DIRECTION < 0
|
|
|
|
stack_start = th->machine_stack_end;
|
|
|
|
stack_end = th->machine_stack_start;
|
|
|
|
#elif STACK_GROW_DIRECTION > 0
|
|
|
|
stack_start = th->machine_stack_start;
|
|
|
|
stack_end = th->machine_stack_end + 1;
|
|
|
|
#else
|
|
|
|
if (th->machine_stack_end < th->machine_stack_start) {
|
|
|
|
stack_start = th->machine_stack_end;
|
|
|
|
stack_end = th->machine_stack_start;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
stack_start = th->machine_stack_start;
|
|
|
|
stack_end = th->machine_stack_end + 1;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
FLUSH_REGISTER_WINDOWS;
|
|
|
|
/* This assumes that all registers are saved into the jmp_buf (and stack) */
|
|
|
|
setjmp(save_regs_gc_mark);
|
2007-07-20 03:11:35 -04:00
|
|
|
mark_locations_array((VALUE*)save_regs_gc_mark,
|
|
|
|
sizeof(save_regs_gc_mark) / sizeof(VALUE));
|
2007-07-14 03:19:59 -04:00
|
|
|
|
2007-07-20 03:11:35 -04:00
|
|
|
mark_locations_array(stack_start, stack_end - stack_start);
|
2007-07-14 03:19:59 -04:00
|
|
|
#ifdef __ia64
|
2007-07-20 03:11:35 -04:00
|
|
|
mark_locations_array(th->machine_register_stack_start,
|
|
|
|
th->machine_register_stack_end - th->machine_register_stack_start);
|
2007-07-14 03:19:59 -04:00
|
|
|
#endif
|
|
|
|
#if defined(__human68k__) || defined(__mc68000__)
|
2007-07-20 03:11:35 -04:00
|
|
|
mark_locations_array((VALUE*)((char*)STACK_END + 2),
|
|
|
|
(STACK_START - STACK_END));
|
2007-07-14 03:19:59 -04:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2007-10-13 12:32:40 -04:00
|
|
|
void rb_gc_mark_encodings(void);
|
|
|
|
|
2005-09-16 09:44:59 -04:00
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
garbage_collect(void)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
struct gc_list *list;
|
* blockinlining.c, error.c, eval.c, eval_error.h, eval_intern.h,
eval_jump.h, eval_load.c, eval_safe.h, gc.c, proc.c, signal.c,
thread.c, thread_pthread.ci, thread_win32.ci, vm.c, vm.h,
vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fix typo (rb_thead_t -> rb_thread_t).
* eval_intern.h: remove unused definitions.
* common.mk: fix around vm_opts.h path
and remove harmful argument passed to insns2vm.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-08 01:37:46 -05:00
|
|
|
rb_thread_t *th = GET_THREAD();
|
2006-12-31 10:02:22 -05:00
|
|
|
|
|
|
|
if (GC_NOTIFY) printf("start garbage_collect()\n");
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
if (!heaps) {
|
|
|
|
return Qfalse;
|
2003-11-19 22:50:32 -05:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
|
2000-11-20 03:26:48 -05:00
|
|
|
if (dont_gc || during_gc) {
|
2002-09-06 04:59:41 -04:00
|
|
|
if (!freelist) {
|
2000-08-02 00:54:21 -04:00
|
|
|
add_heap();
|
|
|
|
}
|
2005-10-25 01:30:10 -04:00
|
|
|
return Qtrue;
|
2000-07-27 05:49:34 -04:00
|
|
|
}
|
1999-01-19 23:59:39 -05:00
|
|
|
during_gc++;
|
|
|
|
|
2007-02-05 07:21:01 -05:00
|
|
|
SET_STACK_END;
|
2006-12-31 10:02:22 -05:00
|
|
|
|
2001-11-13 03:19:52 -05:00
|
|
|
init_mark_stack();
|
2005-06-19 13:16:14 -04:00
|
|
|
|
2007-05-23 22:47:22 -04:00
|
|
|
th->vm->self ? rb_gc_mark(th->vm->self) : rb_vm_mark(th->vm);
|
2006-01-10 05:50:17 -05:00
|
|
|
|
2000-07-15 09:37:03 -04:00
|
|
|
if (finalizer_table) {
|
2003-11-28 09:23:33 -05:00
|
|
|
mark_tbl(finalizer_table, 0);
|
2000-07-15 09:37:03 -04:00
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2007-07-14 05:47:05 -04:00
|
|
|
mark_current_machine_context(th);
|
2006-12-31 10:02:22 -05:00
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_gc_mark_threads();
|
2006-09-02 11:05:27 -04:00
|
|
|
rb_gc_mark_symbols();
|
2007-10-13 12:32:40 -04:00
|
|
|
rb_gc_mark_encodings();
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
/* mark protected global variables */
|
2001-10-31 01:53:22 -05:00
|
|
|
for (list = global_List; list; list = list->next) {
|
2003-04-21 04:17:18 -04:00
|
|
|
rb_gc_mark_maybe(*list->varptr);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
1999-11-26 04:07:26 -05:00
|
|
|
rb_mark_end_proc();
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_gc_mark_global_tbl();
|
1998-01-16 07:13:05 -05:00
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_mark_tbl(rb_class_tbl);
|
|
|
|
rb_gc_mark_trap_list();
|
|
|
|
|
|
|
|
/* mark generic instance variables for special constants */
|
|
|
|
rb_mark_generic_ivar_tbl();
|
2002-09-05 16:00:52 -04:00
|
|
|
|
|
|
|
rb_gc_mark_parser();
|
2005-06-19 13:16:14 -04:00
|
|
|
|
2001-11-13 03:19:52 -05:00
|
|
|
/* gc_mark objects whose marking are not completed*/
|
* include/ruby/{intern,ruby}.h, compile.[ch], error.c, eval.c,
eval_load.c, gc.c, iseq.c, main.c, parse.y, re.c, ruby.c,
yarvcore.[ch] (ruby_eval_tree, ruby_sourcefile, ruby_sourceline,
ruby_nerrs): purge global variables.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12700 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-07-05 04:12:18 -04:00
|
|
|
while (!MARK_STACK_EMPTY) {
|
|
|
|
if (mark_stack_overflow) {
|
2006-12-31 10:02:22 -05:00
|
|
|
gc_mark_all();
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
gc_mark_rest();
|
2001-10-31 01:53:22 -05:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
}
|
2005-12-30 04:15:56 -05:00
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
gc_sweep();
|
2006-12-31 10:02:22 -05:00
|
|
|
if (GC_NOTIFY) printf("end garbage_collect()\n");
|
2005-09-16 09:44:59 -04:00
|
|
|
return Qtrue;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2007-12-21 01:16:56 -05:00
|
|
|
int
|
|
|
|
rb_garbage_collect(void)
|
|
|
|
{
|
|
|
|
return garbage_collect();
|
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
void
|
* blockinlining.c: remove "yarv" prefix.
* array.c, numeric.c: ditto.
* insnhelper.ci, insns.def, vm_evalbody.ci: ditto.
* yarvcore.c: removed.
* yarvcore.h: renamed to core.h.
* cont.c, debug.c, error.c, process.c, signal.c : ditto.
* ext/probeprofiler/probeprofiler.c: ditto.
* id.c, id.h: added.
* inits.c: ditto.
* compile.c: rename internal functions.
* compile.h: fix debug flag.
* eval.c, object.c, vm.c: remove ruby_top_self.
use rb_vm_top_self() instead.
* eval_intern.h, eval_load: ditto.
* gc.c: rename yarv_machine_stack_mark() to
rb_gc_mark_machine_stack().
* insnhelper.h: remove unused macros.
* iseq.c: add iseq_compile() to create iseq object
from source string.
* proc.c: rename a internal function.
* template/insns.inc.tmpl: remove YARV prefix.
* thread.c:
* vm.c (rb_iseq_eval): added.
* vm.c: move some functions from yarvcore.c.
* vm_dump.c: fix to remove compiler warning.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12741 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-07-12 00:25:46 -04:00
|
|
|
rb_gc_mark_machine_stack(rb_thread_t *th)
|
2006-12-31 10:02:22 -05:00
|
|
|
{
|
|
|
|
#if STACK_GROW_DIRECTION < 0
|
|
|
|
rb_gc_mark_locations(th->machine_stack_end, th->machine_stack_start);
|
|
|
|
#elif STACK_GROW_DIRECTION > 0
|
2007-05-29 11:46:01 -04:00
|
|
|
rb_gc_mark_locations(th->machine_stack_start, th->machine_stack_end);
|
2006-12-31 10:02:22 -05:00
|
|
|
#else
|
2007-05-29 11:46:01 -04:00
|
|
|
if (th->machine_stack_start < th->machine_stack_end) {
|
|
|
|
rb_gc_mark_locations(th->machine_stack_start, th->machine_stack_end);
|
2006-12-31 10:02:22 -05:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
rb_gc_mark_locations(th->machine_stack_end, th->machine_stack_start);
|
|
|
|
}
|
|
|
|
#endif
|
2007-06-14 04:35:20 -04:00
|
|
|
#ifdef __ia64
|
|
|
|
rb_gc_mark_locations(th->machine_register_stack_start, th->machine_register_stack_end);
|
|
|
|
#endif
|
2006-12-31 10:02:22 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-09-27 08:25:21 -04:00
|
|
|
void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_gc(void)
|
2004-09-27 08:25:21 -04:00
|
|
|
{
|
2004-10-01 11:56:05 -04:00
|
|
|
garbage_collect();
|
2004-09-27 08:25:21 -04:00
|
|
|
rb_gc_finalize_deferred();
|
|
|
|
}
|
|
|
|
|
2003-12-22 01:20:14 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* GC.start => nil
|
|
|
|
* gc.garbage_collect => nil
|
|
|
|
* ObjectSpace.garbage_collect => nil
|
|
|
|
*
|
|
|
|
* Initiates garbage collection, unless manually disabled.
|
2005-06-19 13:16:14 -04:00
|
|
|
*
|
2003-12-22 01:20:14 -05:00
|
|
|
*/
|
|
|
|
|
2001-01-29 00:10:42 -05:00
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_gc_start(void)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_gc();
|
1998-01-16 07:13:05 -05:00
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
2004-10-27 05:29:26 -04:00
|
|
|
void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
ruby_set_stack_size(size_t size)
|
2004-10-27 05:29:26 -04:00
|
|
|
{
|
2007-12-14 23:09:24 -05:00
|
|
|
rb_gc_stack_maxsize = size;
|
2004-10-27 05:29:26 -04:00
|
|
|
}
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
Init_stack(VALUE *addr)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2006-01-22 08:32:40 -05:00
|
|
|
#ifdef __ia64
|
2005-12-27 00:40:04 -05:00
|
|
|
if (rb_gc_register_stack_start == 0) {
|
|
|
|
# if defined(__FreeBSD__)
|
|
|
|
/*
|
|
|
|
* FreeBSD/ia64 currently does not have a way for a process to get the
|
|
|
|
* base address for the RSE backing store, so hardcode it.
|
|
|
|
*/
|
|
|
|
rb_gc_register_stack_start = (4ULL<<61);
|
|
|
|
# elif defined(HAVE___LIBC_IA64_REGISTER_BACKING_STORE_BASE)
|
|
|
|
# pragma weak __libc_ia64_register_backing_store_base
|
|
|
|
extern unsigned long __libc_ia64_register_backing_store_base;
|
|
|
|
rb_gc_register_stack_start = (VALUE*)__libc_ia64_register_backing_store_base;
|
|
|
|
# endif
|
|
|
|
}
|
|
|
|
{
|
|
|
|
VALUE *bsp = (VALUE*)rb_ia64_bsp();
|
|
|
|
if (rb_gc_register_stack_start == 0 ||
|
|
|
|
bsp < rb_gc_register_stack_start) {
|
|
|
|
rb_gc_register_stack_start = bsp;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
2004-07-08 06:27:23 -04:00
|
|
|
#if defined(_WIN32) || defined(__CYGWIN__)
|
|
|
|
MEMORY_BASIC_INFORMATION m;
|
|
|
|
memset(&m, 0, sizeof(m));
|
|
|
|
VirtualQuery(&m, &m, sizeof(m));
|
|
|
|
rb_gc_stack_start =
|
|
|
|
STACK_UPPER((VALUE *)&m, (VALUE *)m.BaseAddress,
|
|
|
|
(VALUE *)((char *)m.BaseAddress + m.RegionSize) - 1);
|
|
|
|
#elif defined(STACK_END_ADDRESS)
|
2005-12-27 00:40:04 -05:00
|
|
|
{
|
|
|
|
extern void *STACK_END_ADDRESS;
|
|
|
|
rb_gc_stack_start = STACK_END_ADDRESS;
|
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
#else
|
2002-10-03 07:24:24 -04:00
|
|
|
if (!addr) addr = (VALUE *)&addr;
|
2004-06-16 03:01:32 -04:00
|
|
|
STACK_UPPER(&addr, addr, ++addr);
|
2003-02-27 03:04:32 -05:00
|
|
|
if (rb_gc_stack_start) {
|
2003-06-27 23:29:00 -04:00
|
|
|
if (STACK_UPPER(&addr,
|
2003-08-01 10:57:48 -04:00
|
|
|
rb_gc_stack_start > addr,
|
2004-06-16 03:01:32 -04:00
|
|
|
rb_gc_stack_start < addr))
|
2003-06-27 23:29:00 -04:00
|
|
|
rb_gc_stack_start = addr;
|
2003-02-27 03:04:32 -05:00
|
|
|
return;
|
|
|
|
}
|
1999-08-13 01:45:20 -04:00
|
|
|
rb_gc_stack_start = addr;
|
1998-01-16 07:13:05 -05:00
|
|
|
#endif
|
2001-11-19 00:03:03 -05:00
|
|
|
#ifdef HAVE_GETRLIMIT
|
|
|
|
{
|
|
|
|
struct rlimit rlim;
|
|
|
|
|
|
|
|
if (getrlimit(RLIMIT_STACK, &rlim) == 0) {
|
2003-10-04 08:51:32 -04:00
|
|
|
unsigned int space = rlim.rlim_cur/5;
|
2001-11-19 00:03:03 -05:00
|
|
|
|
|
|
|
if (space > 1024*1024) space = 1024*1024;
|
2007-12-14 23:09:24 -05:00
|
|
|
rb_gc_stack_maxsize = rlim.rlim_cur - space;
|
2001-11-19 00:03:03 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2005-12-27 00:40:04 -05:00
|
|
|
void ruby_init_stack(VALUE *addr
|
2006-01-22 08:32:40 -05:00
|
|
|
#ifdef __ia64
|
2005-12-27 00:40:04 -05:00
|
|
|
, void *bsp
|
|
|
|
#endif
|
|
|
|
)
|
|
|
|
{
|
|
|
|
if (!rb_gc_stack_start ||
|
|
|
|
STACK_UPPER(&addr,
|
|
|
|
rb_gc_stack_start > addr,
|
|
|
|
rb_gc_stack_start < addr)) {
|
|
|
|
rb_gc_stack_start = addr;
|
|
|
|
}
|
2006-01-22 08:32:40 -05:00
|
|
|
#ifdef __ia64
|
2005-12-27 00:40:04 -05:00
|
|
|
if (!rb_gc_register_stack_start ||
|
|
|
|
(VALUE*)bsp < rb_gc_register_stack_start) {
|
|
|
|
rb_gc_register_stack_start = (VALUE*)bsp;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
#ifdef HAVE_GETRLIMIT
|
|
|
|
{
|
|
|
|
struct rlimit rlim;
|
|
|
|
|
|
|
|
if (getrlimit(RLIMIT_STACK, &rlim) == 0) {
|
|
|
|
unsigned int space = rlim.rlim_cur/5;
|
|
|
|
|
|
|
|
if (space > 1024*1024) space = 1024*1024;
|
2007-12-14 23:09:24 -05:00
|
|
|
rb_gc_stack_maxsize = rlim.rlim_cur - space;
|
2005-12-27 00:40:04 -05:00
|
|
|
}
|
|
|
|
}
|
2006-09-13 12:15:48 -04:00
|
|
|
#elif defined _WIN32
|
|
|
|
{
|
|
|
|
MEMORY_BASIC_INFORMATION mi;
|
|
|
|
DWORD size;
|
|
|
|
DWORD space;
|
|
|
|
|
|
|
|
if (VirtualQuery(&mi, &mi, sizeof(mi))) {
|
|
|
|
size = (char *)mi.BaseAddress - (char *)mi.AllocationBase;
|
|
|
|
space = size / 5;
|
|
|
|
if (space > 1024*1024) space = 1024*1024;
|
2007-12-14 23:09:24 -05:00
|
|
|
rb_gc_stack_maxsize = size - space;
|
2006-09-13 12:15:48 -04:00
|
|
|
}
|
|
|
|
}
|
2005-12-27 00:40:04 -05:00
|
|
|
#endif
|
|
|
|
}
|
2003-12-22 01:20:14 -05:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Document-class: ObjectSpace
|
|
|
|
*
|
|
|
|
* The <code>ObjectSpace</code> module contains a number of routines
|
|
|
|
* that interact with the garbage collection facility and allow you to
|
|
|
|
* traverse all living objects with an iterator.
|
2005-06-19 13:16:14 -04:00
|
|
|
*
|
2003-12-22 01:20:14 -05:00
|
|
|
* <code>ObjectSpace</code> also provides support for object
|
|
|
|
* finalizers, procs that will be called when a specific object is
|
|
|
|
* about to be destroyed by garbage collection.
|
2005-06-19 13:16:14 -04:00
|
|
|
*
|
2003-12-22 01:20:14 -05:00
|
|
|
* include ObjectSpace
|
2005-06-19 13:16:14 -04:00
|
|
|
*
|
|
|
|
*
|
2003-12-22 01:20:14 -05:00
|
|
|
* a = "A"
|
|
|
|
* b = "B"
|
|
|
|
* c = "C"
|
2005-06-19 13:16:14 -04:00
|
|
|
*
|
|
|
|
*
|
2003-12-22 01:20:14 -05:00
|
|
|
* define_finalizer(a, proc {|id| puts "Finalizer one on #{id}" })
|
|
|
|
* define_finalizer(a, proc {|id| puts "Finalizer two on #{id}" })
|
|
|
|
* define_finalizer(b, proc {|id| puts "Finalizer three on #{id}" })
|
2005-06-19 13:16:14 -04:00
|
|
|
*
|
2003-12-22 01:20:14 -05:00
|
|
|
* <em>produces:</em>
|
2005-06-19 13:16:14 -04:00
|
|
|
*
|
2003-12-22 01:20:14 -05:00
|
|
|
* Finalizer three on 537763470
|
|
|
|
* Finalizer one on 537763480
|
|
|
|
* Finalizer two on 537763480
|
2005-06-19 13:16:14 -04:00
|
|
|
*
|
2003-12-22 01:20:14 -05:00
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
Init_heap(void)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
1999-08-13 01:45:20 -04:00
|
|
|
if (!rb_gc_stack_start) {
|
|
|
|
Init_stack(0);
|
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
add_heap();
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
os_obj_of(VALUE of)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
int n = 0;
|
|
|
|
|
|
|
|
for (i = 0; i < heaps_used; i++) {
|
|
|
|
RVALUE *p, *pend;
|
|
|
|
|
2003-10-01 07:49:44 -04:00
|
|
|
p = heaps[i].slot; pend = p + heaps[i].limit;
|
1998-01-16 07:13:05 -05:00
|
|
|
for (;p < pend; p++) {
|
|
|
|
if (p->as.basic.flags) {
|
2007-09-22 20:05:07 -04:00
|
|
|
switch (BUILTIN_TYPE(p)) {
|
|
|
|
case T_NONE:
|
1998-01-16 07:13:05 -05:00
|
|
|
case T_ICLASS:
|
|
|
|
case T_NODE:
|
2007-09-21 01:51:43 -04:00
|
|
|
case T_VALUES:
|
1998-01-16 07:13:05 -05:00
|
|
|
continue;
|
|
|
|
case T_CLASS:
|
|
|
|
if (FL_TEST(p, FL_SINGLETON)) continue;
|
|
|
|
default:
|
2001-01-23 03:08:59 -05:00
|
|
|
if (!p->as.basic.klass) continue;
|
2007-09-22 20:05:07 -04:00
|
|
|
if (!of || rb_obj_is_kind_of((VALUE)p, of)) {
|
1998-01-16 07:19:22 -05:00
|
|
|
rb_yield((VALUE)p);
|
1998-01-16 07:13:05 -05:00
|
|
|
n++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return INT2FIX(n);
|
|
|
|
}
|
|
|
|
|
2003-12-22 01:20:14 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* ObjectSpace.each_object([module]) {|obj| ... } => fixnum
|
2005-06-19 13:16:14 -04:00
|
|
|
*
|
2003-12-22 01:20:14 -05:00
|
|
|
* Calls the block once for each living, nonimmediate object in this
|
|
|
|
* Ruby process. If <i>module</i> is specified, calls the block
|
|
|
|
* for only those classes or modules that match (or are a subclass of)
|
|
|
|
* <i>module</i>. Returns the number of objects found. Immediate
|
|
|
|
* objects (<code>Fixnum</code>s, <code>Symbol</code>s
|
|
|
|
* <code>true</code>, <code>false</code>, and <code>nil</code>) are
|
|
|
|
* never returned. In the example below, <code>each_object</code>
|
|
|
|
* returns both the numbers we defined and several constants defined in
|
|
|
|
* the <code>Math</code> module.
|
2005-06-19 13:16:14 -04:00
|
|
|
*
|
2003-12-22 01:20:14 -05:00
|
|
|
* a = 102.7
|
|
|
|
* b = 95 # Won't be returned
|
|
|
|
* c = 12345678987654321
|
|
|
|
* count = ObjectSpace.each_object(Numeric) {|x| p x }
|
|
|
|
* puts "Total count: #{count}"
|
2005-06-19 13:16:14 -04:00
|
|
|
*
|
2003-12-22 01:20:14 -05:00
|
|
|
* <em>produces:</em>
|
2005-06-19 13:16:14 -04:00
|
|
|
*
|
2003-12-22 01:20:14 -05:00
|
|
|
* 12345678987654321
|
|
|
|
* 102.7
|
|
|
|
* 2.71828182845905
|
|
|
|
* 3.14159265358979
|
|
|
|
* 2.22044604925031e-16
|
|
|
|
* 1.7976931348623157e+308
|
|
|
|
* 2.2250738585072e-308
|
|
|
|
* Total count: 7
|
2005-06-19 13:16:14 -04:00
|
|
|
*
|
2003-12-22 01:20:14 -05:00
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
2007-12-27 23:07:33 -05:00
|
|
|
os_each_obj(int argc, VALUE *argv, VALUE os)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
VALUE of;
|
|
|
|
|
2003-03-26 02:01:14 -05:00
|
|
|
rb_secure(4);
|
1998-01-16 07:13:05 -05:00
|
|
|
if (rb_scan_args(argc, argv, "01", &of) == 0) {
|
2007-09-22 20:05:07 -04:00
|
|
|
of = 0;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2007-12-27 23:07:33 -05:00
|
|
|
RETURN_ENUMERATOR(os, 1, &of);
|
2007-09-22 20:05:07 -04:00
|
|
|
return os_obj_of(of);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE finalizers;
|
|
|
|
|
2003-12-22 01:20:14 -05:00
|
|
|
/* deprecated
|
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
add_final(VALUE os, VALUE block)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2000-07-15 09:37:03 -04:00
|
|
|
rb_warn("ObjectSpace::add_finalizer is deprecated; use define_finalizer");
|
2003-06-07 11:34:31 -04:00
|
|
|
if (!rb_respond_to(block, rb_intern("call"))) {
|
|
|
|
rb_raise(rb_eArgError, "wrong type argument %s (should be callable)",
|
2003-06-06 05:44:22 -04:00
|
|
|
rb_obj_classname(block));
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2003-06-06 05:44:22 -04:00
|
|
|
rb_ary_push(finalizers, block);
|
|
|
|
return block;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2003-12-22 01:20:14 -05:00
|
|
|
/*
|
|
|
|
* deprecated
|
|
|
|
*/
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rm_final(VALUE os, VALUE block)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2000-07-15 09:37:03 -04:00
|
|
|
rb_warn("ObjectSpace::remove_finalizer is deprecated; use undefine_finalizer");
|
2003-06-06 05:44:22 -04:00
|
|
|
rb_ary_delete(finalizers, block);
|
|
|
|
return block;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2003-12-22 01:20:14 -05:00
|
|
|
/*
|
|
|
|
* deprecated
|
|
|
|
*/
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
finals(void)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2001-05-02 00:22:21 -04:00
|
|
|
rb_warn("ObjectSpace::finalizers is deprecated");
|
1998-01-16 07:13:05 -05:00
|
|
|
return finalizers;
|
|
|
|
}
|
|
|
|
|
2003-12-22 01:20:14 -05:00
|
|
|
/*
|
|
|
|
* deprecated
|
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
call_final(VALUE os, VALUE obj)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2002-08-29 05:08:18 -04:00
|
|
|
rb_warn("ObjectSpace::call_finalizer is deprecated; use define_finalizer");
|
1998-01-16 07:13:05 -05:00
|
|
|
need_call_final = 1;
|
|
|
|
FL_SET(obj, FL_FINALIZE);
|
|
|
|
return obj;
|
|
|
|
}
|
|
|
|
|
2003-12-22 01:20:14 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* ObjectSpace.undefine_finalizer(obj)
|
2005-06-19 13:16:14 -04:00
|
|
|
*
|
2003-12-22 01:20:14 -05:00
|
|
|
* Removes all finalizers for <i>obj</i>.
|
2005-06-19 13:16:14 -04:00
|
|
|
*
|
2003-12-22 01:20:14 -05:00
|
|
|
*/
|
|
|
|
|
2000-07-15 09:37:03 -04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
undefine_final(VALUE os, VALUE obj)
|
2000-07-15 09:37:03 -04:00
|
|
|
{
|
|
|
|
if (finalizer_table) {
|
2003-07-25 01:36:55 -04:00
|
|
|
st_delete(finalizer_table, (st_data_t*)&obj, 0);
|
2000-07-15 09:37:03 -04:00
|
|
|
}
|
|
|
|
return obj;
|
|
|
|
}
|
|
|
|
|
2003-12-22 01:20:14 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* ObjectSpace.define_finalizer(obj, aProc=proc())
|
2005-06-19 13:16:14 -04:00
|
|
|
*
|
|
|
|
* Adds <i>aProc</i> as a finalizer, to be called after <i>obj</i>
|
|
|
|
* was destroyed.
|
|
|
|
*
|
2003-12-22 01:20:14 -05:00
|
|
|
*/
|
|
|
|
|
2000-07-15 09:37:03 -04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
define_final(int argc, VALUE *argv, VALUE os)
|
2000-07-15 09:37:03 -04:00
|
|
|
{
|
2003-06-06 05:44:22 -04:00
|
|
|
VALUE obj, block, table;
|
2000-07-15 09:37:03 -04:00
|
|
|
|
2003-06-06 05:44:22 -04:00
|
|
|
rb_scan_args(argc, argv, "11", &obj, &block);
|
2000-07-15 09:37:03 -04:00
|
|
|
if (argc == 1) {
|
2003-06-16 03:14:50 -04:00
|
|
|
block = rb_block_proc();
|
2000-07-15 09:37:03 -04:00
|
|
|
}
|
2003-06-07 11:34:31 -04:00
|
|
|
else if (!rb_respond_to(block, rb_intern("call"))) {
|
|
|
|
rb_raise(rb_eArgError, "wrong type argument %s (should be callable)",
|
2003-06-06 05:44:22 -04:00
|
|
|
rb_obj_classname(block));
|
2000-07-15 09:37:03 -04:00
|
|
|
}
|
|
|
|
need_call_final = 1;
|
|
|
|
FL_SET(obj, FL_FINALIZE);
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
block = rb_ary_new3(2, INT2FIX(rb_safe_level()), block);
|
2004-06-28 21:31:37 -04:00
|
|
|
|
2000-07-15 09:37:03 -04:00
|
|
|
if (!finalizer_table) {
|
|
|
|
finalizer_table = st_init_numtable();
|
|
|
|
}
|
|
|
|
if (st_lookup(finalizer_table, obj, &table)) {
|
2003-06-06 05:44:22 -04:00
|
|
|
rb_ary_push(table, block);
|
2000-07-15 09:37:03 -04:00
|
|
|
}
|
|
|
|
else {
|
2003-06-06 05:44:22 -04:00
|
|
|
st_add_direct(finalizer_table, obj, rb_ary_new3(1, block));
|
2000-07-15 09:37:03 -04:00
|
|
|
}
|
2003-06-06 05:44:22 -04:00
|
|
|
return block;
|
2000-07-15 09:37:03 -04:00
|
|
|
}
|
|
|
|
|
2002-12-04 02:39:32 -05:00
|
|
|
void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_gc_copy_finalizer(VALUE dest, VALUE obj)
|
2002-12-04 02:39:32 -05:00
|
|
|
{
|
|
|
|
VALUE table;
|
|
|
|
|
|
|
|
if (!finalizer_table) return;
|
|
|
|
if (!FL_TEST(obj, FL_FINALIZE)) return;
|
|
|
|
if (st_lookup(finalizer_table, obj, &table)) {
|
|
|
|
st_insert(finalizer_table, dest, table);
|
|
|
|
}
|
2004-10-27 05:29:26 -04:00
|
|
|
FL_SET(dest, FL_FINALIZE);
|
2002-12-04 02:39:32 -05:00
|
|
|
}
|
|
|
|
|
1999-08-13 01:45:20 -04:00
|
|
|
static VALUE
|
2007-09-21 01:51:43 -04:00
|
|
|
run_single_final(VALUE arg)
|
1999-08-13 01:45:20 -04:00
|
|
|
{
|
2007-09-21 01:51:43 -04:00
|
|
|
VALUE *args = (VALUE *)arg;
|
2004-06-28 21:31:37 -04:00
|
|
|
rb_eval_cmd(args[0], args[1], (int)args[2]);
|
1999-08-13 01:45:20 -04:00
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
run_final(VALUE obj)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2002-08-21 11:47:54 -04:00
|
|
|
long i;
|
2003-07-24 03:50:36 -04:00
|
|
|
int status, critical_save = rb_thread_critical;
|
2005-06-19 01:16:36 -04:00
|
|
|
VALUE args[3], table, objid;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2005-06-19 01:09:32 -04:00
|
|
|
objid = rb_obj_id(obj); /* make obj into id */
|
2003-07-24 03:50:36 -04:00
|
|
|
rb_thread_critical = Qtrue;
|
2005-06-19 01:09:32 -04:00
|
|
|
args[1] = 0;
|
2007-09-21 01:51:43 -04:00
|
|
|
if (RARRAY_LEN(finalizers) > 0) {
|
|
|
|
args[1] = rb_obj_freeze(rb_ary_new3(1, objid));
|
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
args[2] = (VALUE)rb_safe_level();
|
2006-09-02 10:42:08 -04:00
|
|
|
for (i=0; i<RARRAY_LEN(finalizers); i++) {
|
|
|
|
args[0] = RARRAY_PTR(finalizers)[i];
|
2007-09-21 01:51:43 -04:00
|
|
|
rb_protect(run_single_final, (VALUE)args, &status);
|
1998-01-16 07:19:22 -05:00
|
|
|
}
|
2003-07-25 01:36:55 -04:00
|
|
|
if (finalizer_table && st_delete(finalizer_table, (st_data_t*)&obj, &table)) {
|
2007-09-21 01:51:43 -04:00
|
|
|
if (!args[1] && RARRAY_LEN(table) > 0) {
|
|
|
|
args[1] = rb_obj_freeze(rb_ary_new3(1, objid));
|
|
|
|
}
|
2006-09-02 10:42:08 -04:00
|
|
|
for (i=0; i<RARRAY_LEN(table); i++) {
|
|
|
|
VALUE final = RARRAY_PTR(table)[i];
|
|
|
|
args[0] = RARRAY_PTR(final)[1];
|
|
|
|
args[2] = FIX2INT(RARRAY_PTR(final)[0]);
|
2007-09-21 01:51:43 -04:00
|
|
|
rb_protect(run_single_final, (VALUE)args, &status);
|
2000-07-15 09:37:03 -04:00
|
|
|
}
|
|
|
|
}
|
2003-07-24 03:50:36 -04:00
|
|
|
rb_thread_critical = critical_save;
|
1998-01-16 07:19:22 -05:00
|
|
|
}
|
|
|
|
|
2004-09-27 08:25:21 -04:00
|
|
|
void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_gc_finalize_deferred(void)
|
2004-09-27 08:25:21 -04:00
|
|
|
{
|
|
|
|
RVALUE *p = deferred_final_list;
|
|
|
|
|
2006-02-12 23:53:22 -05:00
|
|
|
during_gc++;
|
2004-09-27 08:25:21 -04:00
|
|
|
deferred_final_list = 0;
|
|
|
|
if (p) {
|
|
|
|
finalize_list(p);
|
|
|
|
}
|
2005-08-12 04:13:28 -04:00
|
|
|
free_unused_heaps();
|
2006-02-12 23:53:22 -05:00
|
|
|
during_gc = 0;
|
2004-09-27 08:25:21 -04:00
|
|
|
}
|
|
|
|
|
1998-01-16 07:19:22 -05:00
|
|
|
void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_gc_call_finalizer_at_exit(void)
|
1998-01-16 07:19:22 -05:00
|
|
|
{
|
|
|
|
RVALUE *p, *pend;
|
|
|
|
int i;
|
|
|
|
|
2006-02-12 23:53:22 -05:00
|
|
|
/* finalizers are part of garbage collection */
|
|
|
|
during_gc++;
|
1999-01-19 23:59:39 -05:00
|
|
|
/* run finalizers */
|
2001-01-23 04:55:10 -05:00
|
|
|
if (need_call_final) {
|
2005-06-19 01:09:32 -04:00
|
|
|
p = deferred_final_list;
|
|
|
|
deferred_final_list = 0;
|
|
|
|
finalize_list(p);
|
2001-01-23 04:55:10 -05:00
|
|
|
for (i = 0; i < heaps_used; i++) {
|
2003-10-01 07:49:44 -04:00
|
|
|
p = heaps[i].slot; pend = p + heaps[i].limit;
|
2001-01-23 04:55:10 -05:00
|
|
|
while (p < pend) {
|
|
|
|
if (FL_TEST(p, FL_FINALIZE)) {
|
|
|
|
FL_UNSET(p, FL_FINALIZE);
|
|
|
|
p->as.basic.klass = 0;
|
|
|
|
run_final((VALUE)p);
|
|
|
|
}
|
|
|
|
p++;
|
2000-04-10 01:48:43 -04:00
|
|
|
}
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
|
|
|
}
|
2003-08-01 10:57:48 -04:00
|
|
|
/* run data object's finalizers */
|
2004-04-07 02:30:15 -04:00
|
|
|
for (i = 0; i < heaps_used; i++) {
|
2003-10-01 07:49:44 -04:00
|
|
|
p = heaps[i].slot; pend = p + heaps[i].limit;
|
1998-01-16 07:19:22 -05:00
|
|
|
while (p < pend) {
|
|
|
|
if (BUILTIN_TYPE(p) == T_DATA &&
|
2004-04-06 22:51:05 -04:00
|
|
|
DATA_PTR(p) && RANY(p)->as.data.dfree &&
|
|
|
|
RANY(p)->as.basic.klass != rb_cThread) {
|
2001-02-02 06:38:20 -05:00
|
|
|
p->as.free.flags = 0;
|
2003-03-23 05:55:39 -05:00
|
|
|
if ((long)RANY(p)->as.data.dfree == -1) {
|
|
|
|
RUBY_CRITICAL(free(DATA_PTR(p)));
|
|
|
|
}
|
|
|
|
else if (RANY(p)->as.data.dfree) {
|
|
|
|
(*RANY(p)->as.data.dfree)(DATA_PTR(p));
|
|
|
|
}
|
2007-08-19 00:34:44 -04:00
|
|
|
VALGRIND_MAKE_MEM_UNDEFINED((void*)p, sizeof(RVALUE));
|
1999-08-13 01:45:20 -04:00
|
|
|
}
|
|
|
|
else if (BUILTIN_TYPE(p) == T_FILE) {
|
2004-04-06 22:51:05 -04:00
|
|
|
if (rb_io_fptr_finalize(RANY(p)->as.file.fptr)) {
|
|
|
|
p->as.free.flags = 0;
|
2007-08-19 00:34:44 -04:00
|
|
|
VALGRIND_MAKE_MEM_UNDEFINED((void*)p, sizeof(RVALUE));
|
2004-04-06 22:51:05 -04:00
|
|
|
}
|
1999-08-13 01:45:20 -04:00
|
|
|
}
|
1998-01-16 07:19:22 -05:00
|
|
|
p++;
|
|
|
|
}
|
|
|
|
}
|
2006-02-12 23:53:22 -05:00
|
|
|
during_gc = 0;
|
1998-01-16 07:19:22 -05:00
|
|
|
}
|
|
|
|
|
2003-12-22 01:20:14 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* ObjectSpace._id2ref(object_id) -> an_object
|
2005-06-19 13:16:14 -04:00
|
|
|
*
|
2003-12-22 01:20:14 -05:00
|
|
|
* Converts an object id to a reference to the object. May not be
|
|
|
|
* called on an object id passed as a parameter to a finalizer.
|
2005-06-19 13:16:14 -04:00
|
|
|
*
|
2003-12-22 01:20:14 -05:00
|
|
|
* s = "I am a string" #=> "I am a string"
|
|
|
|
* r = ObjectSpace._id2ref(s.object_id) #=> "I am a string"
|
|
|
|
* r == s #=> true
|
2005-06-19 13:16:14 -04:00
|
|
|
*
|
2003-12-22 01:20:14 -05:00
|
|
|
*/
|
|
|
|
|
1998-01-16 07:19:22 -05:00
|
|
|
static VALUE
|
2006-03-02 00:22:30 -05:00
|
|
|
id2ref(VALUE obj, VALUE objid)
|
1998-01-16 07:19:22 -05:00
|
|
|
{
|
2005-07-27 03:27:19 -04:00
|
|
|
#if SIZEOF_LONG == SIZEOF_VOIDP
|
|
|
|
#define NUM2PTR(x) NUM2ULONG(x)
|
|
|
|
#elif SIZEOF_LONG_LONG == SIZEOF_VOIDP
|
|
|
|
#define NUM2PTR(x) NUM2ULL(x)
|
|
|
|
#endif
|
|
|
|
VALUE ptr;
|
|
|
|
void *p0;
|
1998-01-16 07:19:22 -05:00
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_secure(4);
|
2006-03-02 00:22:30 -05:00
|
|
|
ptr = NUM2PTR(objid);
|
2005-07-27 03:27:19 -04:00
|
|
|
p0 = (void *)ptr;
|
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
if (ptr == Qtrue) return Qtrue;
|
|
|
|
if (ptr == Qfalse) return Qfalse;
|
|
|
|
if (ptr == Qnil) return Qnil;
|
2001-03-20 22:41:45 -05:00
|
|
|
if (FIXNUM_P(ptr)) return (VALUE)ptr;
|
2006-03-04 01:28:51 -05:00
|
|
|
ptr = objid ^ FIXNUM_FLAG; /* unset FIXNUM_FLAG */
|
2006-03-02 00:22:30 -05:00
|
|
|
|
2006-03-04 01:28:51 -05:00
|
|
|
if ((ptr % sizeof(RVALUE)) == (4 << 2)) {
|
|
|
|
ID symid = ptr / sizeof(RVALUE);
|
2006-03-02 00:22:30 -05:00
|
|
|
if (rb_id2name(symid) == 0)
|
2007-06-25 07:19:11 -04:00
|
|
|
rb_raise(rb_eRangeError, "%p is not symbol id value", p0);
|
2006-12-31 10:02:22 -05:00
|
|
|
return ID2SYM(symid);
|
2001-03-20 22:41:45 -05:00
|
|
|
}
|
1999-01-19 23:59:39 -05:00
|
|
|
|
2007-10-01 02:57:56 -04:00
|
|
|
if (!is_pointer_to_heap((void *)ptr) ||
|
|
|
|
BUILTIN_TYPE(ptr) >= T_VALUES || BUILTIN_TYPE(ptr) == T_ICLASS) {
|
2005-07-27 03:27:19 -04:00
|
|
|
rb_raise(rb_eRangeError, "%p is not id value", p0);
|
1998-01-16 07:19:22 -05:00
|
|
|
}
|
2003-08-22 04:09:58 -04:00
|
|
|
if (BUILTIN_TYPE(ptr) == 0 || RBASIC(ptr)->klass == 0) {
|
2005-07-27 03:27:19 -04:00
|
|
|
rb_raise(rb_eRangeError, "%p is recycled object", p0);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
1998-01-16 07:19:22 -05:00
|
|
|
return (VALUE)ptr;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2006-03-02 00:22:30 -05:00
|
|
|
/*
|
|
|
|
* Document-method: __id__
|
|
|
|
* Document-method: object_id
|
|
|
|
*
|
|
|
|
* call-seq:
|
|
|
|
* obj.__id__ => fixnum
|
|
|
|
* obj.object_id => fixnum
|
|
|
|
*
|
|
|
|
* Returns an integer identifier for <i>obj</i>. The same number will
|
|
|
|
* be returned on all calls to <code>id</code> for a given object, and
|
|
|
|
* no two active objects will share an id.
|
|
|
|
* <code>Object#object_id</code> is a different concept from the
|
|
|
|
* <code>:name</code> notation, which returns the symbol id of
|
|
|
|
* <code>name</code>. Replaces the deprecated <code>Object#id</code>.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* obj.hash => fixnum
|
|
|
|
*
|
|
|
|
* Generates a <code>Fixnum</code> hash value for this object. This
|
|
|
|
* function must have the property that <code>a.eql?(b)</code> implies
|
|
|
|
* <code>a.hash == b.hash</code>. The hash value is used by class
|
|
|
|
* <code>Hash</code>. Any hash value that exceeds the capacity of a
|
|
|
|
* <code>Fixnum</code> will be truncated before being used.
|
|
|
|
*/
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_obj_id(VALUE obj)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* 32-bit VALUE space
|
|
|
|
* MSB ------------------------ LSB
|
|
|
|
* false 00000000000000000000000000000000
|
|
|
|
* true 00000000000000000000000000000010
|
|
|
|
* nil 00000000000000000000000000000100
|
|
|
|
* undef 00000000000000000000000000000110
|
|
|
|
* symbol ssssssssssssssssssssssss00001110
|
2007-06-27 22:32:25 -04:00
|
|
|
* object oooooooooooooooooooooooooooooo00 = 0 (mod sizeof(RVALUE))
|
2006-03-02 00:22:30 -05:00
|
|
|
* fixnum fffffffffffffffffffffffffffffff1
|
|
|
|
*
|
|
|
|
* object_id space
|
|
|
|
* LSB
|
|
|
|
* false 00000000000000000000000000000000
|
|
|
|
* true 00000000000000000000000000000010
|
|
|
|
* nil 00000000000000000000000000000100
|
|
|
|
* undef 00000000000000000000000000000110
|
2007-06-27 22:32:25 -04:00
|
|
|
* symbol 000SSSSSSSSSSSSSSSSSSSSSSSSSSS0 S...S % A = 4 (S...S = s...s * A + 4)
|
2006-03-02 00:22:30 -05:00
|
|
|
* object oooooooooooooooooooooooooooooo0 o...o % A = 0
|
|
|
|
* fixnum fffffffffffffffffffffffffffffff1 bignum if required
|
|
|
|
*
|
|
|
|
* where A = sizeof(RVALUE)/4
|
|
|
|
*
|
|
|
|
* sizeof(RVALUE) is
|
|
|
|
* 20 if 32-bit, double is 4-byte aligned
|
|
|
|
* 24 if 32-bit, double is 8-byte aligned
|
|
|
|
* 40 if 64-bit
|
|
|
|
*/
|
2006-12-31 10:02:22 -05:00
|
|
|
if (TYPE(obj) == T_SYMBOL) {
|
|
|
|
return (SYM2ID(obj) * sizeof(RVALUE) + (4 << 2)) | FIXNUM_FLAG;
|
|
|
|
}
|
2006-03-02 00:22:30 -05:00
|
|
|
if (SPECIAL_CONST_P(obj)) {
|
2007-06-27 22:32:25 -04:00
|
|
|
return LONG2NUM((SIGNED_VALUE)obj);
|
2006-03-02 00:22:30 -05:00
|
|
|
}
|
2007-06-27 22:32:25 -04:00
|
|
|
return (VALUE)((SIGNED_VALUE)obj|FIXNUM_FLAG);
|
2006-03-02 00:22:30 -05:00
|
|
|
}
|
|
|
|
|
2007-11-03 11:09:10 -04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* ObjectSpace.count_objects([result_hash]) -> hash
|
|
|
|
*
|
|
|
|
* Counts objects for each type.
|
|
|
|
*
|
2007-11-03 19:13:57 -04:00
|
|
|
* It returns a hash as:
|
|
|
|
* {:TOTAL=>10000, :FREE=>3011, :T_OBJECT=>6, :T_CLASS=>404, ...}
|
2007-11-03 11:09:10 -04:00
|
|
|
*
|
|
|
|
* If the optional argument, result_hash, is given,
|
|
|
|
* it is overwritten and returned.
|
|
|
|
* This is intended to avoid probe effect.
|
|
|
|
*
|
|
|
|
* The contents of the returned hash is implementation defined.
|
|
|
|
* It may be changed in future.
|
|
|
|
*
|
|
|
|
* This method is not expected to work except C Ruby.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
count_objects(int argc, VALUE *argv, VALUE os)
|
|
|
|
{
|
|
|
|
long counts[T_MASK+1];
|
|
|
|
long freed = 0;
|
2007-11-03 19:13:57 -04:00
|
|
|
long total = 0;
|
2007-11-03 11:09:10 -04:00
|
|
|
int i;
|
|
|
|
VALUE hash;
|
|
|
|
|
|
|
|
if (rb_scan_args(argc, argv, "01", &hash) == 1) {
|
|
|
|
if (TYPE(hash) != T_HASH)
|
|
|
|
rb_raise(rb_eTypeError, "non-hash given");
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i <= T_MASK; i++) {
|
|
|
|
counts[i] = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < heaps_used; i++) {
|
|
|
|
RVALUE *p, *pend;
|
|
|
|
|
|
|
|
p = heaps[i].slot; pend = p + heaps[i].limit;
|
|
|
|
for (;p < pend; p++) {
|
|
|
|
if (p->as.basic.flags) {
|
|
|
|
counts[BUILTIN_TYPE(p)]++;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
freed++;
|
|
|
|
}
|
|
|
|
}
|
2007-11-03 19:13:57 -04:00
|
|
|
total += heaps[i].limit;
|
2007-11-03 11:09:10 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
if (hash == Qnil)
|
|
|
|
hash = rb_hash_new();
|
2007-11-03 19:13:57 -04:00
|
|
|
rb_hash_aset(hash, ID2SYM(rb_intern("TOTAL")), LONG2NUM(total));
|
2007-11-03 11:09:10 -04:00
|
|
|
rb_hash_aset(hash, ID2SYM(rb_intern("FREE")), LONG2NUM(freed));
|
|
|
|
for (i = 0; i <= T_MASK; i++) {
|
|
|
|
VALUE type;
|
|
|
|
switch (i) {
|
|
|
|
case T_NONE: type = ID2SYM(rb_intern("T_NONE")); break;
|
|
|
|
case T_NIL: type = ID2SYM(rb_intern("T_NIL")); break;
|
|
|
|
case T_OBJECT: type = ID2SYM(rb_intern("T_OBJECT")); break;
|
|
|
|
case T_CLASS: type = ID2SYM(rb_intern("T_CLASS")); break;
|
|
|
|
case T_ICLASS: type = ID2SYM(rb_intern("T_ICLASS")); break;
|
|
|
|
case T_MODULE: type = ID2SYM(rb_intern("T_MODULE")); break;
|
|
|
|
case T_FLOAT: type = ID2SYM(rb_intern("T_FLOAT")); break;
|
|
|
|
case T_STRING: type = ID2SYM(rb_intern("T_STRING")); break;
|
|
|
|
case T_REGEXP: type = ID2SYM(rb_intern("T_REGEXP")); break;
|
|
|
|
case T_ARRAY: type = ID2SYM(rb_intern("T_ARRAY")); break;
|
|
|
|
case T_FIXNUM: type = ID2SYM(rb_intern("T_FIXNUM")); break;
|
|
|
|
case T_HASH: type = ID2SYM(rb_intern("T_HASH")); break;
|
|
|
|
case T_STRUCT: type = ID2SYM(rb_intern("T_STRUCT")); break;
|
|
|
|
case T_BIGNUM: type = ID2SYM(rb_intern("T_BIGNUM")); break;
|
|
|
|
case T_FILE: type = ID2SYM(rb_intern("T_FILE")); break;
|
|
|
|
case T_TRUE: type = ID2SYM(rb_intern("T_TRUE")); break;
|
|
|
|
case T_FALSE: type = ID2SYM(rb_intern("T_FALSE")); break;
|
|
|
|
case T_DATA: type = ID2SYM(rb_intern("T_DATA")); break;
|
|
|
|
case T_MATCH: type = ID2SYM(rb_intern("T_MATCH")); break;
|
|
|
|
case T_SYMBOL: type = ID2SYM(rb_intern("T_SYMBOL")); break;
|
|
|
|
case T_VALUES: type = ID2SYM(rb_intern("T_VALUES")); break;
|
|
|
|
case T_BLOCK: type = ID2SYM(rb_intern("T_BLOCK")); break;
|
|
|
|
case T_UNDEF: type = ID2SYM(rb_intern("T_UNDEF")); break;
|
|
|
|
case T_NODE: type = ID2SYM(rb_intern("T_NODE")); break;
|
|
|
|
default: type = INT2NUM(i); break;
|
|
|
|
}
|
|
|
|
if (counts[i])
|
|
|
|
rb_hash_aset(hash, type, LONG2NUM(counts[i]));
|
|
|
|
}
|
|
|
|
|
|
|
|
return hash;
|
|
|
|
}
|
|
|
|
|
2003-12-22 01:20:14 -05:00
|
|
|
/*
|
|
|
|
* The <code>GC</code> module provides an interface to Ruby's mark and
|
|
|
|
* sweep garbage collection mechanism. Some of the underlying methods
|
|
|
|
* are also available via the <code>ObjectSpace</code> module.
|
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
Init_GC(void)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
1999-01-19 23:59:39 -05:00
|
|
|
VALUE rb_mObSpace;
|
|
|
|
|
|
|
|
rb_mGC = rb_define_module("GC");
|
2001-01-29 00:10:42 -05:00
|
|
|
rb_define_singleton_method(rb_mGC, "start", rb_gc_start, 0);
|
|
|
|
rb_define_singleton_method(rb_mGC, "enable", rb_gc_enable, 0);
|
|
|
|
rb_define_singleton_method(rb_mGC, "disable", rb_gc_disable, 0);
|
2006-01-09 17:32:55 -05:00
|
|
|
rb_define_singleton_method(rb_mGC, "stress", gc_stress_get, 0);
|
|
|
|
rb_define_singleton_method(rb_mGC, "stress=", gc_stress_set, 1);
|
2001-01-29 00:10:42 -05:00
|
|
|
rb_define_method(rb_mGC, "garbage_collect", rb_gc_start, 0);
|
1999-01-19 23:59:39 -05:00
|
|
|
|
|
|
|
rb_mObSpace = rb_define_module("ObjectSpace");
|
|
|
|
rb_define_module_function(rb_mObSpace, "each_object", os_each_obj, -1);
|
2001-01-29 00:10:42 -05:00
|
|
|
rb_define_module_function(rb_mObSpace, "garbage_collect", rb_gc_start, 0);
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_define_module_function(rb_mObSpace, "add_finalizer", add_final, 1);
|
|
|
|
rb_define_module_function(rb_mObSpace, "remove_finalizer", rm_final, 1);
|
|
|
|
rb_define_module_function(rb_mObSpace, "finalizers", finals, 0);
|
|
|
|
rb_define_module_function(rb_mObSpace, "call_finalizer", call_final, 1);
|
2000-07-15 09:37:03 -04:00
|
|
|
|
|
|
|
rb_define_module_function(rb_mObSpace, "define_finalizer", define_final, -1);
|
|
|
|
rb_define_module_function(rb_mObSpace, "undefine_finalizer", undefine_final, 1);
|
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_define_module_function(rb_mObSpace, "_id2ref", id2ref, 1);
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2000-02-08 03:54:01 -05:00
|
|
|
rb_gc_register_address(&rb_mObSpace);
|
1998-01-16 07:13:05 -05:00
|
|
|
rb_global_variable(&finalizers);
|
2000-02-08 03:54:01 -05:00
|
|
|
rb_gc_unregister_address(&rb_mObSpace);
|
1999-01-19 23:59:39 -05:00
|
|
|
finalizers = rb_ary_new();
|
2002-03-07 06:19:37 -05:00
|
|
|
|
|
|
|
source_filenames = st_init_strtable();
|
2002-04-24 00:54:16 -04:00
|
|
|
|
|
|
|
rb_global_variable(&nomem_error);
|
2005-12-11 22:04:53 -05:00
|
|
|
nomem_error = rb_exc_new2(rb_eNoMemError, "failed to allocate memory");
|
2006-03-02 00:22:30 -05:00
|
|
|
|
|
|
|
rb_define_method(rb_mKernel, "hash", rb_obj_id, 0);
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_define_method(rb_mKernel, "__id__", rb_obj_id, 0);
|
|
|
|
rb_define_method(rb_mKernel, "object_id", rb_obj_id, 0);
|
2007-11-03 11:09:10 -04:00
|
|
|
|
|
|
|
rb_define_module_function(rb_mObSpace, "count_objects", count_objects, -1);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|