2000-05-01 13:42:38 +04:00
|
|
|
/**********************************************************************
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
variable.c -
|
|
|
|
|
|
|
|
$Author$
|
|
|
|
created at: Tue Apr 19 23:55:15 JST 1994
|
|
|
|
|
* 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-25 07:29:39 +04:00
|
|
|
Copyright (C) 1993-2007 Yukihiro Matsumoto
|
2000-05-01 13:42:38 +04:00
|
|
|
Copyright (C) 2000 Network Applied Communication Laboratory, Inc.
|
2000-05-09 08:53:16 +04:00
|
|
|
Copyright (C) 2000 Information-technology Promotion Agency, Japan
|
2000-05-01 13:42:38 +04:00
|
|
|
|
|
|
|
**********************************************************************/
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2018-01-09 09:24:11 +03:00
|
|
|
#include "ruby/encoding.h"
|
2007-06-10 07:06:15 +04:00
|
|
|
#include "ruby/st.h"
|
|
|
|
#include "ruby/util.h"
|
2018-01-09 09:24:11 +03:00
|
|
|
#include "internal.h"
|
use id_table for constant tables
valgrind 3.9.0 on x86-64 reports a minor reduction in memory usage
when loading only RubyGems and RDoc by running: ruby -rrdoc -eexit
before: HEAP SUMMARY:
in use at exit: 2,913,448 bytes in 27,394 blocks
total heap usage: 48,362 allocs, 20,968 frees, 9,034,621 bytes alloc
after: HEAP SUMMARY:
in use at exit: 2,880,056 bytes in 26,712 blocks
total heap usage: 47,791 allocs, 21,079 frees, 9,046,507 bytes alloc
* class.c (struct clone_const_arg): adjust for id_table
(clone_const): ditto
(clone_const_i): ditto
(rb_mod_init_copy): ditto
(rb_singleton_class_clone_and_attach): ditto
(rb_include_class_new): ditto
(include_modules_at): ditto
* constant.h (rb_free_const_table): ditto
* gc.c (free_const_entry_i): ditto
(rb_free_const_table): ditto
(obj_memsize_of): ditto
(mark_const_entry_i): ditto
(mark_const_tbl): ditto
* internal.h (struct rb_classext_struct): ditto
* object.c (rb_mod_const_set): resolve class name on assignment
* variable.c (const_update): replace with const_tbl_update
(const_tbl_update): new function
(fc_i): adjust for id_table
(find_class_path): ditto
(autoload_const_set): st_update => const_tbl_update
(rb_const_remove): adjust for id_table
(sv_i): ditto
(rb_local_constants_i): ditto
(rb_local_constants): ditto
(rb_mod_const_at): ditto
(rb_mod_const_set): ditto
(rb_const_lookup): ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53376 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-29 23:19:14 +03:00
|
|
|
#include "id_table.h"
|
2010-10-26 21:27:32 +04:00
|
|
|
#include "constant.h"
|
2013-05-02 11:54:17 +04:00
|
|
|
#include "id.h"
|
2015-10-29 02:59:45 +03:00
|
|
|
#include "ccan/list/list.h"
|
2015-11-03 00:26:26 +03:00
|
|
|
#include "id_table.h"
|
2017-02-21 11:18:15 +03:00
|
|
|
#include "debug_counter.h"
|
2018-04-20 06:22:26 +03:00
|
|
|
#include "vm_core.h"
|
2018-10-31 01:01:17 +03:00
|
|
|
#include "transient_heap.h"
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2018-01-18 12:44:52 +03:00
|
|
|
static struct rb_id_table *rb_global_tbl;
|
2019-04-12 06:46:28 +03:00
|
|
|
static ID autoload, classpath, tmp_classpath;
|
2018-05-10 11:54:26 +03:00
|
|
|
static VALUE autoload_featuremap; /* feature => autoload_i */
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2015-04-13 10:54:59 +03:00
|
|
|
static void check_before_mod_set(VALUE, ID, VALUE, const char *);
|
2015-04-13 10:54:52 +03:00
|
|
|
static void setup_const_entry(rb_const_entry_t *, VALUE, VALUE, rb_const_flag_t);
|
2016-06-19 04:54:42 +03:00
|
|
|
static VALUE rb_const_search(VALUE klass, ID id, int exclude, int recurse, int visibility);
|
variable.c: generic_iv_tbl is unavoidable
Even miniruby creates one generic ivar (plain "ruby" creates 9),
so there's no point in lazily allocating the table.
I dumped generic ivar counts with the following trivial patch:
--- a/variable.c
+++ b/variable.c
@@ -24,6 +24,10 @@ static void check_before_mod_set(VALUE, ID, VALUE, const char *);
static void setup_const_entry(rb_const_entry_t *, VALUE, VALUE, rb_const_flag_t);
static int const_update(st_data_t *, st_data_t *, st_data_t, int);
static st_table *generic_iv_tbl;
+__attribute__((destructor)) static void count_genivar(void)
+{
+ fprintf(stderr, "genivars: %zu\n", (size_t)generic_iv_tbl->num_entries);
+}
void
Init_var_tables(void)
* variable.c (Init_var_tables): init generic_iv_tbl
(rb_generic_ivar_table, generic_ivar_get, generic_ivar_set,
generic_ivar_defined, generic_ivar_remove,
rb_mark_generic_ivar, givar_i, rb_mark_generic_ivar_tbl,
rb_free_generic_ivar, rb_copy_generic_ivar, rb_ivar_foreach,
rb_ivar_count): remove checks for uninitialize generic_iv_tbl
[ruby-core:69155] [Feature #11146]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50569 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-05-21 03:15:00 +03:00
|
|
|
static st_table *generic_iv_tbl;
|
2015-05-30 02:42:49 +03:00
|
|
|
static st_table *generic_iv_tbl_compat;
|
|
|
|
|
|
|
|
/* per-object */
|
|
|
|
struct gen_ivtbl {
|
2016-04-22 12:47:34 +03:00
|
|
|
uint32_t numiv;
|
2018-01-13 15:17:42 +03:00
|
|
|
VALUE ivptr[FLEX_ARY_LEN];
|
2015-05-30 02:42:49 +03:00
|
|
|
};
|
|
|
|
|
|
|
|
struct ivar_update {
|
|
|
|
union {
|
|
|
|
st_table *iv_index_tbl;
|
|
|
|
struct gen_ivtbl *ivtbl;
|
|
|
|
} u;
|
|
|
|
st_data_t index;
|
2015-12-21 15:35:29 +03:00
|
|
|
int iv_extended;
|
2015-05-30 02:42:49 +03:00
|
|
|
};
|
2015-04-13 10:54:52 +03:00
|
|
|
|
1998-01-16 15:13:05 +03: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 14:44:21 +04:00
|
|
|
Init_var_tables(void)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2015-11-03 00:26:26 +03:00
|
|
|
rb_global_tbl = rb_id_table_create(0);
|
variable.c: generic_iv_tbl is unavoidable
Even miniruby creates one generic ivar (plain "ruby" creates 9),
so there's no point in lazily allocating the table.
I dumped generic ivar counts with the following trivial patch:
--- a/variable.c
+++ b/variable.c
@@ -24,6 +24,10 @@ static void check_before_mod_set(VALUE, ID, VALUE, const char *);
static void setup_const_entry(rb_const_entry_t *, VALUE, VALUE, rb_const_flag_t);
static int const_update(st_data_t *, st_data_t *, st_data_t, int);
static st_table *generic_iv_tbl;
+__attribute__((destructor)) static void count_genivar(void)
+{
+ fprintf(stderr, "genivars: %zu\n", (size_t)generic_iv_tbl->num_entries);
+}
void
Init_var_tables(void)
* variable.c (Init_var_tables): init generic_iv_tbl
(rb_generic_ivar_table, generic_ivar_get, generic_ivar_set,
generic_ivar_defined, generic_ivar_remove,
rb_mark_generic_ivar, givar_i, rb_mark_generic_ivar_tbl,
rb_free_generic_ivar, rb_copy_generic_ivar, rb_ivar_foreach,
rb_ivar_count): remove checks for uninitialize generic_iv_tbl
[ruby-core:69155] [Feature #11146]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50569 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-05-21 03:15:00 +03:00
|
|
|
generic_iv_tbl = st_init_numtable();
|
2014-07-03 07:38:10 +04:00
|
|
|
autoload = rb_intern_const("__autoload__");
|
2012-07-31 13:22:36 +04:00
|
|
|
/* __classpath__: fully qualified class path */
|
2014-07-03 07:38:10 +04:00
|
|
|
classpath = rb_intern_const("__classpath__");
|
2012-07-31 13:22:36 +04:00
|
|
|
/* __tmp_classpath__: temporary class path which contains anonymous names */
|
2014-07-03 07:38:10 +04:00
|
|
|
tmp_classpath = rb_intern_const("__tmp_classpath__");
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2019-03-09 03:12:52 +03:00
|
|
|
static inline bool
|
|
|
|
rb_namespace_p(VALUE obj)
|
|
|
|
{
|
|
|
|
if (RB_SPECIAL_CONST_P(obj)) return false;
|
|
|
|
switch (RB_BUILTIN_TYPE(obj)) {
|
|
|
|
case T_MODULE: case T_CLASS: return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2012-07-31 13:22:36 +04:00
|
|
|
/**
|
|
|
|
* Returns +classpath+ of _klass_, if it is named, or +nil+ for
|
2019-04-12 06:46:28 +03:00
|
|
|
* anonymous +class+/+module+. A named +classpath+ may contain
|
|
|
|
* an anonymous component, but the last component is guaranteed
|
|
|
|
* to not be anonymous. <code>*permanent</code> is set to 1
|
|
|
|
* if +classpath+ has no anonymous components. There is no builtin
|
|
|
|
* Ruby level APIs that can change a permanent +classpath+.
|
2012-07-31 13:22:36 +04:00
|
|
|
*/
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
2012-07-31 13:22:36 +04:00
|
|
|
classname(VALUE klass, int *permanent)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2019-04-12 06:46:28 +03:00
|
|
|
st_table *ivtbl;
|
2009-07-30 11:10:51 +04:00
|
|
|
st_data_t n;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2019-04-12 06:46:28 +03:00
|
|
|
*permanent = 0;
|
|
|
|
if (!RCLASS_EXT(klass)) return Qnil;
|
|
|
|
if (!(ivtbl = RCLASS_IV_TBL(klass))) return Qnil;
|
|
|
|
if (st_lookup(ivtbl, (st_data_t)classpath, &n)) {
|
|
|
|
*permanent = 1;
|
|
|
|
return (VALUE)n;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2019-04-12 06:46:28 +03:00
|
|
|
if (st_lookup(ivtbl, (st_data_t)tmp_classpath, &n)) return (VALUE)n;
|
|
|
|
return Qnil;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-28 09:33:07 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* mod.name -> string
|
2009-02-15 05:45:31 +03:00
|
|
|
*
|
2006-06-22 06:49:28 +04:00
|
|
|
* Returns the name of the module <i>mod</i>. Returns nil for anonymous modules.
|
2003-12-28 09:33:07 +03:00
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03: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 14:44:21 +04:00
|
|
|
rb_mod_name(VALUE mod)
|
1998-01-16 15:19:22 +03:00
|
|
|
{
|
2012-07-31 13:22:36 +04:00
|
|
|
int permanent;
|
|
|
|
VALUE path = classname(mod, &permanent);
|
1998-01-16 15:19:22 +03:00
|
|
|
|
2003-04-10 12:37:12 +04:00
|
|
|
if (!NIL_P(path)) return rb_str_dup(path);
|
2006-06-22 06:49:28 +04:00
|
|
|
return path;
|
1998-01-16 15:19:22 +03:00
|
|
|
}
|
|
|
|
|
2015-02-28 09:42:29 +03:00
|
|
|
static VALUE
|
|
|
|
make_temporary_path(VALUE obj, VALUE klass)
|
|
|
|
{
|
|
|
|
VALUE path;
|
|
|
|
switch (klass) {
|
|
|
|
case Qnil:
|
|
|
|
path = rb_sprintf("#<Class:%p>", (void*)obj);
|
|
|
|
break;
|
|
|
|
case Qfalse:
|
|
|
|
path = rb_sprintf("#<Module:%p>", (void*)obj);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
path = rb_sprintf("#<%"PRIsVALUE":%p>", klass, (void*)obj);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
OBJ_FREEZE(path);
|
|
|
|
return path;
|
|
|
|
}
|
|
|
|
|
2019-04-12 06:46:28 +03:00
|
|
|
typedef VALUE (*fallback_func)(VALUE obj, VALUE name);
|
2012-12-01 06:13:06 +04:00
|
|
|
|
2012-07-30 09:24:24 +04:00
|
|
|
static VALUE
|
2019-04-12 06:46:28 +03:00
|
|
|
rb_tmp_class_path(VALUE klass, int *permanent, fallback_func fallback)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2012-07-31 13:22:36 +04:00
|
|
|
VALUE path = classname(klass, permanent);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2012-07-30 09:24:24 +04:00
|
|
|
if (!NIL_P(path)) {
|
|
|
|
return path;
|
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
else {
|
2011-09-29 15:07:45 +04:00
|
|
|
if (RB_TYPE_P(klass, T_MODULE)) {
|
2002-08-28 18:59:01 +04:00
|
|
|
if (rb_obj_class(klass) == rb_cModule) {
|
2015-02-28 09:42:29 +03:00
|
|
|
path = Qfalse;
|
2002-08-28 18:59:01 +04:00
|
|
|
}
|
|
|
|
else {
|
2012-12-01 06:13:06 +04:00
|
|
|
int perm;
|
2019-04-12 06:46:28 +03:00
|
|
|
path = rb_tmp_class_path(RBASIC(klass)->klass, &perm, fallback);
|
2002-08-28 18:59:01 +04:00
|
|
|
}
|
2001-10-03 11:19:19 +04:00
|
|
|
}
|
2012-07-30 09:24:24 +04:00
|
|
|
*permanent = 0;
|
2019-04-12 06:46:28 +03:00
|
|
|
return fallback(klass, path);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-07-30 09:24:24 +04:00
|
|
|
VALUE
|
|
|
|
rb_class_path(VALUE klass)
|
|
|
|
{
|
|
|
|
int permanent;
|
2019-04-12 06:46:28 +03:00
|
|
|
VALUE path = rb_tmp_class_path(klass, &permanent, make_temporary_path);
|
2012-07-31 13:22:36 +04:00
|
|
|
if (!NIL_P(path)) path = rb_str_dup(path);
|
|
|
|
return path;
|
2012-07-30 09:24:24 +04:00
|
|
|
}
|
|
|
|
|
2013-12-09 07:25:38 +04:00
|
|
|
VALUE
|
|
|
|
rb_class_path_cached(VALUE klass)
|
|
|
|
{
|
2019-04-12 06:46:28 +03:00
|
|
|
int permanent;
|
|
|
|
return classname(klass, &permanent);
|
2013-12-09 07:25:38 +04:00
|
|
|
}
|
|
|
|
|
2015-02-28 09:42:29 +03:00
|
|
|
static VALUE
|
2019-04-12 06:46:28 +03:00
|
|
|
no_fallback(VALUE obj, VALUE name)
|
2015-02-28 09:42:29 +03:00
|
|
|
{
|
|
|
|
return name;
|
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_search_class_path(VALUE klass)
|
|
|
|
{
|
|
|
|
int permanent;
|
2019-04-12 06:46:28 +03:00
|
|
|
return rb_tmp_class_path(klass, &permanent, no_fallback);
|
|
|
|
}
|
|
|
|
|
2019-04-12 06:46:28 +03:00
|
|
|
static VALUE
|
|
|
|
build_const_pathname(VALUE head, VALUE tail)
|
|
|
|
{
|
|
|
|
VALUE path = rb_str_dup(head);
|
|
|
|
rb_str_cat2(path, "::");
|
|
|
|
rb_str_append(path, tail);
|
|
|
|
OBJ_FREEZE(path);
|
|
|
|
return path;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
build_const_path(VALUE head, ID tail)
|
|
|
|
{
|
|
|
|
return build_const_pathname(head, rb_id2str(tail));
|
|
|
|
}
|
|
|
|
|
2009-07-30 11:45:42 +04:00
|
|
|
void
|
|
|
|
rb_set_class_path_string(VALUE klass, VALUE under, VALUE name)
|
|
|
|
{
|
|
|
|
VALUE str;
|
2012-07-30 16:00:56 +04:00
|
|
|
ID pathid = classpath;
|
2009-07-30 11:45:42 +04:00
|
|
|
|
|
|
|
if (under == rb_cObject) {
|
|
|
|
str = rb_str_new_frozen(name);
|
|
|
|
}
|
|
|
|
else {
|
2012-07-30 09:24:24 +04:00
|
|
|
int permanent;
|
2019-08-11 00:32:49 +03:00
|
|
|
str = rb_tmp_class_path(under, &permanent, make_temporary_path);
|
2019-04-12 06:46:28 +03:00
|
|
|
str = build_const_pathname(str, name);
|
2012-07-31 13:22:36 +04:00
|
|
|
if (!permanent) {
|
|
|
|
pathid = tmp_classpath;
|
|
|
|
}
|
2009-07-30 11:45:42 +04:00
|
|
|
}
|
2012-07-30 16:00:56 +04:00
|
|
|
rb_ivar_set(klass, pathid, str);
|
2009-07-30 11:45:42 +04:00
|
|
|
}
|
|
|
|
|
1998-01-16 15:13:05 +03: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 14:44:21 +04:00
|
|
|
rb_set_class_path(VALUE klass, VALUE under, const char *name)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2019-08-11 00:32:49 +03:00
|
|
|
VALUE str = rb_str_new2(name);
|
2007-06-07 12:21:01 +04:00
|
|
|
OBJ_FREEZE(str);
|
2019-08-11 00:32:49 +03:00
|
|
|
rb_set_class_path_string(klass, under, str);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
2009-08-10 01:55:55 +04:00
|
|
|
rb_path_to_class(VALUE pathname)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2009-08-10 01:55:55 +04:00
|
|
|
rb_encoding *enc = rb_enc_get(pathname);
|
2016-06-19 05:19:45 +03:00
|
|
|
const char *pbeg, *pend, *p, *path = RSTRING_PTR(pathname);
|
2002-09-05 13:42:56 +04:00
|
|
|
ID id;
|
|
|
|
VALUE c = rb_cObject;
|
1999-11-29 09:33:02 +03:00
|
|
|
|
2009-08-10 01:55:55 +04:00
|
|
|
if (!rb_enc_asciicompat(enc)) {
|
|
|
|
rb_raise(rb_eArgError, "invalid class path encoding (non ASCII)");
|
|
|
|
}
|
|
|
|
pbeg = p = path;
|
2016-06-19 05:19:45 +03:00
|
|
|
pend = path + RSTRING_LEN(pathname);
|
|
|
|
if (path == pend || path[0] == '#') {
|
2012-12-22 19:04:57 +04:00
|
|
|
rb_raise(rb_eArgError, "can't retrieve anonymous class %"PRIsVALUE,
|
|
|
|
QUOTE(pathname));
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2016-06-19 05:19:45 +03:00
|
|
|
while (p < pend) {
|
|
|
|
while (p < pend && *p != ':') p++;
|
2014-07-09 10:14:41 +04:00
|
|
|
id = rb_check_id_cstr(pbeg, p-pbeg, enc);
|
2016-06-19 05:19:45 +03:00
|
|
|
if (p < pend && p[0] == ':') {
|
|
|
|
if ((size_t)(pend - p) < 2 || p[1] != ':') goto undefined_class;
|
2002-09-05 13:42:56 +04:00
|
|
|
p += 2;
|
|
|
|
pbeg = p;
|
|
|
|
}
|
2016-06-19 04:54:42 +03:00
|
|
|
if (!id) {
|
2002-09-05 13:42:56 +04:00
|
|
|
undefined_class:
|
2015-03-22 17:31:53 +03:00
|
|
|
rb_raise(rb_eArgError, "undefined class/module % "PRIsVALUE,
|
|
|
|
rb_str_subseq(pathname, 0, p-path));
|
2002-09-05 13:42:56 +04:00
|
|
|
}
|
2016-06-19 04:54:42 +03:00
|
|
|
c = rb_const_search(c, id, TRUE, FALSE, FALSE);
|
|
|
|
if (c == Qundef) goto undefined_class;
|
2019-03-09 03:12:53 +03:00
|
|
|
if (!rb_namespace_p(c)) {
|
2012-12-22 19:04:57 +04:00
|
|
|
rb_raise(rb_eTypeError, "%"PRIsVALUE" does not refer to class/module",
|
|
|
|
pathname);
|
2002-09-05 13:42:56 +04:00
|
|
|
}
|
1999-11-29 09:33:02 +03:00
|
|
|
}
|
2012-12-04 11:23:20 +04:00
|
|
|
RB_GC_GUARD(pathname);
|
2002-09-05 13:42:56 +04:00
|
|
|
|
1999-11-29 09:33:02 +03:00
|
|
|
return c;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2009-08-10 01:55:55 +04:00
|
|
|
VALUE
|
|
|
|
rb_path2class(const char *path)
|
|
|
|
{
|
2009-09-09 08:09:09 +04:00
|
|
|
return rb_path_to_class(rb_str_new_cstr(path));
|
2009-08-10 01:55:55 +04:00
|
|
|
}
|
|
|
|
|
2004-01-19 12:19:31 +03: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 14:44:21 +04:00
|
|
|
rb_class_name(VALUE klass)
|
2004-01-19 12:19:31 +03:00
|
|
|
{
|
|
|
|
return rb_class_path(rb_class_real(klass));
|
|
|
|
}
|
|
|
|
|
2008-05-31 13:28:20 +04:00
|
|
|
const 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 14:44:21 +04:00
|
|
|
rb_class2name(VALUE klass)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2013-10-19 23:21:05 +04:00
|
|
|
int permanent;
|
2019-04-12 06:46:28 +03:00
|
|
|
VALUE path = rb_tmp_class_path(rb_class_real(klass), &permanent, make_temporary_path);
|
2013-10-19 23:21:05 +04:00
|
|
|
if (NIL_P(path)) return NULL;
|
|
|
|
return RSTRING_PTR(path);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2008-05-31 13:28:20 +04:00
|
|
|
const 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 14:44:21 +04:00
|
|
|
rb_obj_classname(VALUE obj)
|
2003-01-31 07:00:17 +03:00
|
|
|
{
|
2003-01-31 07:16:51 +03:00
|
|
|
return rb_class2name(CLASS_OF(obj));
|
2003-01-31 07:00:17 +03:00
|
|
|
}
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
struct trace_var {
|
1998-01-16 15:19:22 +03:00
|
|
|
int removed;
|
2008-09-26 05:35:57 +04:00
|
|
|
void (*func)(VALUE arg, VALUE val);
|
2001-03-19 06:20:24 +03:00
|
|
|
VALUE data;
|
1998-01-16 15:13:05 +03:00
|
|
|
struct trace_var *next;
|
|
|
|
};
|
|
|
|
|
2015-11-30 02:53:43 +03:00
|
|
|
struct rb_global_variable {
|
|
|
|
int counter;
|
2014-03-09 01:44:24 +04:00
|
|
|
int block_trace;
|
2019-08-27 05:16:52 +03:00
|
|
|
VALUE *data;
|
2015-11-30 02:53:43 +03:00
|
|
|
rb_gvar_getter_t *getter;
|
|
|
|
rb_gvar_setter_t *setter;
|
|
|
|
rb_gvar_marker_t *marker;
|
1998-01-16 15:13:05 +03:00
|
|
|
struct trace_var *trace;
|
|
|
|
};
|
|
|
|
|
2018-11-25 07:05:09 +03:00
|
|
|
static struct rb_global_entry*
|
|
|
|
rb_find_global_entry(ID id)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2015-11-30 02:53:43 +03:00
|
|
|
struct rb_global_entry *entry;
|
2015-11-03 00:26:26 +03:00
|
|
|
VALUE data;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2015-11-03 00:26:26 +03:00
|
|
|
if (!rb_id_table_lookup(rb_global_tbl, id, &data)) {
|
2018-11-25 07:05:09 +03:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
entry = (struct rb_global_entry *)data;
|
|
|
|
ASSUME(entry != NULL);
|
|
|
|
return entry;
|
|
|
|
}
|
|
|
|
|
|
|
|
MJIT_FUNC_EXPORTED struct rb_global_entry*
|
|
|
|
rb_global_entry(ID id)
|
|
|
|
{
|
|
|
|
struct rb_global_entry *entry = rb_find_global_entry(id);
|
|
|
|
if (!entry) {
|
2015-11-30 02:53:43 +03:00
|
|
|
struct rb_global_variable *var;
|
|
|
|
entry = ALLOC(struct rb_global_entry);
|
|
|
|
var = ALLOC(struct rb_global_variable);
|
1998-01-16 15:13:05 +03:00
|
|
|
entry->id = id;
|
2001-10-22 20:20:14 +04:00
|
|
|
entry->var = var;
|
|
|
|
var->counter = 1;
|
|
|
|
var->data = 0;
|
2015-11-30 02:53:43 +03:00
|
|
|
var->getter = rb_gvar_undef_getter;
|
|
|
|
var->setter = rb_gvar_undef_setter;
|
|
|
|
var->marker = rb_gvar_undef_marker;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2001-10-22 20:20:14 +04:00
|
|
|
var->block_trace = 0;
|
|
|
|
var->trace = 0;
|
2015-11-03 00:26:26 +03:00
|
|
|
rb_id_table_insert(rb_global_tbl, id, (VALUE)entry);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
return entry;
|
|
|
|
}
|
|
|
|
|
2008-10-14 15:45:32 +04:00
|
|
|
VALUE
|
2019-08-27 05:16:52 +03:00
|
|
|
rb_gvar_undef_getter(ID id, VALUE *_)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2012-12-22 19:04:57 +04:00
|
|
|
rb_warning("global variable `%"PRIsVALUE"' not initialized", QUOTE_ID(id));
|
2002-04-11 14:03:01 +04:00
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
2008-10-14 15:45:32 +04:00
|
|
|
void
|
2019-08-27 05:16:52 +03:00
|
|
|
rb_gvar_undef_setter(VALUE val, ID id, VALUE *_)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2019-08-27 05:16:52 +03:00
|
|
|
struct rb_global_variable *var = rb_global_entry(id)->var;
|
2015-11-30 02:53:43 +03:00
|
|
|
var->getter = rb_gvar_val_getter;
|
|
|
|
var->setter = rb_gvar_val_setter;
|
|
|
|
var->marker = rb_gvar_val_marker;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2001-10-22 20:20:14 +04:00
|
|
|
var->data = (void*)val;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2008-10-14 15:45:32 +04:00
|
|
|
void
|
2015-11-30 02:53:43 +03:00
|
|
|
rb_gvar_undef_marker(VALUE *var)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2008-10-14 15:45:32 +04:00
|
|
|
VALUE
|
2019-08-27 05:16:52 +03:00
|
|
|
rb_gvar_val_getter(ID id, VALUE *data)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2008-09-26 05:35:57 +04:00
|
|
|
return (VALUE)data;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2008-10-14 15:45:32 +04:00
|
|
|
void
|
2019-08-27 05:16:52 +03:00
|
|
|
rb_gvar_val_setter(VALUE val, ID id, VALUE *_)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2019-08-27 05:16:52 +03:00
|
|
|
struct rb_global_variable *var = rb_global_entry(id)->var;
|
2001-10-22 20:20:14 +04:00
|
|
|
var->data = (void*)val;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2008-10-14 15:45:32 +04:00
|
|
|
void
|
2015-11-30 02:53:43 +03:00
|
|
|
rb_gvar_val_marker(VALUE *var)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2008-09-26 05:35:57 +04:00
|
|
|
VALUE data = (VALUE)var;
|
1999-01-20 07:59:39 +03:00
|
|
|
if (data) rb_gc_mark_maybe(data);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2008-10-14 15:45:32 +04:00
|
|
|
VALUE
|
2019-08-27 05:16:52 +03:00
|
|
|
rb_gvar_var_getter(ID id, VALUE *var)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2001-11-13 11:19:52 +03:00
|
|
|
if (!var) return Qnil;
|
1998-01-16 15:13:05 +03:00
|
|
|
return *var;
|
|
|
|
}
|
|
|
|
|
2008-10-14 15:45:32 +04:00
|
|
|
void
|
2019-08-27 05:16:52 +03:00
|
|
|
rb_gvar_var_setter(VALUE val, ID id, VALUE *data)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2019-08-27 05:16:52 +03:00
|
|
|
*data = val;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2008-10-14 15:45:32 +04:00
|
|
|
void
|
2015-11-30 02:53:43 +03:00
|
|
|
rb_gvar_var_marker(VALUE *var)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1999-01-20 07:59:39 +03:00
|
|
|
if (var) rb_gc_mark_maybe(*var);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2008-10-14 15:45:32 +04:00
|
|
|
void
|
2019-08-27 05:16:52 +03:00
|
|
|
rb_gvar_readonly_setter(VALUE v, ID id, VALUE *_)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2012-12-22 19:04:57 +04:00
|
|
|
rb_name_error(id, "%"PRIsVALUE" is a read-only variable", QUOTE_ID(id));
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2015-11-03 00:26:26 +03:00
|
|
|
static enum rb_id_table_iterator_result
|
|
|
|
mark_global_entry(VALUE v, void *ignored)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2015-11-30 02:53:43 +03:00
|
|
|
struct rb_global_entry *entry = (struct rb_global_entry *)v;
|
1998-01-16 15:13:05 +03:00
|
|
|
struct trace_var *trace;
|
2015-11-30 02:53:43 +03:00
|
|
|
struct rb_global_variable *var = entry->var;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2001-10-22 20:20:14 +04:00
|
|
|
(*var->marker)(var->data);
|
|
|
|
trace = var->trace;
|
1998-01-16 15:13:05 +03:00
|
|
|
while (trace) {
|
1999-01-20 07:59:39 +03:00
|
|
|
if (trace->data) rb_gc_mark_maybe(trace->data);
|
1998-01-16 15:13:05 +03:00
|
|
|
trace = trace->next;
|
|
|
|
}
|
2015-11-03 00:26:26 +03:00
|
|
|
return ID_TABLE_CONTINUE;
|
1998-01-16 15:13:05 +03: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 14:44:21 +04:00
|
|
|
rb_gc_mark_global_tbl(void)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2007-06-14 12:35:20 +04:00
|
|
|
if (rb_global_tbl)
|
2015-11-03 00:26:26 +03:00
|
|
|
rb_id_table_foreach_values(rb_global_tbl, mark_global_entry, 0);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static ID
|
* 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 14:44:21 +04:00
|
|
|
global_id(const char *name)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
ID id;
|
|
|
|
|
|
|
|
if (name[0] == '$') id = rb_intern(name);
|
|
|
|
else {
|
* dir.c, dln.c, parse.y, re.c, ruby.c, sprintf.c, strftime.c,
string.c, util.c, variable.c: use strlcpy, memcpy and snprintf
instead of strcpy, strncpy and sprintf.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22984 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-03-17 04:29:17 +03:00
|
|
|
size_t len = strlen(name);
|
2018-11-25 06:36:10 +03:00
|
|
|
VALUE vbuf = 0;
|
|
|
|
char *buf = ALLOCV_N(char, vbuf, len+1);
|
1998-01-16 15:13:05 +03:00
|
|
|
buf[0] = '$';
|
* dir.c, dln.c, parse.y, re.c, ruby.c, sprintf.c, strftime.c,
string.c, util.c, variable.c: use strlcpy, memcpy and snprintf
instead of strcpy, strncpy and sprintf.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22984 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-03-17 04:29:17 +03:00
|
|
|
memcpy(buf+1, name, len);
|
|
|
|
id = rb_intern2(buf, len+1);
|
2018-11-25 06:36:10 +03:00
|
|
|
ALLOCV_END(vbuf);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
return id;
|
|
|
|
}
|
|
|
|
|
2018-11-25 07:05:09 +03:00
|
|
|
static ID
|
|
|
|
find_global_id(const char *name)
|
|
|
|
{
|
|
|
|
ID id;
|
|
|
|
size_t len = strlen(name);
|
|
|
|
|
|
|
|
if (name[0] == '$') {
|
|
|
|
id = rb_check_id_cstr(name, len, NULL);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
VALUE vbuf = 0;
|
|
|
|
char *buf = ALLOCV_N(char, vbuf, len+1);
|
|
|
|
buf[0] = '$';
|
|
|
|
memcpy(buf+1, name, len);
|
|
|
|
id = rb_check_id_cstr(buf, len+1, NULL);
|
|
|
|
ALLOCV_END(vbuf);
|
|
|
|
}
|
|
|
|
|
|
|
|
return id;
|
|
|
|
}
|
|
|
|
|
1998-01-16 15:13:05 +03: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 14:44:21 +04:00
|
|
|
rb_define_hooked_variable(
|
|
|
|
const char *name,
|
|
|
|
VALUE *var,
|
2019-08-27 05:16:52 +03:00
|
|
|
rb_gvar_getter_t *getter,
|
|
|
|
rb_gvar_setter_t *setter)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2009-02-15 05:45:31 +03:00
|
|
|
volatile VALUE tmp = var ? *var : Qnil;
|
|
|
|
ID id = global_id(name);
|
2015-11-30 02:53:43 +03:00
|
|
|
struct rb_global_variable *gvar = rb_global_entry(id)->var;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2001-10-22 20:20:14 +04:00
|
|
|
gvar->data = (void*)var;
|
2015-11-30 02:53:43 +03:00
|
|
|
gvar->getter = getter ? (rb_gvar_getter_t *)getter : rb_gvar_var_getter;
|
|
|
|
gvar->setter = setter ? (rb_gvar_setter_t *)setter : rb_gvar_var_setter;
|
|
|
|
gvar->marker = rb_gvar_var_marker;
|
2008-05-02 18:57:23 +04:00
|
|
|
|
|
|
|
RB_GC_GUARD(tmp);
|
1998-01-16 15:13:05 +03: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 14:44:21 +04:00
|
|
|
rb_define_variable(const char *name, VALUE *var)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
rb_define_hooked_variable(name, var, 0, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2014-06-18 10:16:39 +04:00
|
|
|
rb_define_readonly_variable(const char *name, const VALUE *var)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2015-11-30 02:53:43 +03:00
|
|
|
rb_define_hooked_variable(name, (VALUE *)var, 0, rb_gvar_readonly_setter);
|
1998-01-16 15:13:05 +03: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 14:44:21 +04:00
|
|
|
rb_define_virtual_variable(
|
|
|
|
const char *name,
|
2019-08-27 05:16:52 +03:00
|
|
|
rb_gvar_getter_t *getter,
|
|
|
|
rb_gvar_setter_t *setter)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2015-11-30 02:53:43 +03:00
|
|
|
if (!getter) getter = rb_gvar_val_getter;
|
|
|
|
if (!setter) setter = rb_gvar_readonly_setter;
|
1998-01-16 15:13:05 +03:00
|
|
|
rb_define_hooked_variable(name, 0, getter, setter);
|
|
|
|
}
|
|
|
|
|
|
|
|
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 14:44:21 +04:00
|
|
|
rb_trace_eval(VALUE cmd, VALUE val)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2001-11-13 11:19:52 +03:00
|
|
|
rb_eval_cmd(cmd, rb_ary_new3(1, val), 0);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
2014-06-18 10:16:39 +04:00
|
|
|
rb_f_trace_var(int argc, const VALUE *argv)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
VALUE var, cmd;
|
2015-11-30 02:53:43 +03:00
|
|
|
struct rb_global_entry *entry;
|
1998-01-16 15:13:05 +03:00
|
|
|
struct trace_var *trace;
|
|
|
|
|
|
|
|
if (rb_scan_args(argc, argv, "11", &var, &cmd) == 1) {
|
2003-06-16 11:14:50 +04:00
|
|
|
cmd = rb_block_proc();
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
if (NIL_P(cmd)) {
|
1999-01-20 07:59:39 +03:00
|
|
|
return rb_f_untrace_var(argc, argv);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2001-11-13 11:19:52 +03:00
|
|
|
entry = rb_global_entry(rb_to_id(var));
|
|
|
|
if (OBJ_TAINTED(cmd)) {
|
|
|
|
rb_raise(rb_eSecurityError, "Insecure: tainted variable trace");
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
trace = ALLOC(struct trace_var);
|
2001-10-22 20:20:14 +04:00
|
|
|
trace->next = entry->var->trace;
|
1998-01-16 15:13:05 +03:00
|
|
|
trace->func = rb_trace_eval;
|
2001-03-19 06:20:24 +03:00
|
|
|
trace->data = cmd;
|
1998-01-16 15:19:22 +03:00
|
|
|
trace->removed = 0;
|
2001-10-22 20:20:14 +04:00
|
|
|
entry->var->trace = trace;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
1998-01-16 15:19:22 +03:00
|
|
|
static void
|
2015-11-30 02:53:43 +03:00
|
|
|
remove_trace(struct rb_global_variable *var)
|
1998-01-16 15:19:22 +03:00
|
|
|
{
|
2001-10-22 20:20:14 +04:00
|
|
|
struct trace_var *trace = var->trace;
|
1998-01-16 15:19:22 +03:00
|
|
|
struct trace_var t;
|
|
|
|
struct trace_var *next;
|
|
|
|
|
|
|
|
t.next = trace;
|
|
|
|
trace = &t;
|
|
|
|
while (trace->next) {
|
|
|
|
next = trace->next;
|
|
|
|
if (next->removed) {
|
|
|
|
trace->next = next->next;
|
* array.c, bignum.c, cont.c, dir.c, dln.c, encoding.c, enumerator.c,
enumerator.c (enumerator_allocate), eval_jump.c, file.c, hash.c,
io.c, load.c, pack.c, proc.c, random.c, re.c, ruby.c, st.c,
string.c, thread.c, thread_pthread.c, time.c, util.c, variable.c,
vm.c, gc.c:
allocated memory objects by xmalloc (ruby_xmalloc) should be
freed by xfree (ruby_xfree).
* ext/curses/curses.c, ext/dbm/dbm.c, ext/digest/digest.c,
ext/gdbm/gdbm.c, ext/json/ext/parser/parser.c,
ext/json/ext/parser/unicode.c, ext/openssl/ossl_cipher.c,
ext/openssl/ossl_hmac.c, ext/openssl/ossl_pkey_ec.c,
ext/sdbm/init.c, ext/strscan/strscan.c, ext/zlib/zlib.c:
ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17017 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-08 14:01:40 +04:00
|
|
|
xfree(next);
|
1998-01-16 15:19:22 +03:00
|
|
|
}
|
2001-10-21 17:22:54 +04:00
|
|
|
else {
|
|
|
|
trace = next;
|
|
|
|
}
|
1998-01-16 15:19:22 +03:00
|
|
|
}
|
2001-10-22 20:20:14 +04:00
|
|
|
var->trace = t.next;
|
1998-01-16 15:19:22 +03:00
|
|
|
}
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
VALUE
|
2014-06-18 10:16:39 +04:00
|
|
|
rb_f_untrace_var(int argc, const VALUE *argv)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
VALUE var, cmd;
|
|
|
|
ID id;
|
2015-11-30 02:53:43 +03:00
|
|
|
struct rb_global_entry *entry;
|
1998-01-16 15:13:05 +03:00
|
|
|
struct trace_var *trace;
|
2015-11-03 00:26:26 +03:00
|
|
|
VALUE data;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
rb_scan_args(argc, argv, "11", &var, &cmd);
|
2011-07-26 20:05:35 +04:00
|
|
|
id = rb_check_id(&var);
|
|
|
|
if (!id) {
|
2012-12-22 19:04:57 +04:00
|
|
|
rb_name_error_str(var, "undefined global variable %"PRIsVALUE"", QUOTE(var));
|
2011-07-26 20:05:35 +04:00
|
|
|
}
|
2015-11-03 00:26:26 +03:00
|
|
|
if (!rb_id_table_lookup(rb_global_tbl, id, &data)) {
|
2012-12-22 19:04:57 +04:00
|
|
|
rb_name_error(id, "undefined global variable %"PRIsVALUE"", QUOTE_ID(id));
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
1999-01-20 07:59:39 +03:00
|
|
|
|
2015-11-30 02:53:43 +03:00
|
|
|
trace = (entry = (struct rb_global_entry *)data)->var->trace;
|
1998-01-16 15:13:05 +03:00
|
|
|
if (NIL_P(cmd)) {
|
1999-01-20 07:59:39 +03:00
|
|
|
VALUE ary = rb_ary_new();
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
while (trace) {
|
|
|
|
struct trace_var *next = trace->next;
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_ary_push(ary, (VALUE)trace->data);
|
1998-01-16 15:19:22 +03:00
|
|
|
trace->removed = 1;
|
1998-01-16 15:13:05 +03:00
|
|
|
trace = next;
|
|
|
|
}
|
|
|
|
|
2001-10-22 20:20:14 +04:00
|
|
|
if (!entry->var->block_trace) remove_trace(entry->var);
|
1998-01-16 15:13:05 +03:00
|
|
|
return ary;
|
|
|
|
}
|
|
|
|
else {
|
1998-01-16 15:19:22 +03:00
|
|
|
while (trace) {
|
2001-03-19 06:20:24 +03:00
|
|
|
if (trace->data == cmd) {
|
1998-01-16 15:19:22 +03:00
|
|
|
trace->removed = 1;
|
2001-10-22 20:20:14 +04:00
|
|
|
if (!entry->var->block_trace) remove_trace(entry->var);
|
1999-01-20 07:59:39 +03:00
|
|
|
return rb_ary_new3(1, cmd);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
1998-01-16 15:19:22 +03:00
|
|
|
trace = trace->next;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return Qnil;
|
|
|
|
}
|
2001-10-17 09:28:02 +04:00
|
|
|
|
mjit_compile.c: merge initial JIT compiler
which has been developed by Takashi Kokubun <takashikkbn@gmail> as
YARV-MJIT. Many of its bugs are fixed by wanabe <s.wanabe@gmail.com>.
This JIT compiler is designed to be a safe migration path to introduce
JIT compiler to MRI. So this commit does not include any bytecode
changes or dynamic instruction modifications, which are done in original
MJIT.
This commit even strips off some aggressive optimizations from
YARV-MJIT, and thus it's slower than YARV-MJIT too. But it's still
fairly faster than Ruby 2.5 in some benchmarks (attached below).
Note that this JIT compiler passes `make test`, `make test-all`, `make
test-spec` without JIT, and even with JIT. Not only it's perfectly safe
with JIT disabled because it does not replace VM instructions unlike
MJIT, but also with JIT enabled it stably runs Ruby applications
including Rails applications.
I'm expecting this version as just "initial" JIT compiler. I have many
optimization ideas which are skipped for initial merging, and you may
easily replace this JIT compiler with a faster one by just replacing
mjit_compile.c. `mjit_compile` interface is designed for the purpose.
common.mk: update dependencies for mjit_compile.c.
internal.h: declare `rb_vm_insn_addr2insn` for MJIT.
vm.c: exclude some definitions if `-DMJIT_HEADER` is provided to
compiler. This avoids to include some functions which take a long time
to compile, e.g. vm_exec_core. Some of the purpose is achieved in
transform_mjit_header.rb (see `IGNORED_FUNCTIONS`) but others are
manually resolved for now. Load mjit_helper.h for MJIT header.
mjit_helper.h: New. This is a file used only by JIT-ed code. I'll
refactor `mjit_call_cfunc` later.
vm_eval.c: add some #ifdef switches to skip compiling some functions
like Init_vm_eval.
win32/mkexports.rb: export thread/ec functions, which are used by MJIT.
include/ruby/defines.h: add MJIT_FUNC_EXPORTED macro alis to clarify
that a function is exported only for MJIT.
array.c: export a function used by MJIT.
bignum.c: ditto.
class.c: ditto.
compile.c: ditto.
error.c: ditto.
gc.c: ditto.
hash.c: ditto.
iseq.c: ditto.
numeric.c: ditto.
object.c: ditto.
proc.c: ditto.
re.c: ditto.
st.c: ditto.
string.c: ditto.
thread.c: ditto.
variable.c: ditto.
vm_backtrace.c: ditto.
vm_insnhelper.c: ditto.
vm_method.c: ditto.
I would like to improve maintainability of function exports, but I
believe this way is acceptable as initial merging if we clarify the
new exports are for MJIT (so that we can use them as TODO list to fix)
and add unit tests to detect unresolved symbols.
I'll add unit tests of JIT compilations in succeeding commits.
Author: Takashi Kokubun <takashikkbn@gmail.com>
Contributor: wanabe <s.wanabe@gmail.com>
Part of [Feature #14235]
---
* Known issues
* Code generated by gcc is faster than clang. The benchmark may be worse
in macOS. Following benchmark result is provided by gcc w/ Linux.
* Performance is decreased when Google Chrome is running
* JIT can work on MinGW, but it doesn't improve performance at least
in short running benchmark.
* Currently it doesn't perform well with Rails. We'll try to fix this
before release.
---
* Benchmark reslts
Benchmarked with:
Intel 4.0GHz i7-4790K with 16GB memory under x86-64 Ubuntu 8 Cores
- 2.0.0-p0: Ruby 2.0.0-p0
- r62186: Ruby trunk (early 2.6.0), before MJIT changes
- JIT off: On this commit, but without `--jit` option
- JIT on: On this commit, and with `--jit` option
** Optcarrot fps
Benchmark: https://github.com/mame/optcarrot
| |2.0.0-p0 |r62186 |JIT off |JIT on |
|:--------|:--------|:--------|:--------|:--------|
|fps |37.32 |51.46 |51.31 |58.88 |
|vs 2.0.0 |1.00x |1.38x |1.37x |1.58x |
** MJIT benchmarks
Benchmark: https://github.com/benchmark-driver/mjit-benchmarks
(Original: https://github.com/vnmakarov/ruby/tree/rtl_mjit_branch/MJIT-benchmarks)
| |2.0.0-p0 |r62186 |JIT off |JIT on |
|:----------|:--------|:--------|:--------|:--------|
|aread |1.00 |1.09 |1.07 |2.19 |
|aref |1.00 |1.13 |1.11 |2.22 |
|aset |1.00 |1.50 |1.45 |2.64 |
|awrite |1.00 |1.17 |1.13 |2.20 |
|call |1.00 |1.29 |1.26 |2.02 |
|const2 |1.00 |1.10 |1.10 |2.19 |
|const |1.00 |1.11 |1.10 |2.19 |
|fannk |1.00 |1.04 |1.02 |1.00 |
|fib |1.00 |1.32 |1.31 |1.84 |
|ivread |1.00 |1.13 |1.12 |2.43 |
|ivwrite |1.00 |1.23 |1.21 |2.40 |
|mandelbrot |1.00 |1.13 |1.16 |1.28 |
|meteor |1.00 |2.97 |2.92 |3.17 |
|nbody |1.00 |1.17 |1.15 |1.49 |
|nest-ntimes|1.00 |1.22 |1.20 |1.39 |
|nest-while |1.00 |1.10 |1.10 |1.37 |
|norm |1.00 |1.18 |1.16 |1.24 |
|nsvb |1.00 |1.16 |1.16 |1.17 |
|red-black |1.00 |1.02 |0.99 |1.12 |
|sieve |1.00 |1.30 |1.28 |1.62 |
|trees |1.00 |1.14 |1.13 |1.19 |
|while |1.00 |1.12 |1.11 |2.41 |
** Discourse's script/bench.rb
Benchmark: https://github.com/discourse/discourse/blob/v1.8.7/script/bench.rb
NOTE: Rails performance was somehow a little degraded with JIT for now.
We should fix this.
(At least I know opt_aref is performing badly in JIT and I have an idea
to fix it. Please wait for the fix.)
*** JIT off
Your Results: (note for timings- percentile is first, duration is second in millisecs)
categories_admin:
50: 17
75: 18
90: 22
99: 29
home_admin:
50: 21
75: 21
90: 27
99: 40
topic_admin:
50: 17
75: 18
90: 22
99: 32
categories:
50: 35
75: 41
90: 43
99: 77
home:
50: 39
75: 46
90: 49
99: 95
topic:
50: 46
75: 52
90: 56
99: 101
*** JIT on
Your Results: (note for timings- percentile is first, duration is second in millisecs)
categories_admin:
50: 19
75: 21
90: 25
99: 33
home_admin:
50: 24
75: 26
90: 30
99: 35
topic_admin:
50: 19
75: 20
90: 25
99: 30
categories:
50: 40
75: 44
90: 48
99: 76
home:
50: 42
75: 48
90: 51
99: 89
topic:
50: 49
75: 55
90: 58
99: 99
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62197 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2018-02-04 14:22:28 +03:00
|
|
|
MJIT_FUNC_EXPORTED VALUE
|
2015-11-30 02:53:43 +03:00
|
|
|
rb_gvar_get(struct rb_global_entry *entry)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2015-11-30 02:53:43 +03:00
|
|
|
struct rb_global_variable *var = entry->var;
|
2019-08-27 05:16:52 +03:00
|
|
|
return (*var->getter)(entry->id, var->data);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
struct trace_data {
|
|
|
|
struct trace_var *trace;
|
|
|
|
VALUE val;
|
|
|
|
};
|
* eval.c (ev_const_defined, ev_const_get), variable.c
(rb_const_get_at, rb_const_get, rb_mod_remove_const): use Qundef
as autoload marker. [ruby-dev:18103], [ruby-dev:18184]
* eval.c (rb_mod_autoload, rb_mod_autoload_p): new method;
Module#autoload, Module#autoload?.
* variable.c (rb_autoload, rb_autoload_load, rb_autoload_p):
manage autoload constants per classes/modules.
* variable.c (rb_const_defined_at, rb_const_defined): return false
for autoloading constants.
* class.c (rb_define_class, rb_define_module), eval.c (rb_eval),
variable.c (rb_mod_const_at, rb_const_assign): removed autoload
stuff.
* intern.h: prototypes; rb_autoload, rb_autoload_load,
rb_autoload_p.
* lib/optparse.rb (OptionParser::Switch::PlacedArgument::parse):
do not treat unmatched argument as an option.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-05-29 04:11:11 +04:00
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
static VALUE
|
2019-08-26 09:20:15 +03:00
|
|
|
trace_ev(VALUE v)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2019-08-26 09:20:15 +03:00
|
|
|
struct trace_data *data = (void *)v;
|
1998-01-16 15:13:05 +03:00
|
|
|
struct trace_var *trace = data->trace;
|
|
|
|
|
|
|
|
while (trace) {
|
|
|
|
(*trace->func)(trace->data, data->val);
|
|
|
|
trace = trace->next;
|
|
|
|
}
|
2012-04-14 04:36:26 +04:00
|
|
|
|
|
|
|
return Qnil;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
static VALUE
|
2019-08-26 09:20:15 +03:00
|
|
|
trace_en(VALUE v)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2019-08-26 09:20:15 +03:00
|
|
|
struct rb_global_variable *var = (void *)v;
|
2001-10-22 20:20:14 +04:00
|
|
|
var->block_trace = 0;
|
|
|
|
remove_trace(var);
|
1999-01-20 07:59:39 +03:00
|
|
|
return Qnil; /* not reached */
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
mjit_compile.c: merge initial JIT compiler
which has been developed by Takashi Kokubun <takashikkbn@gmail> as
YARV-MJIT. Many of its bugs are fixed by wanabe <s.wanabe@gmail.com>.
This JIT compiler is designed to be a safe migration path to introduce
JIT compiler to MRI. So this commit does not include any bytecode
changes or dynamic instruction modifications, which are done in original
MJIT.
This commit even strips off some aggressive optimizations from
YARV-MJIT, and thus it's slower than YARV-MJIT too. But it's still
fairly faster than Ruby 2.5 in some benchmarks (attached below).
Note that this JIT compiler passes `make test`, `make test-all`, `make
test-spec` without JIT, and even with JIT. Not only it's perfectly safe
with JIT disabled because it does not replace VM instructions unlike
MJIT, but also with JIT enabled it stably runs Ruby applications
including Rails applications.
I'm expecting this version as just "initial" JIT compiler. I have many
optimization ideas which are skipped for initial merging, and you may
easily replace this JIT compiler with a faster one by just replacing
mjit_compile.c. `mjit_compile` interface is designed for the purpose.
common.mk: update dependencies for mjit_compile.c.
internal.h: declare `rb_vm_insn_addr2insn` for MJIT.
vm.c: exclude some definitions if `-DMJIT_HEADER` is provided to
compiler. This avoids to include some functions which take a long time
to compile, e.g. vm_exec_core. Some of the purpose is achieved in
transform_mjit_header.rb (see `IGNORED_FUNCTIONS`) but others are
manually resolved for now. Load mjit_helper.h for MJIT header.
mjit_helper.h: New. This is a file used only by JIT-ed code. I'll
refactor `mjit_call_cfunc` later.
vm_eval.c: add some #ifdef switches to skip compiling some functions
like Init_vm_eval.
win32/mkexports.rb: export thread/ec functions, which are used by MJIT.
include/ruby/defines.h: add MJIT_FUNC_EXPORTED macro alis to clarify
that a function is exported only for MJIT.
array.c: export a function used by MJIT.
bignum.c: ditto.
class.c: ditto.
compile.c: ditto.
error.c: ditto.
gc.c: ditto.
hash.c: ditto.
iseq.c: ditto.
numeric.c: ditto.
object.c: ditto.
proc.c: ditto.
re.c: ditto.
st.c: ditto.
string.c: ditto.
thread.c: ditto.
variable.c: ditto.
vm_backtrace.c: ditto.
vm_insnhelper.c: ditto.
vm_method.c: ditto.
I would like to improve maintainability of function exports, but I
believe this way is acceptable as initial merging if we clarify the
new exports are for MJIT (so that we can use them as TODO list to fix)
and add unit tests to detect unresolved symbols.
I'll add unit tests of JIT compilations in succeeding commits.
Author: Takashi Kokubun <takashikkbn@gmail.com>
Contributor: wanabe <s.wanabe@gmail.com>
Part of [Feature #14235]
---
* Known issues
* Code generated by gcc is faster than clang. The benchmark may be worse
in macOS. Following benchmark result is provided by gcc w/ Linux.
* Performance is decreased when Google Chrome is running
* JIT can work on MinGW, but it doesn't improve performance at least
in short running benchmark.
* Currently it doesn't perform well with Rails. We'll try to fix this
before release.
---
* Benchmark reslts
Benchmarked with:
Intel 4.0GHz i7-4790K with 16GB memory under x86-64 Ubuntu 8 Cores
- 2.0.0-p0: Ruby 2.0.0-p0
- r62186: Ruby trunk (early 2.6.0), before MJIT changes
- JIT off: On this commit, but without `--jit` option
- JIT on: On this commit, and with `--jit` option
** Optcarrot fps
Benchmark: https://github.com/mame/optcarrot
| |2.0.0-p0 |r62186 |JIT off |JIT on |
|:--------|:--------|:--------|:--------|:--------|
|fps |37.32 |51.46 |51.31 |58.88 |
|vs 2.0.0 |1.00x |1.38x |1.37x |1.58x |
** MJIT benchmarks
Benchmark: https://github.com/benchmark-driver/mjit-benchmarks
(Original: https://github.com/vnmakarov/ruby/tree/rtl_mjit_branch/MJIT-benchmarks)
| |2.0.0-p0 |r62186 |JIT off |JIT on |
|:----------|:--------|:--------|:--------|:--------|
|aread |1.00 |1.09 |1.07 |2.19 |
|aref |1.00 |1.13 |1.11 |2.22 |
|aset |1.00 |1.50 |1.45 |2.64 |
|awrite |1.00 |1.17 |1.13 |2.20 |
|call |1.00 |1.29 |1.26 |2.02 |
|const2 |1.00 |1.10 |1.10 |2.19 |
|const |1.00 |1.11 |1.10 |2.19 |
|fannk |1.00 |1.04 |1.02 |1.00 |
|fib |1.00 |1.32 |1.31 |1.84 |
|ivread |1.00 |1.13 |1.12 |2.43 |
|ivwrite |1.00 |1.23 |1.21 |2.40 |
|mandelbrot |1.00 |1.13 |1.16 |1.28 |
|meteor |1.00 |2.97 |2.92 |3.17 |
|nbody |1.00 |1.17 |1.15 |1.49 |
|nest-ntimes|1.00 |1.22 |1.20 |1.39 |
|nest-while |1.00 |1.10 |1.10 |1.37 |
|norm |1.00 |1.18 |1.16 |1.24 |
|nsvb |1.00 |1.16 |1.16 |1.17 |
|red-black |1.00 |1.02 |0.99 |1.12 |
|sieve |1.00 |1.30 |1.28 |1.62 |
|trees |1.00 |1.14 |1.13 |1.19 |
|while |1.00 |1.12 |1.11 |2.41 |
** Discourse's script/bench.rb
Benchmark: https://github.com/discourse/discourse/blob/v1.8.7/script/bench.rb
NOTE: Rails performance was somehow a little degraded with JIT for now.
We should fix this.
(At least I know opt_aref is performing badly in JIT and I have an idea
to fix it. Please wait for the fix.)
*** JIT off
Your Results: (note for timings- percentile is first, duration is second in millisecs)
categories_admin:
50: 17
75: 18
90: 22
99: 29
home_admin:
50: 21
75: 21
90: 27
99: 40
topic_admin:
50: 17
75: 18
90: 22
99: 32
categories:
50: 35
75: 41
90: 43
99: 77
home:
50: 39
75: 46
90: 49
99: 95
topic:
50: 46
75: 52
90: 56
99: 101
*** JIT on
Your Results: (note for timings- percentile is first, duration is second in millisecs)
categories_admin:
50: 19
75: 21
90: 25
99: 33
home_admin:
50: 24
75: 26
90: 30
99: 35
topic_admin:
50: 19
75: 20
90: 25
99: 30
categories:
50: 40
75: 44
90: 48
99: 76
home:
50: 42
75: 48
90: 51
99: 89
topic:
50: 49
75: 55
90: 58
99: 99
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62197 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2018-02-04 14:22:28 +03:00
|
|
|
MJIT_FUNC_EXPORTED VALUE
|
2015-11-30 02:53:43 +03:00
|
|
|
rb_gvar_set(struct rb_global_entry *entry, VALUE val)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
struct trace_data trace;
|
2015-11-30 02:53:43 +03:00
|
|
|
struct rb_global_variable *var = entry->var;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2019-08-27 05:16:52 +03:00
|
|
|
(*var->setter)(val, entry->id, var->data);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2001-10-22 20:20:14 +04:00
|
|
|
if (var->trace && !var->block_trace) {
|
|
|
|
var->block_trace = 1;
|
|
|
|
trace.trace = var->trace;
|
1998-01-16 15:13:05 +03:00
|
|
|
trace.val = val;
|
2001-10-22 20:20:14 +04:00
|
|
|
rb_ensure(trace_ev, (VALUE)&trace, trace_en, (VALUE)var);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
|
|
|
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 14:44:21 +04:00
|
|
|
rb_gv_set(const char *name, VALUE val)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2015-11-30 02:53:43 +03:00
|
|
|
struct rb_global_entry *entry;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
entry = rb_global_entry(global_id(name));
|
|
|
|
return rb_gvar_set(entry, val);
|
|
|
|
}
|
|
|
|
|
1999-11-17 10:30:37 +03: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 14:44:21 +04:00
|
|
|
rb_gv_get(const char *name)
|
1999-11-17 10:30:37 +03:00
|
|
|
{
|
2015-11-30 02:53:43 +03:00
|
|
|
struct rb_global_entry *entry;
|
2018-11-25 07:05:09 +03:00
|
|
|
ID id = find_global_id(name);
|
1999-11-17 10:30:37 +03:00
|
|
|
|
2018-11-25 07:05:09 +03:00
|
|
|
if (!id) {
|
|
|
|
rb_warning("global variable `%s' not initialized", name);
|
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
|
|
|
entry = rb_global_entry(id);
|
1999-11-17 10:30:37 +03:00
|
|
|
return rb_gvar_get(entry);
|
|
|
|
}
|
|
|
|
|
mjit_compile.c: merge initial JIT compiler
which has been developed by Takashi Kokubun <takashikkbn@gmail> as
YARV-MJIT. Many of its bugs are fixed by wanabe <s.wanabe@gmail.com>.
This JIT compiler is designed to be a safe migration path to introduce
JIT compiler to MRI. So this commit does not include any bytecode
changes or dynamic instruction modifications, which are done in original
MJIT.
This commit even strips off some aggressive optimizations from
YARV-MJIT, and thus it's slower than YARV-MJIT too. But it's still
fairly faster than Ruby 2.5 in some benchmarks (attached below).
Note that this JIT compiler passes `make test`, `make test-all`, `make
test-spec` without JIT, and even with JIT. Not only it's perfectly safe
with JIT disabled because it does not replace VM instructions unlike
MJIT, but also with JIT enabled it stably runs Ruby applications
including Rails applications.
I'm expecting this version as just "initial" JIT compiler. I have many
optimization ideas which are skipped for initial merging, and you may
easily replace this JIT compiler with a faster one by just replacing
mjit_compile.c. `mjit_compile` interface is designed for the purpose.
common.mk: update dependencies for mjit_compile.c.
internal.h: declare `rb_vm_insn_addr2insn` for MJIT.
vm.c: exclude some definitions if `-DMJIT_HEADER` is provided to
compiler. This avoids to include some functions which take a long time
to compile, e.g. vm_exec_core. Some of the purpose is achieved in
transform_mjit_header.rb (see `IGNORED_FUNCTIONS`) but others are
manually resolved for now. Load mjit_helper.h for MJIT header.
mjit_helper.h: New. This is a file used only by JIT-ed code. I'll
refactor `mjit_call_cfunc` later.
vm_eval.c: add some #ifdef switches to skip compiling some functions
like Init_vm_eval.
win32/mkexports.rb: export thread/ec functions, which are used by MJIT.
include/ruby/defines.h: add MJIT_FUNC_EXPORTED macro alis to clarify
that a function is exported only for MJIT.
array.c: export a function used by MJIT.
bignum.c: ditto.
class.c: ditto.
compile.c: ditto.
error.c: ditto.
gc.c: ditto.
hash.c: ditto.
iseq.c: ditto.
numeric.c: ditto.
object.c: ditto.
proc.c: ditto.
re.c: ditto.
st.c: ditto.
string.c: ditto.
thread.c: ditto.
variable.c: ditto.
vm_backtrace.c: ditto.
vm_insnhelper.c: ditto.
vm_method.c: ditto.
I would like to improve maintainability of function exports, but I
believe this way is acceptable as initial merging if we clarify the
new exports are for MJIT (so that we can use them as TODO list to fix)
and add unit tests to detect unresolved symbols.
I'll add unit tests of JIT compilations in succeeding commits.
Author: Takashi Kokubun <takashikkbn@gmail.com>
Contributor: wanabe <s.wanabe@gmail.com>
Part of [Feature #14235]
---
* Known issues
* Code generated by gcc is faster than clang. The benchmark may be worse
in macOS. Following benchmark result is provided by gcc w/ Linux.
* Performance is decreased when Google Chrome is running
* JIT can work on MinGW, but it doesn't improve performance at least
in short running benchmark.
* Currently it doesn't perform well with Rails. We'll try to fix this
before release.
---
* Benchmark reslts
Benchmarked with:
Intel 4.0GHz i7-4790K with 16GB memory under x86-64 Ubuntu 8 Cores
- 2.0.0-p0: Ruby 2.0.0-p0
- r62186: Ruby trunk (early 2.6.0), before MJIT changes
- JIT off: On this commit, but without `--jit` option
- JIT on: On this commit, and with `--jit` option
** Optcarrot fps
Benchmark: https://github.com/mame/optcarrot
| |2.0.0-p0 |r62186 |JIT off |JIT on |
|:--------|:--------|:--------|:--------|:--------|
|fps |37.32 |51.46 |51.31 |58.88 |
|vs 2.0.0 |1.00x |1.38x |1.37x |1.58x |
** MJIT benchmarks
Benchmark: https://github.com/benchmark-driver/mjit-benchmarks
(Original: https://github.com/vnmakarov/ruby/tree/rtl_mjit_branch/MJIT-benchmarks)
| |2.0.0-p0 |r62186 |JIT off |JIT on |
|:----------|:--------|:--------|:--------|:--------|
|aread |1.00 |1.09 |1.07 |2.19 |
|aref |1.00 |1.13 |1.11 |2.22 |
|aset |1.00 |1.50 |1.45 |2.64 |
|awrite |1.00 |1.17 |1.13 |2.20 |
|call |1.00 |1.29 |1.26 |2.02 |
|const2 |1.00 |1.10 |1.10 |2.19 |
|const |1.00 |1.11 |1.10 |2.19 |
|fannk |1.00 |1.04 |1.02 |1.00 |
|fib |1.00 |1.32 |1.31 |1.84 |
|ivread |1.00 |1.13 |1.12 |2.43 |
|ivwrite |1.00 |1.23 |1.21 |2.40 |
|mandelbrot |1.00 |1.13 |1.16 |1.28 |
|meteor |1.00 |2.97 |2.92 |3.17 |
|nbody |1.00 |1.17 |1.15 |1.49 |
|nest-ntimes|1.00 |1.22 |1.20 |1.39 |
|nest-while |1.00 |1.10 |1.10 |1.37 |
|norm |1.00 |1.18 |1.16 |1.24 |
|nsvb |1.00 |1.16 |1.16 |1.17 |
|red-black |1.00 |1.02 |0.99 |1.12 |
|sieve |1.00 |1.30 |1.28 |1.62 |
|trees |1.00 |1.14 |1.13 |1.19 |
|while |1.00 |1.12 |1.11 |2.41 |
** Discourse's script/bench.rb
Benchmark: https://github.com/discourse/discourse/blob/v1.8.7/script/bench.rb
NOTE: Rails performance was somehow a little degraded with JIT for now.
We should fix this.
(At least I know opt_aref is performing badly in JIT and I have an idea
to fix it. Please wait for the fix.)
*** JIT off
Your Results: (note for timings- percentile is first, duration is second in millisecs)
categories_admin:
50: 17
75: 18
90: 22
99: 29
home_admin:
50: 21
75: 21
90: 27
99: 40
topic_admin:
50: 17
75: 18
90: 22
99: 32
categories:
50: 35
75: 41
90: 43
99: 77
home:
50: 39
75: 46
90: 49
99: 95
topic:
50: 46
75: 52
90: 56
99: 101
*** JIT on
Your Results: (note for timings- percentile is first, duration is second in millisecs)
categories_admin:
50: 19
75: 21
90: 25
99: 33
home_admin:
50: 24
75: 26
90: 30
99: 35
topic_admin:
50: 19
75: 20
90: 25
99: 30
categories:
50: 40
75: 44
90: 48
99: 76
home:
50: 42
75: 48
90: 51
99: 89
topic:
50: 49
75: 55
90: 58
99: 99
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62197 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2018-02-04 14:22:28 +03:00
|
|
|
MJIT_FUNC_EXPORTED VALUE
|
2015-11-30 02:53:43 +03:00
|
|
|
rb_gvar_defined(struct rb_global_entry *entry)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2015-11-30 02:53:43 +03:00
|
|
|
if (entry->var->getter == rb_gvar_undef_getter) return Qfalse;
|
1999-01-20 07:59:39 +03:00
|
|
|
return Qtrue;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2018-09-11 12:48:58 +03:00
|
|
|
rb_gvar_getter_t *
|
|
|
|
rb_gvar_getter_function_of(const struct rb_global_entry *entry)
|
|
|
|
{
|
|
|
|
return entry->var->getter;
|
|
|
|
}
|
|
|
|
|
|
|
|
rb_gvar_setter_t *
|
|
|
|
rb_gvar_setter_function_of(const struct rb_global_entry *entry)
|
|
|
|
{
|
|
|
|
return entry->var->setter;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool
|
|
|
|
rb_gvar_is_traced(const struct rb_global_entry *entry)
|
|
|
|
{
|
|
|
|
return !!entry->var->trace;
|
|
|
|
}
|
|
|
|
|
2015-11-03 00:26:26 +03:00
|
|
|
static enum rb_id_table_iterator_result
|
|
|
|
gvar_i(ID key, VALUE val, void *a)
|
1998-01-16 15:19:22 +03:00
|
|
|
{
|
2012-03-31 02:40:54 +04:00
|
|
|
VALUE ary = (VALUE)a;
|
2006-09-04 09:46:47 +04:00
|
|
|
rb_ary_push(ary, ID2SYM(key));
|
2015-11-03 00:26:26 +03:00
|
|
|
return ID_TABLE_CONTINUE;
|
1998-01-16 15:19:22 +03: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 14:44:21 +04:00
|
|
|
rb_f_global_variables(void)
|
1998-01-16 15:19:22 +03:00
|
|
|
{
|
1999-01-20 07:59:39 +03:00
|
|
|
VALUE ary = rb_ary_new();
|
2016-01-14 11:36:49 +03:00
|
|
|
VALUE sym, backref = rb_backref_get();
|
1998-01-16 15:19:22 +03:00
|
|
|
|
2015-11-03 00:26:26 +03:00
|
|
|
rb_id_table_foreach(rb_global_tbl, gvar_i, (void *)ary);
|
2016-01-14 11:36:49 +03:00
|
|
|
if (!NIL_P(backref)) {
|
2016-01-14 05:45:03 +03:00
|
|
|
char buf[2];
|
2016-01-14 11:36:49 +03:00
|
|
|
int i, nmatch = rb_match_count(backref);
|
2016-01-14 05:45:03 +03:00
|
|
|
buf[0] = '$';
|
2016-01-14 11:36:49 +03:00
|
|
|
for (i = 1; i <= nmatch; ++i) {
|
|
|
|
if (!rb_match_nth_defined(i, backref)) continue;
|
|
|
|
if (i < 10) {
|
|
|
|
/* probably reused, make static ID */
|
|
|
|
buf[1] = (char)(i + '0');
|
|
|
|
sym = ID2SYM(rb_intern2(buf, 2));
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* dynamic symbol */
|
|
|
|
sym = rb_str_intern(rb_sprintf("$%d", i));
|
|
|
|
}
|
|
|
|
rb_ary_push(ary, sym);
|
2016-01-14 05:45:03 +03:00
|
|
|
}
|
1998-01-16 15:19:22 +03:00
|
|
|
}
|
|
|
|
return ary;
|
|
|
|
}
|
|
|
|
|
1998-01-16 15:13:05 +03: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 14:44:21 +04:00
|
|
|
rb_alias_variable(ID name1, ID name2)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2015-11-30 02:53:43 +03:00
|
|
|
struct rb_global_entry *entry1, *entry2;
|
2015-11-03 00:26:26 +03:00
|
|
|
VALUE data1;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2001-10-22 20:20:14 +04:00
|
|
|
entry2 = rb_global_entry(name2);
|
2015-11-03 00:26:26 +03:00
|
|
|
if (!rb_id_table_lookup(rb_global_tbl, name1, &data1)) {
|
2015-11-30 02:53:43 +03:00
|
|
|
entry1 = ALLOC(struct rb_global_entry);
|
2001-10-22 20:20:14 +04:00
|
|
|
entry1->id = name1;
|
2015-11-03 00:26:26 +03:00
|
|
|
rb_id_table_insert(rb_global_tbl, name1, (VALUE)entry1);
|
2001-10-22 20:20:14 +04:00
|
|
|
}
|
2015-11-30 02:53:43 +03:00
|
|
|
else if ((entry1 = (struct rb_global_entry *)data1)->var != entry2->var) {
|
|
|
|
struct rb_global_variable *var = entry1->var;
|
2001-10-22 20:20:14 +04:00
|
|
|
if (var->block_trace) {
|
|
|
|
rb_raise(rb_eRuntimeError, "can't alias in tracer");
|
|
|
|
}
|
|
|
|
var->counter--;
|
|
|
|
if (var->counter == 0) {
|
|
|
|
struct trace_var *trace = var->trace;
|
|
|
|
while (trace) {
|
|
|
|
struct trace_var *next = trace->next;
|
* array.c, bignum.c, cont.c, dir.c, dln.c, encoding.c, enumerator.c,
enumerator.c (enumerator_allocate), eval_jump.c, file.c, hash.c,
io.c, load.c, pack.c, proc.c, random.c, re.c, ruby.c, st.c,
string.c, thread.c, thread_pthread.c, time.c, util.c, variable.c,
vm.c, gc.c:
allocated memory objects by xmalloc (ruby_xmalloc) should be
freed by xfree (ruby_xfree).
* ext/curses/curses.c, ext/dbm/dbm.c, ext/digest/digest.c,
ext/gdbm/gdbm.c, ext/json/ext/parser/parser.c,
ext/json/ext/parser/unicode.c, ext/openssl/ossl_cipher.c,
ext/openssl/ossl_hmac.c, ext/openssl/ossl_pkey_ec.c,
ext/sdbm/init.c, ext/strscan/strscan.c, ext/zlib/zlib.c:
ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17017 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-08 14:01:40 +04:00
|
|
|
xfree(trace);
|
2001-10-22 20:20:14 +04:00
|
|
|
trace = next;
|
|
|
|
}
|
* array.c, bignum.c, cont.c, dir.c, dln.c, encoding.c, enumerator.c,
enumerator.c (enumerator_allocate), eval_jump.c, file.c, hash.c,
io.c, load.c, pack.c, proc.c, random.c, re.c, ruby.c, st.c,
string.c, thread.c, thread_pthread.c, time.c, util.c, variable.c,
vm.c, gc.c:
allocated memory objects by xmalloc (ruby_xmalloc) should be
freed by xfree (ruby_xfree).
* ext/curses/curses.c, ext/dbm/dbm.c, ext/digest/digest.c,
ext/gdbm/gdbm.c, ext/json/ext/parser/parser.c,
ext/json/ext/parser/unicode.c, ext/openssl/ossl_cipher.c,
ext/openssl/ossl_hmac.c, ext/openssl/ossl_pkey_ec.c,
ext/sdbm/init.c, ext/strscan/strscan.c, ext/zlib/zlib.c:
ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17017 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-08 14:01:40 +04:00
|
|
|
xfree(var);
|
2001-10-22 20:20:14 +04:00
|
|
|
}
|
2001-10-17 09:28:02 +04:00
|
|
|
}
|
2001-10-22 20:20:14 +04:00
|
|
|
else {
|
|
|
|
return;
|
2001-10-17 09:28:02 +04:00
|
|
|
}
|
2001-10-22 20:20:14 +04:00
|
|
|
entry2->var->counter++;
|
|
|
|
entry1->var = entry2->var;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2015-05-30 02:42:49 +03:00
|
|
|
static int
|
|
|
|
gen_ivtbl_get(VALUE obj, struct gen_ivtbl **ivtbl)
|
|
|
|
{
|
|
|
|
st_data_t data;
|
|
|
|
|
|
|
|
if (st_lookup(generic_iv_tbl, (st_data_t)obj, &data)) {
|
|
|
|
*ivtbl = (struct gen_ivtbl *)data;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
1999-01-20 07:59:39 +03:00
|
|
|
|
2015-05-30 03:20:15 +03:00
|
|
|
static VALUE
|
|
|
|
generic_ivar_delete(VALUE obj, ID id, VALUE undef)
|
|
|
|
{
|
|
|
|
struct gen_ivtbl *ivtbl;
|
|
|
|
|
|
|
|
if (gen_ivtbl_get(obj, &ivtbl)) {
|
|
|
|
st_table *iv_index_tbl = RCLASS_IV_INDEX_TBL(rb_obj_class(obj));
|
|
|
|
st_data_t index;
|
|
|
|
|
|
|
|
if (st_lookup(iv_index_tbl, (st_data_t)id, &index)) {
|
2016-04-22 12:47:34 +03:00
|
|
|
if (index < ivtbl->numiv) {
|
2015-05-30 03:20:15 +03:00
|
|
|
VALUE ret = ivtbl->ivptr[index];
|
|
|
|
|
|
|
|
ivtbl->ivptr[index] = Qundef;
|
|
|
|
return ret == Qundef ? undef : ret;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return undef;
|
|
|
|
}
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
static VALUE
|
2013-05-02 12:30:56 +04:00
|
|
|
generic_ivar_get(VALUE obj, ID id, VALUE undef)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
2015-05-30 02:42:49 +03:00
|
|
|
struct gen_ivtbl *ivtbl;
|
|
|
|
|
|
|
|
if (gen_ivtbl_get(obj, &ivtbl)) {
|
|
|
|
st_table *iv_index_tbl = RCLASS_IV_INDEX_TBL(rb_obj_class(obj));
|
|
|
|
st_data_t index;
|
|
|
|
|
|
|
|
if (st_lookup(iv_index_tbl, (st_data_t)id, &index)) {
|
2016-04-22 12:47:34 +03:00
|
|
|
if (index < ivtbl->numiv) {
|
2015-05-30 02:42:49 +03:00
|
|
|
VALUE ret = ivtbl->ivptr[index];
|
1999-01-20 07:59:39 +03:00
|
|
|
|
2015-05-30 02:42:49 +03:00
|
|
|
return ret == Qundef ? undef : ret;
|
|
|
|
}
|
2002-12-19 12:20:20 +03:00
|
|
|
}
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
2013-05-02 12:30:56 +04:00
|
|
|
return undef;
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
|
|
|
|
2015-05-30 02:42:49 +03:00
|
|
|
static size_t
|
|
|
|
gen_ivtbl_bytes(size_t n)
|
2014-10-08 18:49:49 +04:00
|
|
|
{
|
2018-01-14 14:19:18 +03:00
|
|
|
return offsetof(struct gen_ivtbl, ivptr) + n * sizeof(VALUE);
|
2015-05-30 02:42:49 +03:00
|
|
|
}
|
2014-10-08 18:49:49 +04:00
|
|
|
|
2015-12-08 18:07:41 +03:00
|
|
|
static struct gen_ivtbl *
|
2016-04-22 12:47:34 +03:00
|
|
|
gen_ivtbl_resize(struct gen_ivtbl *old, uint32_t n)
|
2015-05-30 02:42:49 +03:00
|
|
|
{
|
2016-04-22 12:47:34 +03:00
|
|
|
uint32_t len = old ? old->numiv : 0;
|
2015-05-30 02:42:49 +03:00
|
|
|
struct gen_ivtbl *ivtbl = xrealloc(old, gen_ivtbl_bytes(n));
|
|
|
|
|
|
|
|
ivtbl->numiv = n;
|
|
|
|
for (; len < n; len++) {
|
|
|
|
ivtbl->ivptr[len] = Qundef;
|
2014-10-08 18:49:49 +04:00
|
|
|
}
|
2015-05-30 02:42:49 +03:00
|
|
|
|
|
|
|
return ivtbl;
|
2014-10-08 18:49:49 +04:00
|
|
|
}
|
|
|
|
|
2015-12-08 18:07:41 +03:00
|
|
|
#if 0
|
|
|
|
static struct gen_ivtbl *
|
2015-05-30 02:42:49 +03:00
|
|
|
gen_ivtbl_dup(const struct gen_ivtbl *orig)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
2015-05-30 02:42:49 +03:00
|
|
|
size_t s = gen_ivtbl_bytes(orig->numiv);
|
|
|
|
struct gen_ivtbl *ivtbl = xmalloc(s);
|
1999-01-20 07:59:39 +03:00
|
|
|
|
2015-05-30 02:42:49 +03:00
|
|
|
memcpy(ivtbl, orig, s);
|
|
|
|
|
|
|
|
return ivtbl;
|
|
|
|
}
|
2015-12-08 18:07:41 +03:00
|
|
|
#endif
|
2015-05-30 02:42:49 +03:00
|
|
|
|
2016-04-22 12:47:34 +03:00
|
|
|
static uint32_t
|
2015-05-30 02:42:49 +03:00
|
|
|
iv_index_tbl_newsize(struct ivar_update *ivup)
|
|
|
|
{
|
2016-04-22 13:04:47 +03:00
|
|
|
uint32_t index = (uint32_t)ivup->index; /* should not overflow */
|
|
|
|
uint32_t newsize = (index+1) + (index+1)/4; /* (index+1)*1.25 */
|
2015-05-30 02:42:49 +03:00
|
|
|
|
2015-12-21 15:35:29 +03:00
|
|
|
if (!ivup->iv_extended &&
|
2015-05-30 02:42:49 +03:00
|
|
|
ivup->u.iv_index_tbl->num_entries < (st_index_t)newsize) {
|
2016-04-22 13:04:47 +03:00
|
|
|
newsize = (uint32_t)ivup->u.iv_index_tbl->num_entries;
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
2015-05-30 02:42:49 +03:00
|
|
|
return newsize;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
generic_ivar_update(st_data_t *k, st_data_t *v, st_data_t u, int existing)
|
|
|
|
{
|
|
|
|
VALUE obj = (VALUE)*k;
|
|
|
|
struct ivar_update *ivup = (struct ivar_update *)u;
|
2016-04-22 12:47:34 +03:00
|
|
|
uint32_t newsize;
|
2015-05-30 02:42:49 +03:00
|
|
|
int ret = ST_CONTINUE;
|
|
|
|
struct gen_ivtbl *ivtbl;
|
|
|
|
|
|
|
|
if (existing) {
|
|
|
|
ivtbl = (struct gen_ivtbl *)*v;
|
2016-04-22 12:47:34 +03:00
|
|
|
if (ivup->index >= ivtbl->numiv) {
|
2015-05-30 02:42:49 +03:00
|
|
|
goto resize;
|
|
|
|
}
|
|
|
|
ret = ST_STOP;
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
2014-10-08 18:49:49 +04:00
|
|
|
else {
|
2015-05-30 02:42:49 +03:00
|
|
|
FL_SET(obj, FL_EXIVAR);
|
|
|
|
ivtbl = 0;
|
|
|
|
resize:
|
|
|
|
newsize = iv_index_tbl_newsize(ivup);
|
|
|
|
ivtbl = gen_ivtbl_resize(ivtbl, newsize);
|
|
|
|
*v = (st_data_t)ivtbl;
|
2014-10-08 18:49:49 +04:00
|
|
|
}
|
2015-05-30 02:42:49 +03:00
|
|
|
ivup->u.ivtbl = ivtbl;
|
|
|
|
return ret;
|
1999-01-20 07:59:39 +03: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 14:44:21 +04:00
|
|
|
generic_ivar_defined(VALUE obj, ID id)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
2015-05-30 02:42:49 +03:00
|
|
|
struct gen_ivtbl *ivtbl;
|
|
|
|
st_table *iv_index_tbl = RCLASS_IV_INDEX_TBL(rb_obj_class(obj));
|
|
|
|
st_data_t index;
|
1999-01-20 07:59:39 +03:00
|
|
|
|
2015-05-30 02:42:49 +03:00
|
|
|
if (!iv_index_tbl) return Qfalse;
|
|
|
|
if (!st_lookup(iv_index_tbl, (st_data_t)id, &index)) return Qfalse;
|
|
|
|
if (!gen_ivtbl_get(obj, &ivtbl)) return Qfalse;
|
|
|
|
|
2016-04-22 12:47:34 +03:00
|
|
|
if ((index < ivtbl->numiv) && (ivtbl->ivptr[index] != Qundef))
|
1999-01-20 07:59:39 +03:00
|
|
|
return Qtrue;
|
2015-05-30 02:42:49 +03:00
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
return Qfalse;
|
|
|
|
}
|
|
|
|
|
2002-04-10 12:45:26 +04:00
|
|
|
static int
|
2015-10-30 05:37:59 +03:00
|
|
|
generic_ivar_remove(VALUE obj, ID id, VALUE *valp)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
2015-05-30 02:42:49 +03:00
|
|
|
struct gen_ivtbl *ivtbl;
|
|
|
|
st_data_t key = (st_data_t)id;
|
|
|
|
st_data_t index;
|
|
|
|
st_table *iv_index_tbl = RCLASS_IV_INDEX_TBL(rb_obj_class(obj));
|
1999-01-20 07:59:39 +03:00
|
|
|
|
2015-05-30 02:42:49 +03:00
|
|
|
if (!iv_index_tbl) return 0;
|
|
|
|
if (!st_lookup(iv_index_tbl, key, &index)) return 0;
|
|
|
|
if (!gen_ivtbl_get(obj, &ivtbl)) return 0;
|
|
|
|
|
2016-04-22 12:47:34 +03:00
|
|
|
if (index < ivtbl->numiv) {
|
2015-05-30 02:42:49 +03:00
|
|
|
if (ivtbl->ivptr[index] != Qundef) {
|
2015-10-30 05:37:59 +03:00
|
|
|
*valp = ivtbl->ivptr[index];
|
2015-05-30 02:42:49 +03:00
|
|
|
ivtbl->ivptr[index] = Qundef;
|
|
|
|
return 1;
|
|
|
|
}
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
2015-05-30 02:42:49 +03:00
|
|
|
return 0;
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
|
|
|
|
2015-05-30 02:42:49 +03:00
|
|
|
static void
|
|
|
|
gen_ivtbl_mark(const struct gen_ivtbl *ivtbl)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
2016-04-22 12:47:34 +03:00
|
|
|
uint32_t i;
|
1999-01-20 07:59:39 +03:00
|
|
|
|
2015-05-30 02:42:49 +03:00
|
|
|
for (i = 0; i < ivtbl->numiv; i++) {
|
|
|
|
rb_gc_mark(ivtbl->ivptr[i]);
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-05-30 02:42:49 +03:00
|
|
|
void
|
|
|
|
rb_mark_generic_ivar(VALUE obj)
|
1999-08-13 09:45:20 +04:00
|
|
|
{
|
2015-05-30 02:42:49 +03:00
|
|
|
struct gen_ivtbl *ivtbl;
|
|
|
|
|
|
|
|
if (gen_ivtbl_get(obj, &ivtbl)) {
|
|
|
|
gen_ivtbl_mark(ivtbl);
|
|
|
|
}
|
1999-08-13 09:45:20 +04:00
|
|
|
}
|
|
|
|
|
2019-04-20 04:19:47 +03:00
|
|
|
void
|
|
|
|
rb_mv_generic_ivar(VALUE rsrc, VALUE dst)
|
|
|
|
{
|
|
|
|
st_data_t key = (st_data_t)rsrc;
|
|
|
|
struct gen_ivtbl *ivtbl;
|
|
|
|
|
|
|
|
if (st_delete(generic_iv_tbl, &key, (st_data_t *)&ivtbl))
|
|
|
|
st_insert(generic_iv_tbl, (st_data_t)dst, (st_data_t)ivtbl);
|
|
|
|
}
|
|
|
|
|
1999-01-20 07:59:39 +03: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 14:44:21 +04:00
|
|
|
rb_free_generic_ivar(VALUE obj)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
2015-05-30 02:42:49 +03:00
|
|
|
st_data_t key = (st_data_t)obj;
|
|
|
|
struct gen_ivtbl *ivtbl;
|
1999-01-20 07:59:39 +03:00
|
|
|
|
2015-05-30 02:42:49 +03:00
|
|
|
if (st_delete(generic_iv_tbl, &key, (st_data_t *)&ivtbl))
|
|
|
|
xfree(ivtbl);
|
|
|
|
|
|
|
|
if (generic_iv_tbl_compat) {
|
|
|
|
st_table *tbl;
|
|
|
|
|
|
|
|
if (st_delete(generic_iv_tbl_compat, &key, (st_data_t *)&tbl))
|
|
|
|
st_free_table(tbl);
|
|
|
|
}
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
|
|
|
|
2010-08-14 10:33:06 +04:00
|
|
|
RUBY_FUNC_EXPORTED size_t
|
2009-06-22 18:25:04 +04:00
|
|
|
rb_generic_ivar_memsize(VALUE obj)
|
2009-06-17 02:36:27 +04:00
|
|
|
{
|
2015-05-30 02:42:49 +03:00
|
|
|
struct gen_ivtbl *ivtbl;
|
|
|
|
|
|
|
|
if (gen_ivtbl_get(obj, &ivtbl))
|
|
|
|
return gen_ivtbl_bytes(ivtbl->numiv);
|
2009-06-17 02:36:27 +04:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-05-30 02:42:49 +03:00
|
|
|
static size_t
|
|
|
|
gen_ivtbl_count(const struct gen_ivtbl *ivtbl)
|
1999-08-13 09:45:20 +04:00
|
|
|
{
|
2016-04-22 12:47:34 +03:00
|
|
|
uint32_t i;
|
2015-05-30 02:42:49 +03:00
|
|
|
size_t n = 0;
|
1999-08-13 09:45:20 +04:00
|
|
|
|
2015-05-30 02:42:49 +03:00
|
|
|
for (i = 0; i < ivtbl->numiv; i++) {
|
|
|
|
if (ivtbl->ivptr[i] != Qundef) {
|
|
|
|
n++;
|
2002-09-03 09:20:14 +04:00
|
|
|
}
|
1999-08-13 09:45:20 +04:00
|
|
|
}
|
2015-05-30 02:42:49 +03:00
|
|
|
|
|
|
|
return n;
|
1999-08-13 09:45:20 +04:00
|
|
|
}
|
|
|
|
|
2015-10-28 09:36:13 +03:00
|
|
|
VALUE
|
2013-05-02 12:30:56 +04:00
|
|
|
rb_ivar_lookup(VALUE obj, ID id, VALUE undef)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2008-02-13 14:52:46 +03:00
|
|
|
VALUE val, *ptr;
|
|
|
|
struct st_table *iv_index_tbl;
|
2016-04-22 12:47:34 +03:00
|
|
|
uint32_t len;
|
2007-09-28 10:21:46 +04:00
|
|
|
st_data_t index;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
variable.c: remove generic ivar support for special constants
Special constants are all frozen since [Feature #8923] and cannot
support ivars. Remove some unused code we had for supporting them.
* variable.c (special_generic_ivar): remove flag
(givar_i, rb_mark_generic_ivar_tbl): remove functions
(rb_free_generic_ivar, rb_ivar_lookup, rb_ivar_delete,
generic_ivar_set, rb_ivar_set, rb_ivar_defined,
rb_copy_generic_ivar, rb_ivar_foreach, rb_ivar_count,
rb_obj_remove_instance_variable):
adjust for lack of ivar support in special constants
* test/ruby/test_variable.rb: test ivars for special consts
* internal.h: remove rb_mark_generic_ivar_tbl decl
* gc.c (gc_mark_roots): remove rb_mark_generic_ivar_tbl call
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50758 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-06-03 23:53:35 +03:00
|
|
|
if (SPECIAL_CONST_P(obj)) return undef;
|
2012-07-28 21:04:58 +04:00
|
|
|
switch (BUILTIN_TYPE(obj)) {
|
1998-01-16 15:13:05 +03:00
|
|
|
case T_OBJECT:
|
2008-02-25 19:18:18 +03:00
|
|
|
len = ROBJECT_NUMIV(obj);
|
|
|
|
ptr = ROBJECT_IVPTR(obj);
|
2008-02-13 14:52:46 +03:00
|
|
|
iv_index_tbl = ROBJECT_IV_INDEX_TBL(obj);
|
2009-02-15 05:45:31 +03:00
|
|
|
if (!iv_index_tbl) break;
|
2009-07-30 11:10:51 +04:00
|
|
|
if (!st_lookup(iv_index_tbl, (st_data_t)id, &index)) break;
|
2016-04-22 12:47:34 +03:00
|
|
|
if (len <= index) break;
|
2008-02-13 14:52:46 +03:00
|
|
|
val = ptr[index];
|
2007-09-28 10:21:46 +04:00
|
|
|
if (val != Qundef)
|
|
|
|
return val;
|
|
|
|
break;
|
1998-01-16 15:13:05 +03:00
|
|
|
case T_CLASS:
|
|
|
|
case T_MODULE:
|
2015-08-04 06:13:19 +03:00
|
|
|
if (RCLASS_IV_TBL(obj) &&
|
|
|
|
st_lookup(RCLASS_IV_TBL(obj), (st_data_t)id, &index))
|
* compile.c (iseq_build_body), error.c (set_syserr, get_syserr),
(syserr_initialize), gc.c (define_final, rb_gc_copy_finalizer),
(run_final), hash.c (rb_hash_aref, rb_hash_lookup2),
(rb_hash_fetch_m, rb_hash_clear, rb_hash_aset, eql_i),
iseq.c (iseq_load, iseq_data_to_ary), marshal.c (r_symlink),
thread.c (rb_thread_local_aref),
variable.c (generic_ivar_remove, ivar_get, rb_const_get_0),
(rb_cvar_get), vm.c (rb_vm_check_redefinition_opt_method),
vm_insnhelper.c (vm_get_ev_const), vm_method.c (remove_method),
ext/iconv/iconv.c (map_charset): use st_data_t.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29462 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-10-12 18:47:23 +04:00
|
|
|
return (VALUE)index;
|
1999-01-20 07:59:39 +03:00
|
|
|
break;
|
1998-01-16 15:13:05 +03:00
|
|
|
default:
|
variable.c: remove generic ivar support for special constants
Special constants are all frozen since [Feature #8923] and cannot
support ivars. Remove some unused code we had for supporting them.
* variable.c (special_generic_ivar): remove flag
(givar_i, rb_mark_generic_ivar_tbl): remove functions
(rb_free_generic_ivar, rb_ivar_lookup, rb_ivar_delete,
generic_ivar_set, rb_ivar_set, rb_ivar_defined,
rb_copy_generic_ivar, rb_ivar_foreach, rb_ivar_count,
rb_obj_remove_instance_variable):
adjust for lack of ivar support in special constants
* test/ruby/test_variable.rb: test ivars for special consts
* internal.h: remove rb_mark_generic_ivar_tbl decl
* gc.c (gc_mark_roots): remove rb_mark_generic_ivar_tbl call
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50758 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-06-03 23:53:35 +03:00
|
|
|
if (FL_TEST(obj, FL_EXIVAR))
|
2013-05-02 12:30:56 +04:00
|
|
|
return generic_ivar_get(obj, id, undef);
|
1998-01-16 15:13:05 +03:00
|
|
|
break;
|
|
|
|
}
|
2013-05-02 12:30:56 +04:00
|
|
|
return undef;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-02-18 17:30:17 +03: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 14:44:21 +04:00
|
|
|
rb_ivar_get(VALUE obj, ID id)
|
2003-02-18 17:30:17 +03:00
|
|
|
{
|
2013-05-02 12:30:56 +04:00
|
|
|
VALUE iv = rb_ivar_lookup(obj, id, Qundef);
|
2017-03-15 11:25:58 +03:00
|
|
|
RB_DEBUG_COUNTER_INC(ivar_get_base);
|
2013-05-02 12:30:56 +04:00
|
|
|
|
|
|
|
if (iv == Qundef) {
|
2014-10-19 21:23:31 +04:00
|
|
|
if (RTEST(ruby_verbose))
|
|
|
|
rb_warning("instance variable %"PRIsVALUE" not initialized", QUOTE_ID(id));
|
2013-05-02 12:30:56 +04:00
|
|
|
iv = Qnil;
|
|
|
|
}
|
|
|
|
return iv;
|
2003-02-18 17:30:17 +03: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 14:44:21 +04:00
|
|
|
rb_attr_get(VALUE obj, ID id)
|
2003-02-18 17:30:17 +03:00
|
|
|
{
|
2013-05-02 12:30:56 +04:00
|
|
|
return rb_ivar_lookup(obj, id, Qnil);
|
2003-02-18 17:30:17 +03:00
|
|
|
}
|
|
|
|
|
2015-05-30 03:20:15 +03:00
|
|
|
static VALUE
|
|
|
|
rb_ivar_delete(VALUE obj, ID id, VALUE undef)
|
|
|
|
{
|
|
|
|
VALUE val, *ptr;
|
|
|
|
struct st_table *iv_index_tbl;
|
2016-04-22 12:47:34 +03:00
|
|
|
uint32_t len;
|
2015-05-30 03:20:15 +03:00
|
|
|
st_data_t index;
|
|
|
|
|
variable.c: remove generic ivar support for special constants
Special constants are all frozen since [Feature #8923] and cannot
support ivars. Remove some unused code we had for supporting them.
* variable.c (special_generic_ivar): remove flag
(givar_i, rb_mark_generic_ivar_tbl): remove functions
(rb_free_generic_ivar, rb_ivar_lookup, rb_ivar_delete,
generic_ivar_set, rb_ivar_set, rb_ivar_defined,
rb_copy_generic_ivar, rb_ivar_foreach, rb_ivar_count,
rb_obj_remove_instance_variable):
adjust for lack of ivar support in special constants
* test/ruby/test_variable.rb: test ivars for special consts
* internal.h: remove rb_mark_generic_ivar_tbl decl
* gc.c (gc_mark_roots): remove rb_mark_generic_ivar_tbl call
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50758 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-06-03 23:53:35 +03:00
|
|
|
rb_check_frozen(obj);
|
2015-05-30 03:20:15 +03:00
|
|
|
switch (BUILTIN_TYPE(obj)) {
|
|
|
|
case T_OBJECT:
|
|
|
|
len = ROBJECT_NUMIV(obj);
|
|
|
|
ptr = ROBJECT_IVPTR(obj);
|
|
|
|
iv_index_tbl = ROBJECT_IV_INDEX_TBL(obj);
|
|
|
|
if (!iv_index_tbl) break;
|
|
|
|
if (!st_lookup(iv_index_tbl, (st_data_t)id, &index)) break;
|
2016-04-22 12:47:34 +03:00
|
|
|
if (len <= index) break;
|
2015-05-30 03:20:15 +03:00
|
|
|
val = ptr[index];
|
|
|
|
ptr[index] = Qundef;
|
|
|
|
if (val != Qundef)
|
|
|
|
return val;
|
|
|
|
break;
|
|
|
|
case T_CLASS:
|
|
|
|
case T_MODULE:
|
2015-08-04 06:13:19 +03:00
|
|
|
if (RCLASS_IV_TBL(obj) &&
|
|
|
|
st_delete(RCLASS_IV_TBL(obj), (st_data_t *)&id, &index))
|
2015-05-30 03:20:15 +03:00
|
|
|
return (VALUE)index;
|
|
|
|
break;
|
|
|
|
default:
|
variable.c: remove generic ivar support for special constants
Special constants are all frozen since [Feature #8923] and cannot
support ivars. Remove some unused code we had for supporting them.
* variable.c (special_generic_ivar): remove flag
(givar_i, rb_mark_generic_ivar_tbl): remove functions
(rb_free_generic_ivar, rb_ivar_lookup, rb_ivar_delete,
generic_ivar_set, rb_ivar_set, rb_ivar_defined,
rb_copy_generic_ivar, rb_ivar_foreach, rb_ivar_count,
rb_obj_remove_instance_variable):
adjust for lack of ivar support in special constants
* test/ruby/test_variable.rb: test ivars for special consts
* internal.h: remove rb_mark_generic_ivar_tbl decl
* gc.c (gc_mark_roots): remove rb_mark_generic_ivar_tbl call
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50758 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-06-03 23:53:35 +03:00
|
|
|
if (FL_TEST(obj, FL_EXIVAR))
|
2015-05-30 03:20:15 +03:00
|
|
|
return generic_ivar_delete(obj, id, undef);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return undef;
|
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_attr_delete(VALUE obj, ID id)
|
|
|
|
{
|
|
|
|
return rb_ivar_delete(obj, id, Qnil);
|
|
|
|
}
|
|
|
|
|
2015-05-30 02:22:40 +03:00
|
|
|
static st_table *
|
|
|
|
iv_index_tbl_make(VALUE obj)
|
|
|
|
{
|
|
|
|
VALUE klass = rb_obj_class(obj);
|
|
|
|
st_table *iv_index_tbl = RCLASS_IV_INDEX_TBL(klass);
|
|
|
|
|
|
|
|
if (!iv_index_tbl) {
|
|
|
|
iv_index_tbl = RCLASS_IV_INDEX_TBL(klass) = st_init_numtable();
|
|
|
|
}
|
|
|
|
|
|
|
|
return iv_index_tbl;
|
|
|
|
}
|
|
|
|
|
2015-05-30 02:42:49 +03:00
|
|
|
static void
|
|
|
|
iv_index_tbl_extend(struct ivar_update *ivup, ID id)
|
2015-05-30 02:22:40 +03:00
|
|
|
{
|
2015-05-30 02:42:49 +03:00
|
|
|
if (st_lookup(ivup->u.iv_index_tbl, (st_data_t)id, &ivup->index)) {
|
|
|
|
return;
|
2015-05-30 02:22:40 +03:00
|
|
|
}
|
2015-05-30 02:42:49 +03:00
|
|
|
if (ivup->u.iv_index_tbl->num_entries >= INT_MAX) {
|
2015-05-30 02:22:40 +03:00
|
|
|
rb_raise(rb_eArgError, "too many instance variables");
|
|
|
|
}
|
2015-05-30 02:42:49 +03:00
|
|
|
ivup->index = (st_data_t)ivup->u.iv_index_tbl->num_entries;
|
|
|
|
st_add_direct(ivup->u.iv_index_tbl, (st_data_t)id, ivup->index);
|
2015-12-21 15:35:29 +03:00
|
|
|
ivup->iv_extended = 1;
|
2015-05-30 02:22:40 +03:00
|
|
|
}
|
|
|
|
|
2015-05-30 02:42:49 +03:00
|
|
|
static void
|
|
|
|
generic_ivar_set(VALUE obj, ID id, VALUE val)
|
2015-05-30 02:22:40 +03:00
|
|
|
{
|
2015-05-30 02:42:49 +03:00
|
|
|
struct ivar_update ivup;
|
2015-05-30 02:22:40 +03:00
|
|
|
|
2015-12-21 15:35:29 +03:00
|
|
|
ivup.iv_extended = 0;
|
2015-05-30 02:42:49 +03:00
|
|
|
ivup.u.iv_index_tbl = iv_index_tbl_make(obj);
|
|
|
|
iv_index_tbl_extend(&ivup, id);
|
|
|
|
st_update(generic_iv_tbl, (st_data_t)obj, generic_ivar_update,
|
|
|
|
(st_data_t)&ivup);
|
|
|
|
|
|
|
|
ivup.u.ivtbl->ivptr[ivup.index] = val;
|
|
|
|
|
2015-06-24 03:24:32 +03:00
|
|
|
RB_OBJ_WRITTEN(obj, Qundef, val);
|
2015-05-30 02:22:40 +03:00
|
|
|
}
|
|
|
|
|
2018-10-31 01:01:17 +03:00
|
|
|
static VALUE *
|
|
|
|
obj_ivar_heap_alloc(VALUE obj, size_t newsize)
|
|
|
|
{
|
|
|
|
VALUE *newptr = rb_transient_heap_alloc(obj, sizeof(VALUE) * newsize);
|
|
|
|
|
|
|
|
if (newptr != NULL) {
|
2018-11-01 11:53:44 +03:00
|
|
|
ROBJ_TRANSIENT_SET(obj);
|
2018-10-31 01:01:17 +03:00
|
|
|
}
|
|
|
|
else {
|
2018-11-01 11:53:44 +03:00
|
|
|
ROBJ_TRANSIENT_UNSET(obj);
|
2018-10-31 01:01:17 +03:00
|
|
|
newptr = ALLOC_N(VALUE, newsize);
|
|
|
|
}
|
|
|
|
return newptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE *
|
|
|
|
obj_ivar_heap_realloc(VALUE obj, int32_t len, size_t newsize)
|
|
|
|
{
|
|
|
|
VALUE *newptr;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (ROBJ_TRANSIENT_P(obj)) {
|
|
|
|
const VALUE *orig_ptr = ROBJECT(obj)->as.heap.ivptr;
|
2019-04-25 07:10:29 +03:00
|
|
|
newptr = obj_ivar_heap_alloc(obj, newsize);
|
|
|
|
|
|
|
|
assert(newptr);
|
2018-10-31 01:01:17 +03:00
|
|
|
ROBJECT(obj)->as.heap.ivptr = newptr;
|
|
|
|
for (i=0; i<(int)len; i++) {
|
|
|
|
newptr[i] = orig_ptr[i];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
REALLOC_N(ROBJECT(obj)->as.heap.ivptr, VALUE, newsize);
|
|
|
|
newptr = ROBJECT(obj)->as.heap.ivptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
return newptr;
|
|
|
|
}
|
|
|
|
|
2018-11-01 11:53:44 +03:00
|
|
|
#if USE_TRANSIENT_HEAP
|
2018-10-31 01:01:17 +03:00
|
|
|
void
|
|
|
|
rb_obj_transient_heap_evacuate(VALUE obj, int promote)
|
|
|
|
{
|
|
|
|
if (ROBJ_TRANSIENT_P(obj)) {
|
|
|
|
uint32_t len = ROBJECT_NUMIV(obj);
|
|
|
|
const VALUE *old_ptr = ROBJECT_IVPTR(obj);
|
|
|
|
VALUE *new_ptr;
|
|
|
|
|
|
|
|
if (promote) {
|
|
|
|
new_ptr = ALLOC_N(VALUE, len);
|
2018-11-01 11:53:44 +03:00
|
|
|
ROBJ_TRANSIENT_UNSET(obj);
|
2018-10-31 01:01:17 +03:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
new_ptr = obj_ivar_heap_alloc(obj, len);
|
|
|
|
}
|
|
|
|
MEMCPY(new_ptr, old_ptr, VALUE, len);
|
|
|
|
ROBJECT(obj)->as.heap.ivptr = new_ptr;
|
|
|
|
}
|
|
|
|
}
|
2018-11-01 11:53:44 +03:00
|
|
|
#endif
|
2018-10-31 01:01:17 +03:00
|
|
|
|
|
|
|
static VALUE
|
|
|
|
obj_ivar_set(VALUE obj, ID id, VALUE val)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2015-05-30 02:42:49 +03:00
|
|
|
struct ivar_update ivup;
|
2016-04-22 12:47:34 +03:00
|
|
|
uint32_t i, len;
|
2007-09-28 10:21:46 +04:00
|
|
|
|
2018-10-31 01:01:17 +03:00
|
|
|
ivup.iv_extended = 0;
|
|
|
|
ivup.u.iv_index_tbl = iv_index_tbl_make(obj);
|
|
|
|
iv_index_tbl_extend(&ivup, id);
|
|
|
|
len = ROBJECT_NUMIV(obj);
|
|
|
|
if (len <= ivup.index) {
|
|
|
|
VALUE *ptr = ROBJECT_IVPTR(obj);
|
|
|
|
if (ivup.index < ROBJECT_EMBED_LEN_MAX) {
|
|
|
|
RBASIC(obj)->flags |= ROBJECT_EMBED;
|
|
|
|
ptr = ROBJECT(obj)->as.ary;
|
|
|
|
for (i = 0; i < ROBJECT_EMBED_LEN_MAX; i++) {
|
|
|
|
ptr[i] = Qundef;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
VALUE *newptr;
|
|
|
|
uint32_t newsize = iv_index_tbl_newsize(&ivup);
|
|
|
|
|
|
|
|
if (RBASIC(obj)->flags & ROBJECT_EMBED) {
|
|
|
|
newptr = obj_ivar_heap_alloc(obj, newsize);
|
|
|
|
MEMCPY(newptr, ptr, VALUE, len);
|
|
|
|
RBASIC(obj)->flags &= ~ROBJECT_EMBED;
|
|
|
|
ROBJECT(obj)->as.heap.ivptr = newptr;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
newptr = obj_ivar_heap_realloc(obj, len, newsize);
|
|
|
|
}
|
|
|
|
for (; len < newsize; len++) {
|
|
|
|
newptr[len] = Qundef;
|
|
|
|
}
|
|
|
|
ROBJECT(obj)->as.heap.numiv = newsize;
|
|
|
|
ROBJECT(obj)->as.heap.iv_index_tbl = ivup.u.iv_index_tbl;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
RB_OBJ_WRITE(obj, &ROBJECT_IVPTR(obj)[ivup.index], val);
|
|
|
|
|
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
2019-01-16 13:48:30 +03:00
|
|
|
static void
|
|
|
|
ivar_set(VALUE obj, ID id, VALUE val)
|
2018-10-31 01:01:17 +03:00
|
|
|
{
|
2017-03-15 11:25:58 +03:00
|
|
|
RB_DEBUG_COUNTER_INC(ivar_set_base);
|
2017-02-21 11:18:15 +03:00
|
|
|
|
2012-07-28 21:04:58 +04:00
|
|
|
switch (BUILTIN_TYPE(obj)) {
|
1998-01-16 15:13:05 +03:00
|
|
|
case T_OBJECT:
|
2019-01-16 13:48:30 +03:00
|
|
|
obj_ivar_set(obj, id, val);
|
|
|
|
break;
|
1998-01-16 15:13:05 +03:00
|
|
|
case T_CLASS:
|
|
|
|
case T_MODULE:
|
2018-10-31 01:01:17 +03:00
|
|
|
if (!RCLASS_IV_TBL(obj)) RCLASS_IV_TBL(obj) = st_init_numtable();
|
|
|
|
rb_class_ivar_set(obj, id, val);
|
2007-09-29 05:21:15 +04:00
|
|
|
break;
|
1998-01-16 15:13:05 +03:00
|
|
|
default:
|
2018-10-31 01:01:17 +03:00
|
|
|
generic_ivar_set(obj, id, val);
|
|
|
|
break;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2019-01-16 13:48:30 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_ivar_set(VALUE obj, ID id, VALUE val)
|
|
|
|
{
|
|
|
|
rb_check_frozen(obj);
|
|
|
|
ivar_set(obj, id, val);
|
1998-01-16 15:13:05 +03:00
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
2019-01-16 13:48:30 +03:00
|
|
|
void
|
|
|
|
rb_ivar_set_internal(VALUE obj, ID id, VALUE val)
|
|
|
|
{
|
|
|
|
// should be internal instance variable name (no @ prefix)
|
|
|
|
VM_ASSERT(!rb_is_instance_id(id));
|
|
|
|
|
|
|
|
ivar_set(obj, id, val);
|
|
|
|
}
|
|
|
|
|
1998-01-16 15:13:05 +03: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 14:44:21 +04:00
|
|
|
rb_ivar_defined(VALUE obj, ID id)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2008-02-13 14:52:46 +03:00
|
|
|
VALUE val;
|
|
|
|
struct st_table *iv_index_tbl;
|
2007-09-28 10:21:46 +04:00
|
|
|
st_data_t index;
|
variable.c: remove generic ivar support for special constants
Special constants are all frozen since [Feature #8923] and cannot
support ivars. Remove some unused code we had for supporting them.
* variable.c (special_generic_ivar): remove flag
(givar_i, rb_mark_generic_ivar_tbl): remove functions
(rb_free_generic_ivar, rb_ivar_lookup, rb_ivar_delete,
generic_ivar_set, rb_ivar_set, rb_ivar_defined,
rb_copy_generic_ivar, rb_ivar_foreach, rb_ivar_count,
rb_obj_remove_instance_variable):
adjust for lack of ivar support in special constants
* test/ruby/test_variable.rb: test ivars for special consts
* internal.h: remove rb_mark_generic_ivar_tbl decl
* gc.c (gc_mark_roots): remove rb_mark_generic_ivar_tbl call
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50758 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-06-03 23:53:35 +03:00
|
|
|
|
|
|
|
if (SPECIAL_CONST_P(obj)) return Qfalse;
|
2012-07-28 21:04:58 +04:00
|
|
|
switch (BUILTIN_TYPE(obj)) {
|
1998-01-16 15:13:05 +03:00
|
|
|
case T_OBJECT:
|
2008-02-13 14:52:46 +03:00
|
|
|
iv_index_tbl = ROBJECT_IV_INDEX_TBL(obj);
|
|
|
|
if (!iv_index_tbl) break;
|
2009-07-30 11:10:51 +04:00
|
|
|
if (!st_lookup(iv_index_tbl, (st_data_t)id, &index)) break;
|
2016-04-22 12:47:34 +03:00
|
|
|
if (ROBJECT_NUMIV(obj) <= index) break;
|
2008-02-25 19:18:18 +03:00
|
|
|
val = ROBJECT_IVPTR(obj)[index];
|
2007-09-28 10:21:46 +04:00
|
|
|
if (val != Qundef)
|
|
|
|
return Qtrue;
|
|
|
|
break;
|
1998-01-16 15:13:05 +03:00
|
|
|
case T_CLASS:
|
|
|
|
case T_MODULE:
|
2009-07-30 11:10:51 +04:00
|
|
|
if (RCLASS_IV_TBL(obj) && st_lookup(RCLASS_IV_TBL(obj), (st_data_t)id, 0))
|
1999-01-20 07:59:39 +03:00
|
|
|
return Qtrue;
|
|
|
|
break;
|
|
|
|
default:
|
variable.c: remove generic ivar support for special constants
Special constants are all frozen since [Feature #8923] and cannot
support ivars. Remove some unused code we had for supporting them.
* variable.c (special_generic_ivar): remove flag
(givar_i, rb_mark_generic_ivar_tbl): remove functions
(rb_free_generic_ivar, rb_ivar_lookup, rb_ivar_delete,
generic_ivar_set, rb_ivar_set, rb_ivar_defined,
rb_copy_generic_ivar, rb_ivar_foreach, rb_ivar_count,
rb_obj_remove_instance_variable):
adjust for lack of ivar support in special constants
* test/ruby/test_variable.rb: test ivars for special consts
* internal.h: remove rb_mark_generic_ivar_tbl decl
* gc.c (gc_mark_roots): remove rb_mark_generic_ivar_tbl call
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50758 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-06-03 23:53:35 +03:00
|
|
|
if (FL_TEST(obj, FL_EXIVAR))
|
1999-01-20 07:59:39 +03:00
|
|
|
return generic_ivar_defined(obj, id);
|
1998-01-16 15:13:05 +03:00
|
|
|
break;
|
|
|
|
}
|
1999-01-20 07:59:39 +03:00
|
|
|
return Qfalse;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2019-08-27 06:08:32 +03:00
|
|
|
typedef int rb_ivar_foreach_callback_func(ID key, VALUE val, st_data_t arg);
|
|
|
|
|
2007-09-28 10:21:46 +04:00
|
|
|
struct obj_ivar_tag {
|
|
|
|
VALUE obj;
|
2019-08-27 06:08:32 +03:00
|
|
|
rb_ivar_foreach_callback_func *func;
|
2007-09-28 10:21:46 +04:00
|
|
|
st_data_t arg;
|
|
|
|
};
|
|
|
|
|
1998-01-16 15:19:22 +03:00
|
|
|
static int
|
2009-12-05 08:45:29 +03:00
|
|
|
obj_ivar_i(st_data_t key, st_data_t index, st_data_t arg)
|
2007-09-28 10:21:46 +04:00
|
|
|
{
|
2009-12-05 08:45:29 +03:00
|
|
|
struct obj_ivar_tag *data = (struct obj_ivar_tag *)arg;
|
2016-04-22 12:47:34 +03:00
|
|
|
if (index < ROBJECT_NUMIV(data->obj)) {
|
|
|
|
VALUE val = ROBJECT_IVPTR(data->obj)[index];
|
2007-09-28 10:21:46 +04:00
|
|
|
if (val != Qundef) {
|
2009-12-05 08:45:29 +03:00
|
|
|
return (data->func)((ID)key, val, data->arg);
|
2007-09-28 10:21:46 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2019-08-27 06:08:32 +03:00
|
|
|
obj_ivar_each(VALUE obj, rb_ivar_foreach_callback_func *func, st_data_t arg)
|
2007-09-28 10:21:46 +04:00
|
|
|
{
|
|
|
|
st_table *tbl;
|
|
|
|
struct obj_ivar_tag data;
|
|
|
|
|
2008-02-13 14:52:46 +03:00
|
|
|
tbl = ROBJECT_IV_INDEX_TBL(obj);
|
2007-09-28 10:21:46 +04:00
|
|
|
if (!tbl)
|
|
|
|
return;
|
|
|
|
|
|
|
|
data.obj = obj;
|
2007-09-29 19:56:50 +04:00
|
|
|
data.func = (int (*)(ID key, VALUE val, st_data_t arg))func;
|
2007-09-28 10:21:46 +04:00
|
|
|
data.arg = arg;
|
|
|
|
|
|
|
|
st_foreach_safe(tbl, obj_ivar_i, (st_data_t)&data);
|
|
|
|
}
|
|
|
|
|
2015-05-30 02:42:49 +03:00
|
|
|
struct gen_ivar_tag {
|
|
|
|
struct gen_ivtbl *ivtbl;
|
2019-08-27 06:08:32 +03:00
|
|
|
rb_ivar_foreach_callback_func *func;
|
2015-05-30 02:42:49 +03:00
|
|
|
st_data_t arg;
|
|
|
|
};
|
|
|
|
|
|
|
|
static int
|
|
|
|
gen_ivar_each_i(st_data_t key, st_data_t index, st_data_t data)
|
|
|
|
{
|
|
|
|
struct gen_ivar_tag *arg = (struct gen_ivar_tag *)data;
|
|
|
|
|
2016-04-22 12:47:34 +03:00
|
|
|
if (index < arg->ivtbl->numiv) {
|
2015-05-30 02:42:49 +03:00
|
|
|
VALUE val = arg->ivtbl->ivptr[index];
|
|
|
|
if (val != Qundef) {
|
|
|
|
return (arg->func)((ID)key, val, arg->arg);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2019-08-27 06:08:32 +03:00
|
|
|
gen_ivar_each(VALUE obj, rb_ivar_foreach_callback_func *func, st_data_t arg)
|
2015-05-30 02:42:49 +03:00
|
|
|
{
|
|
|
|
struct gen_ivar_tag data;
|
|
|
|
st_table *iv_index_tbl = RCLASS_IV_INDEX_TBL(rb_obj_class(obj));
|
|
|
|
|
|
|
|
if (!iv_index_tbl) return;
|
|
|
|
if (!gen_ivtbl_get(obj, &data.ivtbl)) return;
|
|
|
|
|
|
|
|
data.func = (int (*)(ID key, VALUE val, st_data_t arg))func;
|
|
|
|
data.arg = arg;
|
|
|
|
|
|
|
|
st_foreach_safe(iv_index_tbl, gen_ivar_each_i, (st_data_t)&data);
|
|
|
|
}
|
|
|
|
|
|
|
|
struct givar_copy {
|
|
|
|
VALUE obj;
|
|
|
|
st_table *iv_index_tbl;
|
|
|
|
struct gen_ivtbl *ivtbl;
|
|
|
|
};
|
|
|
|
|
|
|
|
static int
|
|
|
|
gen_ivar_copy(ID id, VALUE val, st_data_t arg)
|
|
|
|
{
|
|
|
|
struct givar_copy *c = (struct givar_copy *)arg;
|
|
|
|
struct ivar_update ivup;
|
|
|
|
|
2015-12-21 15:35:29 +03:00
|
|
|
ivup.iv_extended = 0;
|
2015-05-30 02:42:49 +03:00
|
|
|
ivup.u.iv_index_tbl = c->iv_index_tbl;
|
|
|
|
iv_index_tbl_extend(&ivup, id);
|
2016-04-22 12:47:34 +03:00
|
|
|
if (ivup.index >= c->ivtbl->numiv) {
|
|
|
|
uint32_t newsize = iv_index_tbl_newsize(&ivup);
|
2015-05-30 02:42:49 +03:00
|
|
|
c->ivtbl = gen_ivtbl_resize(c->ivtbl, newsize);
|
|
|
|
}
|
|
|
|
c->ivtbl->ivptr[ivup.index] = val;
|
|
|
|
|
2015-06-24 03:24:32 +03:00
|
|
|
RB_OBJ_WRITTEN(c->obj, Qundef, val);
|
2015-05-30 02:42:49 +03:00
|
|
|
|
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
rb_copy_generic_ivar(VALUE clone, VALUE obj)
|
|
|
|
{
|
|
|
|
struct gen_ivtbl *ivtbl;
|
|
|
|
|
variable.c: remove generic ivar support for special constants
Special constants are all frozen since [Feature #8923] and cannot
support ivars. Remove some unused code we had for supporting them.
* variable.c (special_generic_ivar): remove flag
(givar_i, rb_mark_generic_ivar_tbl): remove functions
(rb_free_generic_ivar, rb_ivar_lookup, rb_ivar_delete,
generic_ivar_set, rb_ivar_set, rb_ivar_defined,
rb_copy_generic_ivar, rb_ivar_foreach, rb_ivar_count,
rb_obj_remove_instance_variable):
adjust for lack of ivar support in special constants
* test/ruby/test_variable.rb: test ivars for special consts
* internal.h: remove rb_mark_generic_ivar_tbl decl
* gc.c (gc_mark_roots): remove rb_mark_generic_ivar_tbl call
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50758 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-06-03 23:53:35 +03:00
|
|
|
rb_check_frozen(clone);
|
2015-05-30 02:42:49 +03:00
|
|
|
|
|
|
|
if (!FL_TEST(obj, FL_EXIVAR)) {
|
|
|
|
clear:
|
|
|
|
if (FL_TEST(clone, FL_EXIVAR)) {
|
|
|
|
rb_free_generic_ivar(clone);
|
|
|
|
FL_UNSET(clone, FL_EXIVAR);
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (gen_ivtbl_get(obj, &ivtbl)) {
|
|
|
|
struct givar_copy c;
|
2016-04-22 12:47:34 +03:00
|
|
|
uint32_t i;
|
2015-05-30 02:42:49 +03:00
|
|
|
|
|
|
|
if (gen_ivtbl_count(ivtbl) == 0)
|
|
|
|
goto clear;
|
|
|
|
|
|
|
|
if (gen_ivtbl_get(clone, &c.ivtbl)) {
|
|
|
|
for (i = 0; i < c.ivtbl->numiv; i++)
|
|
|
|
c.ivtbl->ivptr[i] = Qundef;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
c.ivtbl = gen_ivtbl_resize(0, ivtbl->numiv);
|
|
|
|
FL_SET(clone, FL_EXIVAR);
|
|
|
|
}
|
|
|
|
|
|
|
|
c.iv_index_tbl = iv_index_tbl_make(clone);
|
|
|
|
c.obj = clone;
|
|
|
|
gen_ivar_each(obj, gen_ivar_copy, (st_data_t)&c);
|
|
|
|
/*
|
|
|
|
* c.ivtbl may change in gen_ivar_copy due to realloc,
|
|
|
|
* no need to free
|
|
|
|
*/
|
|
|
|
st_insert(generic_iv_tbl, (st_data_t)clone, (st_data_t)c.ivtbl);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-12-05 08:45:29 +03:00
|
|
|
void
|
2019-08-27 06:08:32 +03:00
|
|
|
rb_ivar_foreach(VALUE obj, rb_ivar_foreach_callback_func *func, st_data_t arg)
|
2007-09-28 10:21:46 +04:00
|
|
|
{
|
variable.c: remove generic ivar support for special constants
Special constants are all frozen since [Feature #8923] and cannot
support ivars. Remove some unused code we had for supporting them.
* variable.c (special_generic_ivar): remove flag
(givar_i, rb_mark_generic_ivar_tbl): remove functions
(rb_free_generic_ivar, rb_ivar_lookup, rb_ivar_delete,
generic_ivar_set, rb_ivar_set, rb_ivar_defined,
rb_copy_generic_ivar, rb_ivar_foreach, rb_ivar_count,
rb_obj_remove_instance_variable):
adjust for lack of ivar support in special constants
* test/ruby/test_variable.rb: test ivars for special consts
* internal.h: remove rb_mark_generic_ivar_tbl decl
* gc.c (gc_mark_roots): remove rb_mark_generic_ivar_tbl call
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50758 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-06-03 23:53:35 +03:00
|
|
|
if (SPECIAL_CONST_P(obj)) return;
|
2012-07-28 21:04:58 +04:00
|
|
|
switch (BUILTIN_TYPE(obj)) {
|
2007-09-28 10:21:46 +04:00
|
|
|
case T_OBJECT:
|
|
|
|
obj_ivar_each(obj, func, arg);
|
|
|
|
break;
|
|
|
|
case T_CLASS:
|
|
|
|
case T_MODULE:
|
|
|
|
if (RCLASS_IV_TBL(obj)) {
|
|
|
|
st_foreach_safe(RCLASS_IV_TBL(obj), func, arg);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
variable.c: remove generic ivar support for special constants
Special constants are all frozen since [Feature #8923] and cannot
support ivars. Remove some unused code we had for supporting them.
* variable.c (special_generic_ivar): remove flag
(givar_i, rb_mark_generic_ivar_tbl): remove functions
(rb_free_generic_ivar, rb_ivar_lookup, rb_ivar_delete,
generic_ivar_set, rb_ivar_set, rb_ivar_defined,
rb_copy_generic_ivar, rb_ivar_foreach, rb_ivar_count,
rb_obj_remove_instance_variable):
adjust for lack of ivar support in special constants
* test/ruby/test_variable.rb: test ivars for special consts
* internal.h: remove rb_mark_generic_ivar_tbl decl
* gc.c (gc_mark_roots): remove rb_mark_generic_ivar_tbl call
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50758 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-06-03 23:53:35 +03:00
|
|
|
if (FL_TEST(obj, FL_EXIVAR)) {
|
2015-05-30 02:42:49 +03:00
|
|
|
gen_ivar_each(obj, func, arg);
|
2007-09-28 10:21:46 +04:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-12-05 09:35:07 +03:00
|
|
|
st_index_t
|
|
|
|
rb_ivar_count(VALUE obj)
|
|
|
|
{
|
|
|
|
st_table *tbl;
|
variable.c: remove generic ivar support for special constants
Special constants are all frozen since [Feature #8923] and cannot
support ivars. Remove some unused code we had for supporting them.
* variable.c (special_generic_ivar): remove flag
(givar_i, rb_mark_generic_ivar_tbl): remove functions
(rb_free_generic_ivar, rb_ivar_lookup, rb_ivar_delete,
generic_ivar_set, rb_ivar_set, rb_ivar_defined,
rb_copy_generic_ivar, rb_ivar_foreach, rb_ivar_count,
rb_obj_remove_instance_variable):
adjust for lack of ivar support in special constants
* test/ruby/test_variable.rb: test ivars for special consts
* internal.h: remove rb_mark_generic_ivar_tbl decl
* gc.c (gc_mark_roots): remove rb_mark_generic_ivar_tbl call
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50758 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-06-03 23:53:35 +03:00
|
|
|
|
|
|
|
if (SPECIAL_CONST_P(obj)) return 0;
|
|
|
|
|
2012-07-28 21:04:58 +04:00
|
|
|
switch (BUILTIN_TYPE(obj)) {
|
2009-12-05 09:35:07 +03:00
|
|
|
case T_OBJECT:
|
|
|
|
if ((tbl = ROBJECT_IV_INDEX_TBL(obj)) != 0) {
|
2016-11-29 20:06:35 +03:00
|
|
|
st_index_t i, count, num = ROBJECT_NUMIV(obj);
|
2009-12-05 09:35:07 +03:00
|
|
|
const VALUE *const ivptr = ROBJECT_IVPTR(obj);
|
|
|
|
for (i = count = 0; i < num; ++i) {
|
|
|
|
if (ivptr[i] != Qundef) {
|
|
|
|
count++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return count;
|
2012-06-22 07:07:22 +04:00
|
|
|
}
|
2009-12-05 09:35:07 +03:00
|
|
|
break;
|
|
|
|
case T_CLASS:
|
|
|
|
case T_MODULE:
|
|
|
|
if ((tbl = RCLASS_IV_TBL(obj)) != 0) {
|
|
|
|
return tbl->num_entries;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
variable.c: remove generic ivar support for special constants
Special constants are all frozen since [Feature #8923] and cannot
support ivars. Remove some unused code we had for supporting them.
* variable.c (special_generic_ivar): remove flag
(givar_i, rb_mark_generic_ivar_tbl): remove functions
(rb_free_generic_ivar, rb_ivar_lookup, rb_ivar_delete,
generic_ivar_set, rb_ivar_set, rb_ivar_defined,
rb_copy_generic_ivar, rb_ivar_foreach, rb_ivar_count,
rb_obj_remove_instance_variable):
adjust for lack of ivar support in special constants
* test/ruby/test_variable.rb: test ivars for special consts
* internal.h: remove rb_mark_generic_ivar_tbl decl
* gc.c (gc_mark_roots): remove rb_mark_generic_ivar_tbl call
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50758 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-06-03 23:53:35 +03:00
|
|
|
if (FL_TEST(obj, FL_EXIVAR)) {
|
2015-05-30 02:42:49 +03:00
|
|
|
struct gen_ivtbl *ivtbl;
|
2009-12-05 09:35:07 +03:00
|
|
|
|
2015-05-30 02:42:49 +03:00
|
|
|
if (gen_ivtbl_get(obj, &ivtbl)) {
|
|
|
|
return gen_ivtbl_count(ivtbl);
|
2009-12-05 09:35:07 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-09-28 10:21:46 +04:00
|
|
|
static int
|
2012-03-31 02:40:54 +04:00
|
|
|
ivar_i(st_data_t k, st_data_t v, st_data_t a)
|
1998-01-16 15:19:22 +03:00
|
|
|
{
|
2012-03-31 02:40:54 +04:00
|
|
|
ID key = (ID)k;
|
|
|
|
VALUE ary = (VALUE)a;
|
|
|
|
|
* parse.y, compile.c, gc.c, insns.def, intern.h, iseq.c, node.h,
object.c, string.c, variable.c, vm_macro.def: revert private
instance variable feature, which is postponed until next major
release.
* marshal.c: TYPE_SYMBOL2 removed; MARSHAL_MINOR reverted back to
8th version.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11813 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-23 05:49:41 +03:00
|
|
|
if (rb_is_instance_id(key)) {
|
2006-09-04 09:46:47 +04:00
|
|
|
rb_ary_push(ary, ID2SYM(key));
|
1998-01-16 15:19:22 +03:00
|
|
|
}
|
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2003-12-28 09:33:07 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* obj.instance_variables -> array
|
2009-02-15 05:45:31 +03:00
|
|
|
*
|
2003-12-28 09:33:07 +03:00
|
|
|
* Returns an array of instance variable names for the receiver. Note
|
|
|
|
* that simply defining an accessor does not create the corresponding
|
|
|
|
* instance variable.
|
2009-02-15 05:45:31 +03:00
|
|
|
*
|
2003-12-28 09:33:07 +03:00
|
|
|
* class Fred
|
|
|
|
* attr_accessor :a1
|
|
|
|
* def initialize
|
|
|
|
* @iv = 3
|
|
|
|
* end
|
|
|
|
* end
|
2008-03-09 04:04:46 +03:00
|
|
|
* Fred.new.instance_variables #=> [:@iv]
|
2003-12-28 09:33:07 +03:00
|
|
|
*/
|
|
|
|
|
1998-01-16 15:19:22 +03: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 14:44:21 +04:00
|
|
|
rb_obj_instance_variables(VALUE obj)
|
1998-01-16 15:19:22 +03:00
|
|
|
{
|
1999-12-14 09:50:43 +03:00
|
|
|
VALUE ary;
|
1998-01-16 15:19:22 +03:00
|
|
|
|
1999-12-14 09:50:43 +03:00
|
|
|
ary = rb_ary_new();
|
2007-09-28 10:21:46 +04:00
|
|
|
rb_ivar_foreach(obj, ivar_i, ary);
|
1999-10-04 08:51:08 +04:00
|
|
|
return ary;
|
1998-01-16 15:19:22 +03:00
|
|
|
}
|
|
|
|
|
2015-10-28 09:24:12 +03:00
|
|
|
#define rb_is_constant_id rb_is_const_id
|
|
|
|
#define rb_is_constant_name rb_is_const_name
|
|
|
|
#define id_for_var(obj, name, part, type) \
|
|
|
|
id_for_var_message(obj, name, type, "`%1$s' is not allowed as "#part" "#type" variable name")
|
|
|
|
#define id_for_var_message(obj, name, type, message) \
|
|
|
|
check_id_type(obj, &(name), rb_is_##type##_id, rb_is_##type##_name, message, strlen(message))
|
|
|
|
static ID
|
|
|
|
check_id_type(VALUE obj, VALUE *pname,
|
|
|
|
int (*valid_id_p)(ID), int (*valid_name_p)(VALUE),
|
|
|
|
const char *message, size_t message_len)
|
|
|
|
{
|
|
|
|
ID id = rb_check_id(pname);
|
|
|
|
VALUE name = *pname;
|
|
|
|
|
|
|
|
if (id ? !valid_id_p(id) : !valid_name_p(name)) {
|
|
|
|
rb_name_err_raise_str(rb_fstring_new(message, message_len),
|
|
|
|
obj, name);
|
|
|
|
}
|
|
|
|
return id;
|
|
|
|
}
|
|
|
|
|
2003-12-28 09:33:07 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* obj.remove_instance_variable(symbol) -> obj
|
2018-07-14 20:04:56 +03:00
|
|
|
* obj.remove_instance_variable(string) -> obj
|
2009-02-15 05:45:31 +03:00
|
|
|
*
|
2003-12-28 09:33:07 +03:00
|
|
|
* Removes the named instance variable from <i>obj</i>, returning that
|
|
|
|
* variable's value.
|
2018-07-14 20:04:56 +03:00
|
|
|
* String arguments are converted to symbols.
|
2009-02-15 05:45:31 +03:00
|
|
|
*
|
2003-12-28 09:33:07 +03:00
|
|
|
* class Dummy
|
|
|
|
* attr_reader :var
|
|
|
|
* def initialize
|
|
|
|
* @var = 99
|
|
|
|
* end
|
|
|
|
* def remove
|
|
|
|
* remove_instance_variable(:@var)
|
|
|
|
* end
|
|
|
|
* end
|
|
|
|
* d = Dummy.new
|
|
|
|
* d.var #=> 99
|
|
|
|
* d.remove #=> 99
|
|
|
|
* d.var #=> nil
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:19:22 +03: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 14:44:21 +04:00
|
|
|
rb_obj_remove_instance_variable(VALUE obj, VALUE name)
|
1998-01-16 15:19:22 +03:00
|
|
|
{
|
1999-01-20 07:59:39 +03:00
|
|
|
VALUE val = Qnil;
|
2015-10-28 09:24:12 +03:00
|
|
|
const ID id = id_for_var(obj, name, an, instance);
|
2008-10-08 06:23:04 +04:00
|
|
|
st_data_t n, v;
|
2008-02-13 14:52:46 +03:00
|
|
|
struct st_table *iv_index_tbl;
|
2007-09-28 10:21:46 +04:00
|
|
|
st_data_t index;
|
1998-01-16 15:19:22 +03:00
|
|
|
|
* array.c, gc.c, hash.c, object.c, string.c, struct.c,
transcode.c, variable.c, vm.c, vm_insnhelper.c, vm_method.c:
replace calls to rb_error_frozen() with rb_check_frozen(). a
patch from Run Paint Run Run at [ruby-core:32014]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29583 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-10-24 12:14:05 +04:00
|
|
|
rb_check_frozen(obj);
|
2011-07-23 19:05:03 +04:00
|
|
|
if (!id) {
|
2015-10-28 09:24:12 +03:00
|
|
|
goto not_defined;
|
1998-01-16 15:19:22 +03:00
|
|
|
}
|
|
|
|
|
2012-07-28 21:04:58 +04:00
|
|
|
switch (BUILTIN_TYPE(obj)) {
|
1998-01-16 15:19:22 +03:00
|
|
|
case T_OBJECT:
|
2008-02-13 14:52:46 +03:00
|
|
|
iv_index_tbl = ROBJECT_IV_INDEX_TBL(obj);
|
|
|
|
if (!iv_index_tbl) break;
|
2009-07-30 11:10:51 +04:00
|
|
|
if (!st_lookup(iv_index_tbl, (st_data_t)id, &index)) break;
|
2016-04-22 12:47:34 +03:00
|
|
|
if (ROBJECT_NUMIV(obj) <= index) break;
|
2008-02-25 19:18:18 +03:00
|
|
|
val = ROBJECT_IVPTR(obj)[index];
|
2007-09-28 10:21:46 +04:00
|
|
|
if (val != Qundef) {
|
2008-02-25 19:18:18 +03:00
|
|
|
ROBJECT_IVPTR(obj)[index] = Qundef;
|
2007-09-28 10:21:46 +04:00
|
|
|
return val;
|
|
|
|
}
|
|
|
|
break;
|
1998-01-16 15:19:22 +03:00
|
|
|
case T_CLASS:
|
|
|
|
case T_MODULE:
|
2008-10-08 06:23:04 +04:00
|
|
|
n = id;
|
|
|
|
if (RCLASS_IV_TBL(obj) && st_delete(RCLASS_IV_TBL(obj), &n, &v)) {
|
|
|
|
return (VALUE)v;
|
1998-01-16 15:19:22 +03:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
variable.c: remove generic ivar support for special constants
Special constants are all frozen since [Feature #8923] and cannot
support ivars. Remove some unused code we had for supporting them.
* variable.c (special_generic_ivar): remove flag
(givar_i, rb_mark_generic_ivar_tbl): remove functions
(rb_free_generic_ivar, rb_ivar_lookup, rb_ivar_delete,
generic_ivar_set, rb_ivar_set, rb_ivar_defined,
rb_copy_generic_ivar, rb_ivar_foreach, rb_ivar_count,
rb_obj_remove_instance_variable):
adjust for lack of ivar support in special constants
* test/ruby/test_variable.rb: test ivars for special consts
* internal.h: remove rb_mark_generic_ivar_tbl decl
* gc.c (gc_mark_roots): remove rb_mark_generic_ivar_tbl call
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50758 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-06-03 23:53:35 +03:00
|
|
|
if (FL_TEST(obj, FL_EXIVAR)) {
|
2015-10-30 05:37:59 +03:00
|
|
|
if (generic_ivar_remove(obj, id, &val)) {
|
|
|
|
return val;
|
2002-04-10 12:45:26 +04:00
|
|
|
}
|
|
|
|
}
|
1998-01-16 15:19:22 +03:00
|
|
|
break;
|
|
|
|
}
|
2012-04-14 04:36:26 +04:00
|
|
|
|
2015-10-28 09:24:12 +03:00
|
|
|
not_defined:
|
|
|
|
rb_name_err_raise("instance variable %1$s not defined",
|
|
|
|
obj, name);
|
2018-07-24 08:38:07 +03:00
|
|
|
UNREACHABLE_RETURN(Qnil);
|
1998-01-16 15:19:22 +03:00
|
|
|
}
|
|
|
|
|
2014-11-21 19:11:55 +03:00
|
|
|
NORETURN(static void uninitialized_constant(VALUE, VALUE));
|
* eval.c (ev_const_defined, ev_const_get), variable.c
(rb_const_get_at, rb_const_get, rb_mod_remove_const): use Qundef
as autoload marker. [ruby-dev:18103], [ruby-dev:18184]
* eval.c (rb_mod_autoload, rb_mod_autoload_p): new method;
Module#autoload, Module#autoload?.
* variable.c (rb_autoload, rb_autoload_load, rb_autoload_p):
manage autoload constants per classes/modules.
* variable.c (rb_const_defined_at, rb_const_defined): return false
for autoloading constants.
* class.c (rb_define_class, rb_define_module), eval.c (rb_eval),
variable.c (rb_mod_const_at, rb_const_assign): removed autoload
stuff.
* intern.h: prototypes; rb_autoload, rb_autoload_load,
rb_autoload_p.
* lib/optparse.rb (OptionParser::Switch::PlacedArgument::parse):
do not treat unmatched argument as an option.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-05-29 04:11:11 +04:00
|
|
|
static void
|
2014-11-21 19:11:55 +03:00
|
|
|
uninitialized_constant(VALUE klass, VALUE name)
|
* eval.c (ev_const_defined, ev_const_get), variable.c
(rb_const_get_at, rb_const_get, rb_mod_remove_const): use Qundef
as autoload marker. [ruby-dev:18103], [ruby-dev:18184]
* eval.c (rb_mod_autoload, rb_mod_autoload_p): new method;
Module#autoload, Module#autoload?.
* variable.c (rb_autoload, rb_autoload_load, rb_autoload_p):
manage autoload constants per classes/modules.
* variable.c (rb_const_defined_at, rb_const_defined): return false
for autoloading constants.
* class.c (rb_define_class, rb_define_module), eval.c (rb_eval),
variable.c (rb_mod_const_at, rb_const_assign): removed autoload
stuff.
* intern.h: prototypes; rb_autoload, rb_autoload_load,
rb_autoload_p.
* lib/optparse.rb (OptionParser::Switch::PlacedArgument::parse):
do not treat unmatched argument as an option.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-05-29 04:11:11 +04:00
|
|
|
{
|
2010-06-12 04:20:27 +04:00
|
|
|
if (klass && rb_class_real(klass) != rb_cObject)
|
2015-10-28 09:24:12 +03:00
|
|
|
rb_name_err_raise("uninitialized constant %2$s::%1$s",
|
|
|
|
klass, name);
|
|
|
|
else
|
|
|
|
rb_name_err_raise("uninitialized constant %1$s",
|
|
|
|
klass, name);
|
* eval.c (ev_const_defined, ev_const_get), variable.c
(rb_const_get_at, rb_const_get, rb_mod_remove_const): use Qundef
as autoload marker. [ruby-dev:18103], [ruby-dev:18184]
* eval.c (rb_mod_autoload, rb_mod_autoload_p): new method;
Module#autoload, Module#autoload?.
* variable.c (rb_autoload, rb_autoload_load, rb_autoload_p):
manage autoload constants per classes/modules.
* variable.c (rb_const_defined_at, rb_const_defined): return false
for autoloading constants.
* class.c (rb_define_class, rb_define_module), eval.c (rb_eval),
variable.c (rb_mod_const_at, rb_const_assign): removed autoload
stuff.
* intern.h: prototypes; rb_autoload, rb_autoload_load,
rb_autoload_p.
* lib/optparse.rb (OptionParser::Switch::PlacedArgument::parse):
do not treat unmatched argument as an option.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-05-29 04:11:11 +04:00
|
|
|
}
|
|
|
|
|
2014-11-21 19:11:55 +03:00
|
|
|
VALUE
|
|
|
|
rb_const_missing(VALUE klass, VALUE name)
|
2003-07-22 12:42:47 +04:00
|
|
|
{
|
2018-01-22 16:09:37 +03:00
|
|
|
VALUE value = rb_funcallv(klass, idConst_missing, 1, &name);
|
2014-11-21 19:11:55 +03:00
|
|
|
rb_vm_inc_const_missing_count();
|
|
|
|
return value;
|
2003-07-22 12:42:47 +04:00
|
|
|
}
|
|
|
|
|
2003-12-28 09:33:07 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* mod.const_missing(sym) -> obj
|
2003-12-28 09:33:07 +03:00
|
|
|
*
|
2011-06-16 10:17:59 +04:00
|
|
|
* Invoked when a reference is made to an undefined constant in
|
|
|
|
* <i>mod</i>. It is passed a symbol for the undefined constant, and
|
|
|
|
* returns a value to be used for that constant. The
|
2011-06-18 02:33:54 +04:00
|
|
|
* following code is an example of the same:
|
2009-02-15 05:45:31 +03:00
|
|
|
*
|
2011-06-16 10:17:59 +04:00
|
|
|
* def Foo.const_missing(name)
|
|
|
|
* name # return the constant name as Symbol
|
|
|
|
* end
|
|
|
|
*
|
|
|
|
* Foo::UNDEFINED_CONST #=> :UNDEFINED_CONST: symbol returned
|
|
|
|
*
|
|
|
|
* In the next example when a reference is made to an undefined constant,
|
|
|
|
* it attempts to load a file whose name is the lowercase version of the
|
|
|
|
* constant (thus class <code>Fred</code> is assumed to be in file
|
|
|
|
* <code>fred.rb</code>). If found, it returns the loaded class. It
|
|
|
|
* therefore implements an autoload feature similar to Kernel#autoload and
|
|
|
|
* Module#autoload.
|
|
|
|
*
|
|
|
|
* def Object.const_missing(name)
|
|
|
|
* @looked_for ||= {}
|
|
|
|
* str_name = name.to_s
|
|
|
|
* raise "Class not found: #{name}" if @looked_for[str_name]
|
|
|
|
* @looked_for[str_name] = 1
|
|
|
|
* file = str_name.downcase
|
|
|
|
* require file
|
|
|
|
* klass = const_get(name)
|
|
|
|
* return klass if klass
|
|
|
|
* raise "Class not found: #{name}"
|
|
|
|
* end
|
2009-02-15 05:45:31 +03:00
|
|
|
*
|
2003-12-28 09:33:07 +03:00
|
|
|
*/
|
|
|
|
|
2003-07-22 12:42:47 +04: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 14:44:21 +04:00
|
|
|
rb_mod_const_missing(VALUE klass, VALUE name)
|
2003-07-22 12:42:47 +04:00
|
|
|
{
|
2018-07-06 16:56:58 +03:00
|
|
|
VALUE ref = GET_EC()->private_const_reference;
|
2014-01-09 14:12:59 +04:00
|
|
|
rb_vm_pop_cfunc_frame();
|
2018-07-06 16:56:58 +03:00
|
|
|
if (ref) {
|
|
|
|
rb_name_err_raise("private constant %2$s::%1$s referenced",
|
|
|
|
ref, name);
|
|
|
|
}
|
2014-11-21 19:11:55 +03:00
|
|
|
uninitialized_constant(klass, name);
|
2012-04-14 04:36:26 +04:00
|
|
|
|
2018-07-24 08:38:07 +03:00
|
|
|
UNREACHABLE_RETURN(Qnil);
|
2003-07-22 12:42:47 +04:00
|
|
|
}
|
|
|
|
|
2009-09-09 08:09:09 +04:00
|
|
|
static void
|
|
|
|
autoload_mark(void *ptr)
|
* eval.c (ev_const_defined, ev_const_get), variable.c
(rb_const_get_at, rb_const_get, rb_mod_remove_const): use Qundef
as autoload marker. [ruby-dev:18103], [ruby-dev:18184]
* eval.c (rb_mod_autoload, rb_mod_autoload_p): new method;
Module#autoload, Module#autoload?.
* variable.c (rb_autoload, rb_autoload_load, rb_autoload_p):
manage autoload constants per classes/modules.
* variable.c (rb_const_defined_at, rb_const_defined): return false
for autoloading constants.
* class.c (rb_define_class, rb_define_module), eval.c (rb_eval),
variable.c (rb_mod_const_at, rb_const_assign): removed autoload
stuff.
* intern.h: prototypes; rb_autoload, rb_autoload_load,
rb_autoload_p.
* lib/optparse.rb (OptionParser::Switch::PlacedArgument::parse):
do not treat unmatched argument as an option.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-05-29 04:11:11 +04:00
|
|
|
{
|
2019-04-20 04:19:47 +03:00
|
|
|
rb_mark_tbl_no_pin((st_table *)ptr);
|
2009-09-09 08:09:09 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
autoload_free(void *ptr)
|
|
|
|
{
|
|
|
|
st_free_table((st_table *)ptr);
|
* eval.c (ev_const_defined, ev_const_get), variable.c
(rb_const_get_at, rb_const_get, rb_mod_remove_const): use Qundef
as autoload marker. [ruby-dev:18103], [ruby-dev:18184]
* eval.c (rb_mod_autoload, rb_mod_autoload_p): new method;
Module#autoload, Module#autoload?.
* variable.c (rb_autoload, rb_autoload_load, rb_autoload_p):
manage autoload constants per classes/modules.
* variable.c (rb_const_defined_at, rb_const_defined): return false
for autoloading constants.
* class.c (rb_define_class, rb_define_module), eval.c (rb_eval),
variable.c (rb_mod_const_at, rb_const_assign): removed autoload
stuff.
* intern.h: prototypes; rb_autoload, rb_autoload_load,
rb_autoload_p.
* lib/optparse.rb (OptionParser::Switch::PlacedArgument::parse):
do not treat unmatched argument as an option.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-05-29 04:11:11 +04:00
|
|
|
}
|
|
|
|
|
2009-09-09 08:09:09 +04:00
|
|
|
static size_t
|
|
|
|
autoload_memsize(const void *ptr)
|
|
|
|
{
|
|
|
|
const st_table *tbl = ptr;
|
2014-09-13 09:14:51 +04:00
|
|
|
return st_memsize(tbl);
|
2009-09-09 08:09:09 +04:00
|
|
|
}
|
|
|
|
|
2019-04-20 04:19:47 +03:00
|
|
|
static void
|
|
|
|
autoload_compact(void *ptr)
|
|
|
|
{
|
|
|
|
rb_gc_update_tbl_refs((st_table *)ptr);
|
|
|
|
}
|
|
|
|
|
2009-09-09 08:09:09 +04:00
|
|
|
static const rb_data_type_t autoload_data_type = {
|
|
|
|
"autoload",
|
2019-04-20 04:19:47 +03:00
|
|
|
{autoload_mark, autoload_free, autoload_memsize, autoload_compact,},
|
2014-12-01 09:38:04 +03:00
|
|
|
0, 0, RUBY_TYPED_FREE_IMMEDIATELY
|
2009-09-09 08:09:09 +04:00
|
|
|
};
|
|
|
|
|
|
|
|
#define check_autoload_table(av) \
|
2011-01-11 14:33:53 +03:00
|
|
|
(struct st_table *)rb_check_typeddata((av), &autoload_data_type)
|
2009-09-09 08:09:09 +04:00
|
|
|
|
2011-08-31 12:28:19 +04:00
|
|
|
static VALUE
|
|
|
|
autoload_data(VALUE mod, ID id)
|
|
|
|
{
|
|
|
|
struct st_table *tbl;
|
|
|
|
st_data_t val;
|
|
|
|
|
|
|
|
if (!st_lookup(RCLASS_IV_TBL(mod), autoload, &val) ||
|
2015-08-04 06:13:19 +03:00
|
|
|
!(tbl = check_autoload_table((VALUE)val)) ||
|
|
|
|
!st_lookup(tbl, (st_data_t)id, &val)) {
|
2011-08-31 12:28:19 +04:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return (VALUE)val;
|
|
|
|
}
|
|
|
|
|
2018-05-10 11:54:26 +03:00
|
|
|
struct autoload_const {
|
|
|
|
struct list_node cnode; /* <=> autoload_data_i.constants */
|
|
|
|
VALUE mod;
|
|
|
|
VALUE ad; /* autoload_data_i */
|
|
|
|
VALUE value;
|
|
|
|
ID id;
|
|
|
|
int safe_level;
|
|
|
|
rb_const_flag_t flag;
|
|
|
|
};
|
|
|
|
|
2015-10-29 04:14:45 +03:00
|
|
|
/* always on stack, no need to mark */
|
|
|
|
struct autoload_state {
|
2018-05-10 11:54:26 +03:00
|
|
|
struct autoload_const *ac;
|
2015-10-29 04:14:45 +03:00
|
|
|
VALUE result;
|
|
|
|
VALUE thread;
|
2018-01-03 00:51:59 +03:00
|
|
|
struct list_node waitq;
|
2015-10-29 04:14:45 +03:00
|
|
|
};
|
|
|
|
|
2011-08-31 12:28:19 +04:00
|
|
|
struct autoload_data_i {
|
|
|
|
VALUE feature;
|
2015-10-29 04:14:45 +03:00
|
|
|
struct autoload_state *state; /* points to on-stack struct */
|
2018-04-20 06:22:26 +03:00
|
|
|
rb_serial_t fork_gen;
|
2018-05-10 11:54:26 +03:00
|
|
|
struct list_head constants; /* <=> autoload_const.cnode */
|
2011-08-31 12:28:19 +04:00
|
|
|
};
|
|
|
|
|
2019-04-20 04:19:47 +03:00
|
|
|
static void
|
|
|
|
autoload_i_compact(void *ptr)
|
|
|
|
{
|
|
|
|
struct autoload_data_i *p = ptr;
|
2019-05-18 12:23:47 +03:00
|
|
|
p->feature = rb_gc_location(p->feature);
|
2019-04-20 04:19:47 +03:00
|
|
|
}
|
|
|
|
|
2011-08-31 12:28:19 +04:00
|
|
|
static void
|
|
|
|
autoload_i_mark(void *ptr)
|
|
|
|
{
|
|
|
|
struct autoload_data_i *p = ptr;
|
2018-05-10 11:54:26 +03:00
|
|
|
|
2019-08-12 23:09:21 +03:00
|
|
|
rb_gc_mark_movable(p->feature);
|
2018-05-10 11:54:26 +03:00
|
|
|
|
|
|
|
/* allow GC to free us if no modules refer to this via autoload_const.ad */
|
|
|
|
if (list_empty(&p->constants)) {
|
|
|
|
rb_hash_delete(autoload_featuremap, p->feature);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
autoload_i_free(void *ptr)
|
|
|
|
{
|
|
|
|
struct autoload_data_i *p = ptr;
|
|
|
|
|
|
|
|
/* we may leak some memory at VM shutdown time, no big deal */
|
|
|
|
if (list_empty(&p->constants)) {
|
|
|
|
xfree(p);
|
|
|
|
}
|
2011-08-31 12:28:19 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static size_t
|
|
|
|
autoload_i_memsize(const void *ptr)
|
|
|
|
{
|
|
|
|
return sizeof(struct autoload_data_i);
|
|
|
|
}
|
|
|
|
|
|
|
|
static const rb_data_type_t autoload_data_i_type = {
|
|
|
|
"autoload_i",
|
2019-04-20 04:19:47 +03:00
|
|
|
{autoload_i_mark, autoload_i_free, autoload_i_memsize, autoload_i_compact},
|
2018-05-10 11:54:26 +03:00
|
|
|
0, 0, RUBY_TYPED_FREE_IMMEDIATELY
|
|
|
|
};
|
|
|
|
|
2019-05-31 23:25:24 +03:00
|
|
|
static void
|
|
|
|
autoload_c_compact(void *ptr)
|
|
|
|
{
|
|
|
|
struct autoload_const *ac = ptr;
|
|
|
|
|
|
|
|
ac->mod = rb_gc_location(ac->mod);
|
|
|
|
ac->ad = rb_gc_location(ac->ad);
|
|
|
|
ac->value = rb_gc_location(ac->value);
|
|
|
|
}
|
|
|
|
|
2018-05-10 11:54:26 +03:00
|
|
|
static void
|
|
|
|
autoload_c_mark(void *ptr)
|
|
|
|
{
|
|
|
|
struct autoload_const *ac = ptr;
|
|
|
|
|
2019-08-12 23:09:21 +03:00
|
|
|
rb_gc_mark_movable(ac->mod);
|
|
|
|
rb_gc_mark_movable(ac->ad);
|
|
|
|
rb_gc_mark_movable(ac->value);
|
2018-05-10 11:54:26 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
autoload_c_free(void *ptr)
|
|
|
|
{
|
|
|
|
struct autoload_const *ac = ptr;
|
|
|
|
list_del(&ac->cnode);
|
|
|
|
xfree(ac);
|
|
|
|
}
|
|
|
|
|
|
|
|
static size_t
|
|
|
|
autoload_c_memsize(const void *ptr)
|
|
|
|
{
|
|
|
|
return sizeof(struct autoload_const);
|
|
|
|
}
|
|
|
|
|
|
|
|
static const rb_data_type_t autoload_const_type = {
|
|
|
|
"autoload_const",
|
2019-05-31 23:25:24 +03:00
|
|
|
{autoload_c_mark, autoload_c_free, autoload_c_memsize, autoload_c_compact,},
|
2014-12-01 09:38:04 +03:00
|
|
|
0, 0, RUBY_TYPED_FREE_IMMEDIATELY
|
2011-08-31 12:28:19 +04:00
|
|
|
};
|
|
|
|
|
2018-04-20 06:22:26 +03:00
|
|
|
static struct autoload_data_i *
|
2018-05-10 11:54:26 +03:00
|
|
|
get_autoload_data(VALUE acv, struct autoload_const **acp)
|
2018-04-20 06:22:26 +03:00
|
|
|
{
|
2018-05-10 11:54:26 +03:00
|
|
|
struct autoload_const *ac = rb_check_typeddata(acv, &autoload_const_type);
|
|
|
|
struct autoload_data_i *ele;
|
2018-04-20 06:22:26 +03:00
|
|
|
|
2018-05-10 11:54:26 +03:00
|
|
|
ele = rb_check_typeddata(ac->ad, &autoload_data_i_type);
|
2018-04-20 06:22:26 +03:00
|
|
|
/* do not reach across stack for ->state after forking: */
|
|
|
|
if (ele && ele->state && ele->fork_gen != GET_VM()->fork_gen) {
|
|
|
|
ele->state = 0;
|
|
|
|
ele->fork_gen = 0;
|
|
|
|
}
|
2018-05-10 11:54:26 +03:00
|
|
|
if (acp) *acp = ac;
|
2018-04-20 06:22:26 +03:00
|
|
|
return ele;
|
|
|
|
}
|
2011-08-31 12:28:19 +04:00
|
|
|
|
2017-12-26 08:30:31 +03:00
|
|
|
RUBY_FUNC_EXPORTED 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 14:44:21 +04:00
|
|
|
rb_autoload(VALUE mod, ID id, const char *file)
|
introduce rb_autoload_str to replace rb_autoload
rb_autoload_str may be safer by preventing premature GC. It
can also be more efficient by passing a pre-frozen string that
can be deduped using rb_fstring. Common autoload callers (e.g.
rubygems, rdoc) already use string literals as the file
argument.
There seems to be no reason to expose rb_autoload_str to the
public C API since autoload is not performance-critical.
Applications may declare autoloads in Ruby code or via
rb_funcall; so merely deprecate rb_autoload without exposing
rb_autoload_str to new users.
Running: valgrind -v ruby -rrdoc -rubygems -e exit
shows a minor memory reduction (32-bit userspace)
before:
in use at exit: 1,600,621 bytes in 28,819 blocks
total heap usage: 55,786 allocs, 26,967 frees, 6,693,790 bytes allocated
after:
in use at exit: 1,599,778 bytes in 28,789 blocks
total heap usage: 55,739 allocs, 26,950 frees, 6,692,973 bytes allocated
* include/ruby/intern.h (rb_autoload): deprecate
* internal.h (rb_autoload_str): declare
* load.c (rb_mod_autoload): use rb_autoload_str
* variable.c (rb_autoload): become compatibility wrapper
(rb_autoload_str): hoisted out from old rb_autoload
[ruby-core:71369] [Feature #11664]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52909 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-06 15:28:09 +03:00
|
|
|
{
|
|
|
|
if (!file || !*file) {
|
|
|
|
rb_raise(rb_eArgError, "empty file name");
|
|
|
|
}
|
|
|
|
rb_autoload_str(mod, id, rb_fstring_cstr(file));
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
rb_autoload_str(VALUE mod, ID id, VALUE file)
|
* eval.c (ev_const_defined, ev_const_get), variable.c
(rb_const_get_at, rb_const_get, rb_mod_remove_const): use Qundef
as autoload marker. [ruby-dev:18103], [ruby-dev:18184]
* eval.c (rb_mod_autoload, rb_mod_autoload_p): new method;
Module#autoload, Module#autoload?.
* variable.c (rb_autoload, rb_autoload_load, rb_autoload_p):
manage autoload constants per classes/modules.
* variable.c (rb_const_defined_at, rb_const_defined): return false
for autoloading constants.
* class.c (rb_define_class, rb_define_module), eval.c (rb_eval),
variable.c (rb_mod_const_at, rb_const_assign): removed autoload
stuff.
* intern.h: prototypes; rb_autoload, rb_autoload_load,
rb_autoload_p.
* lib/optparse.rb (OptionParser::Switch::PlacedArgument::parse):
do not treat unmatched argument as an option.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-05-29 04:11:11 +04:00
|
|
|
{
|
2009-07-30 11:10:51 +04:00
|
|
|
st_data_t av;
|
introduce rb_autoload_str to replace rb_autoload
rb_autoload_str may be safer by preventing premature GC. It
can also be more efficient by passing a pre-frozen string that
can be deduped using rb_fstring. Common autoload callers (e.g.
rubygems, rdoc) already use string literals as the file
argument.
There seems to be no reason to expose rb_autoload_str to the
public C API since autoload is not performance-critical.
Applications may declare autoloads in Ruby code or via
rb_funcall; so merely deprecate rb_autoload without exposing
rb_autoload_str to new users.
Running: valgrind -v ruby -rrdoc -rubygems -e exit
shows a minor memory reduction (32-bit userspace)
before:
in use at exit: 1,600,621 bytes in 28,819 blocks
total heap usage: 55,786 allocs, 26,967 frees, 6,693,790 bytes allocated
after:
in use at exit: 1,599,778 bytes in 28,789 blocks
total heap usage: 55,739 allocs, 26,950 frees, 6,692,973 bytes allocated
* include/ruby/intern.h (rb_autoload): deprecate
* internal.h (rb_autoload_str): declare
* load.c (rb_mod_autoload): use rb_autoload_str
* variable.c (rb_autoload): become compatibility wrapper
(rb_autoload_str): hoisted out from old rb_autoload
[ruby-core:71369] [Feature #11664]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52909 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-06 15:28:09 +03:00
|
|
|
VALUE ad;
|
* eval.c (ev_const_defined, ev_const_get), variable.c
(rb_const_get_at, rb_const_get, rb_mod_remove_const): use Qundef
as autoload marker. [ruby-dev:18103], [ruby-dev:18184]
* eval.c (rb_mod_autoload, rb_mod_autoload_p): new method;
Module#autoload, Module#autoload?.
* variable.c (rb_autoload, rb_autoload_load, rb_autoload_p):
manage autoload constants per classes/modules.
* variable.c (rb_const_defined_at, rb_const_defined): return false
for autoloading constants.
* class.c (rb_define_class, rb_define_module), eval.c (rb_eval),
variable.c (rb_mod_const_at, rb_const_assign): removed autoload
stuff.
* intern.h: prototypes; rb_autoload, rb_autoload_load,
rb_autoload_p.
* lib/optparse.rb (OptionParser::Switch::PlacedArgument::parse):
do not treat unmatched argument as an option.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-05-29 04:11:11 +04:00
|
|
|
struct st_table *tbl;
|
2011-08-31 12:28:19 +04:00
|
|
|
struct autoload_data_i *ele;
|
2014-08-04 05:12:53 +04:00
|
|
|
rb_const_entry_t *ce;
|
* eval.c (ev_const_defined, ev_const_get), variable.c
(rb_const_get_at, rb_const_get, rb_mod_remove_const): use Qundef
as autoload marker. [ruby-dev:18103], [ruby-dev:18184]
* eval.c (rb_mod_autoload, rb_mod_autoload_p): new method;
Module#autoload, Module#autoload?.
* variable.c (rb_autoload, rb_autoload_load, rb_autoload_p):
manage autoload constants per classes/modules.
* variable.c (rb_const_defined_at, rb_const_defined): return false
for autoloading constants.
* class.c (rb_define_class, rb_define_module), eval.c (rb_eval),
variable.c (rb_mod_const_at, rb_const_assign): removed autoload
stuff.
* intern.h: prototypes; rb_autoload, rb_autoload_load,
rb_autoload_p.
* lib/optparse.rb (OptionParser::Switch::PlacedArgument::parse):
do not treat unmatched argument as an option.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-05-29 04:11:11 +04:00
|
|
|
|
|
|
|
if (!rb_is_const_id(id)) {
|
2012-12-22 19:04:57 +04:00
|
|
|
rb_raise(rb_eNameError, "autoload must be constant name: %"PRIsVALUE"",
|
|
|
|
QUOTE_ID(id));
|
* eval.c (ev_const_defined, ev_const_get), variable.c
(rb_const_get_at, rb_const_get, rb_mod_remove_const): use Qundef
as autoload marker. [ruby-dev:18103], [ruby-dev:18184]
* eval.c (rb_mod_autoload, rb_mod_autoload_p): new method;
Module#autoload, Module#autoload?.
* variable.c (rb_autoload, rb_autoload_load, rb_autoload_p):
manage autoload constants per classes/modules.
* variable.c (rb_const_defined_at, rb_const_defined): return false
for autoloading constants.
* class.c (rb_define_class, rb_define_module), eval.c (rb_eval),
variable.c (rb_mod_const_at, rb_const_assign): removed autoload
stuff.
* intern.h: prototypes; rb_autoload, rb_autoload_load,
rb_autoload_p.
* lib/optparse.rb (OptionParser::Switch::PlacedArgument::parse):
do not treat unmatched argument as an option.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-05-29 04:11:11 +04:00
|
|
|
}
|
introduce rb_autoload_str to replace rb_autoload
rb_autoload_str may be safer by preventing premature GC. It
can also be more efficient by passing a pre-frozen string that
can be deduped using rb_fstring. Common autoload callers (e.g.
rubygems, rdoc) already use string literals as the file
argument.
There seems to be no reason to expose rb_autoload_str to the
public C API since autoload is not performance-critical.
Applications may declare autoloads in Ruby code or via
rb_funcall; so merely deprecate rb_autoload without exposing
rb_autoload_str to new users.
Running: valgrind -v ruby -rrdoc -rubygems -e exit
shows a minor memory reduction (32-bit userspace)
before:
in use at exit: 1,600,621 bytes in 28,819 blocks
total heap usage: 55,786 allocs, 26,967 frees, 6,693,790 bytes allocated
after:
in use at exit: 1,599,778 bytes in 28,789 blocks
total heap usage: 55,739 allocs, 26,950 frees, 6,692,973 bytes allocated
* include/ruby/intern.h (rb_autoload): deprecate
* internal.h (rb_autoload_str): declare
* load.c (rb_mod_autoload): use rb_autoload_str
* variable.c (rb_autoload): become compatibility wrapper
(rb_autoload_str): hoisted out from old rb_autoload
[ruby-core:71369] [Feature #11664]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52909 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-06 15:28:09 +03:00
|
|
|
|
|
|
|
Check_Type(file, T_STRING);
|
|
|
|
if (!RSTRING_LEN(file)) {
|
* eval.c (ev_const_defined, ev_const_get), variable.c
(rb_const_get_at, rb_const_get, rb_mod_remove_const): use Qundef
as autoload marker. [ruby-dev:18103], [ruby-dev:18184]
* eval.c (rb_mod_autoload, rb_mod_autoload_p): new method;
Module#autoload, Module#autoload?.
* variable.c (rb_autoload, rb_autoload_load, rb_autoload_p):
manage autoload constants per classes/modules.
* variable.c (rb_const_defined_at, rb_const_defined): return false
for autoloading constants.
* class.c (rb_define_class, rb_define_module), eval.c (rb_eval),
variable.c (rb_mod_const_at, rb_const_assign): removed autoload
stuff.
* intern.h: prototypes; rb_autoload, rb_autoload_load,
rb_autoload_p.
* lib/optparse.rb (OptionParser::Switch::PlacedArgument::parse):
do not treat unmatched argument as an option.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-05-29 04:11:11 +04:00
|
|
|
rb_raise(rb_eArgError, "empty file name");
|
|
|
|
}
|
|
|
|
|
2014-08-04 05:12:53 +04:00
|
|
|
ce = rb_const_lookup(mod, id);
|
|
|
|
if (ce && ce->value != Qundef) {
|
* eval.c (ev_const_defined, ev_const_get), variable.c
(rb_const_get_at, rb_const_get, rb_mod_remove_const): use Qundef
as autoload marker. [ruby-dev:18103], [ruby-dev:18184]
* eval.c (rb_mod_autoload, rb_mod_autoload_p): new method;
Module#autoload, Module#autoload?.
* variable.c (rb_autoload, rb_autoload_load, rb_autoload_p):
manage autoload constants per classes/modules.
* variable.c (rb_const_defined_at, rb_const_defined): return false
for autoloading constants.
* class.c (rb_define_class, rb_define_module), eval.c (rb_eval),
variable.c (rb_mod_const_at, rb_const_assign): removed autoload
stuff.
* intern.h: prototypes; rb_autoload, rb_autoload_load,
rb_autoload_p.
* lib/optparse.rb (OptionParser::Switch::PlacedArgument::parse):
do not treat unmatched argument as an option.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-05-29 04:11:11 +04:00
|
|
|
return;
|
2014-08-04 05:12:53 +04:00
|
|
|
}
|
* eval.c (ev_const_defined, ev_const_get), variable.c
(rb_const_get_at, rb_const_get, rb_mod_remove_const): use Qundef
as autoload marker. [ruby-dev:18103], [ruby-dev:18184]
* eval.c (rb_mod_autoload, rb_mod_autoload_p): new method;
Module#autoload, Module#autoload?.
* variable.c (rb_autoload, rb_autoload_load, rb_autoload_p):
manage autoload constants per classes/modules.
* variable.c (rb_const_defined_at, rb_const_defined): return false
for autoloading constants.
* class.c (rb_define_class, rb_define_module), eval.c (rb_eval),
variable.c (rb_mod_const_at, rb_const_assign): removed autoload
stuff.
* intern.h: prototypes; rb_autoload, rb_autoload_load,
rb_autoload_p.
* lib/optparse.rb (OptionParser::Switch::PlacedArgument::parse):
do not treat unmatched argument as an option.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-05-29 04:11:11 +04:00
|
|
|
|
|
|
|
rb_const_set(mod, id, Qundef);
|
2007-09-28 10:21:46 +04:00
|
|
|
tbl = RCLASS_IV_TBL(mod);
|
2010-10-26 21:27:21 +04:00
|
|
|
if (tbl && st_lookup(tbl, (st_data_t)autoload, &av)) {
|
2009-07-30 11:10:51 +04:00
|
|
|
tbl = check_autoload_table((VALUE)av);
|
* eval.c (ev_const_defined, ev_const_get), variable.c
(rb_const_get_at, rb_const_get, rb_mod_remove_const): use Qundef
as autoload marker. [ruby-dev:18103], [ruby-dev:18184]
* eval.c (rb_mod_autoload, rb_mod_autoload_p): new method;
Module#autoload, Module#autoload?.
* variable.c (rb_autoload, rb_autoload_load, rb_autoload_p):
manage autoload constants per classes/modules.
* variable.c (rb_const_defined_at, rb_const_defined): return false
for autoloading constants.
* class.c (rb_define_class, rb_define_module), eval.c (rb_eval),
variable.c (rb_mod_const_at, rb_const_assign): removed autoload
stuff.
* intern.h: prototypes; rb_autoload, rb_autoload_load,
rb_autoload_p.
* lib/optparse.rb (OptionParser::Switch::PlacedArgument::parse):
do not treat unmatched argument as an option.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-05-29 04:11:11 +04:00
|
|
|
}
|
|
|
|
else {
|
2010-10-26 21:27:21 +04:00
|
|
|
if (!tbl) tbl = RCLASS_IV_TBL(mod) = st_init_numtable();
|
2009-09-09 08:33:13 +04:00
|
|
|
av = (st_data_t)TypedData_Wrap_Struct(0, &autoload_data_type, 0);
|
2009-07-30 11:10:51 +04:00
|
|
|
st_add_direct(tbl, (st_data_t)autoload, av);
|
* include/ruby/ruby.h: rename OBJ_WRITE and OBJ_WRITTEN into
RB_OBJ_WRITE and RB_OBJ_WRITTEN.
* array.c, class.c, compile.c, hash.c, internal.h, iseq.c,
proc.c, process.c, re.c, string.c, variable.c, vm.c,
vm_eval.c, vm_insnhelper.c, vm_insnhelper.h,
vm_method.c: catch up this change.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44299 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-20 12:07:47 +04:00
|
|
|
RB_OBJ_WRITTEN(mod, Qnil, av);
|
* eval.c (ev_const_defined, ev_const_get), variable.c
(rb_const_get_at, rb_const_get, rb_mod_remove_const): use Qundef
as autoload marker. [ruby-dev:18103], [ruby-dev:18184]
* eval.c (rb_mod_autoload, rb_mod_autoload_p): new method;
Module#autoload, Module#autoload?.
* variable.c (rb_autoload, rb_autoload_load, rb_autoload_p):
manage autoload constants per classes/modules.
* variable.c (rb_const_defined_at, rb_const_defined): return false
for autoloading constants.
* class.c (rb_define_class, rb_define_module), eval.c (rb_eval),
variable.c (rb_mod_const_at, rb_const_assign): removed autoload
stuff.
* intern.h: prototypes; rb_autoload, rb_autoload_load,
rb_autoload_p.
* lib/optparse.rb (OptionParser::Switch::PlacedArgument::parse):
do not treat unmatched argument as an option.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-05-29 04:11:11 +04:00
|
|
|
DATA_PTR(av) = tbl = st_init_numtable();
|
|
|
|
}
|
2011-08-31 12:35:27 +04:00
|
|
|
|
introduce rb_autoload_str to replace rb_autoload
rb_autoload_str may be safer by preventing premature GC. It
can also be more efficient by passing a pre-frozen string that
can be deduped using rb_fstring. Common autoload callers (e.g.
rubygems, rdoc) already use string literals as the file
argument.
There seems to be no reason to expose rb_autoload_str to the
public C API since autoload is not performance-critical.
Applications may declare autoloads in Ruby code or via
rb_funcall; so merely deprecate rb_autoload without exposing
rb_autoload_str to new users.
Running: valgrind -v ruby -rrdoc -rubygems -e exit
shows a minor memory reduction (32-bit userspace)
before:
in use at exit: 1,600,621 bytes in 28,819 blocks
total heap usage: 55,786 allocs, 26,967 frees, 6,693,790 bytes allocated
after:
in use at exit: 1,599,778 bytes in 28,789 blocks
total heap usage: 55,739 allocs, 26,950 frees, 6,692,973 bytes allocated
* include/ruby/intern.h (rb_autoload): deprecate
* internal.h (rb_autoload_str): declare
* load.c (rb_mod_autoload): use rb_autoload_str
* variable.c (rb_autoload): become compatibility wrapper
(rb_autoload_str): hoisted out from old rb_autoload
[ruby-core:71369] [Feature #11664]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52909 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-06 15:28:09 +03:00
|
|
|
if (OBJ_TAINTED(file)) {
|
|
|
|
file = rb_str_dup(file);
|
|
|
|
FL_UNSET(file, FL_TAINT);
|
|
|
|
}
|
2018-05-10 11:54:26 +03:00
|
|
|
file = rb_fstring(file);
|
|
|
|
if (!autoload_featuremap) {
|
2019-07-02 20:09:01 +03:00
|
|
|
autoload_featuremap = rb_ident_hash_new();
|
2018-05-10 11:54:26 +03:00
|
|
|
rb_obj_hide(autoload_featuremap);
|
|
|
|
rb_gc_register_mark_object(autoload_featuremap);
|
|
|
|
}
|
|
|
|
ad = rb_hash_aref(autoload_featuremap, file);
|
|
|
|
if (NIL_P(ad)) {
|
|
|
|
ad = TypedData_Make_Struct(0, struct autoload_data_i,
|
|
|
|
&autoload_data_i_type, ele);
|
|
|
|
ele->feature = file;
|
|
|
|
ele->state = 0;
|
|
|
|
list_head_init(&ele->constants);
|
|
|
|
rb_hash_aset(autoload_featuremap, file, ad);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
ele = rb_check_typeddata(ad, &autoload_data_i_type);
|
|
|
|
}
|
|
|
|
{
|
|
|
|
VALUE acv;
|
|
|
|
struct autoload_const *ac;
|
|
|
|
acv = TypedData_Make_Struct(0, struct autoload_const,
|
|
|
|
&autoload_const_type, ac);
|
|
|
|
ac->mod = mod;
|
|
|
|
ac->id = id;
|
|
|
|
ac->value = Qundef;
|
|
|
|
ac->safe_level = rb_safe_level();
|
|
|
|
ac->flag = CONST_PUBLIC;
|
|
|
|
ac->ad = ad;
|
|
|
|
list_add_tail(&ele->constants, &ac->cnode);
|
|
|
|
st_insert(tbl, (st_data_t)id, (st_data_t)acv);
|
|
|
|
}
|
* eval.c (ev_const_defined, ev_const_get), variable.c
(rb_const_get_at, rb_const_get, rb_mod_remove_const): use Qundef
as autoload marker. [ruby-dev:18103], [ruby-dev:18184]
* eval.c (rb_mod_autoload, rb_mod_autoload_p): new method;
Module#autoload, Module#autoload?.
* variable.c (rb_autoload, rb_autoload_load, rb_autoload_p):
manage autoload constants per classes/modules.
* variable.c (rb_const_defined_at, rb_const_defined): return false
for autoloading constants.
* class.c (rb_define_class, rb_define_module), eval.c (rb_eval),
variable.c (rb_mod_const_at, rb_const_assign): removed autoload
stuff.
* intern.h: prototypes; rb_autoload, rb_autoload_load,
rb_autoload_p.
* lib/optparse.rb (OptionParser::Switch::PlacedArgument::parse):
do not treat unmatched argument as an option.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-05-29 04:11:11 +04:00
|
|
|
}
|
|
|
|
|
2011-08-31 12:28:19 +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 14:44:21 +04:00
|
|
|
autoload_delete(VALUE mod, ID id)
|
* eval.c (ev_const_defined, ev_const_get), variable.c
(rb_const_get_at, rb_const_get, rb_mod_remove_const): use Qundef
as autoload marker. [ruby-dev:18103], [ruby-dev:18184]
* eval.c (rb_mod_autoload, rb_mod_autoload_p): new method;
Module#autoload, Module#autoload?.
* variable.c (rb_autoload, rb_autoload_load, rb_autoload_p):
manage autoload constants per classes/modules.
* variable.c (rb_const_defined_at, rb_const_defined): return false
for autoloading constants.
* class.c (rb_define_class, rb_define_module), eval.c (rb_eval),
variable.c (rb_mod_const_at, rb_const_assign): removed autoload
stuff.
* intern.h: prototypes; rb_autoload, rb_autoload_load,
rb_autoload_p.
* lib/optparse.rb (OptionParser::Switch::PlacedArgument::parse):
do not treat unmatched argument as an option.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-05-29 04:11:11 +04:00
|
|
|
{
|
2008-10-08 06:23:04 +04:00
|
|
|
st_data_t val, load = 0, n = id;
|
* eval.c (ev_const_defined, ev_const_get), variable.c
(rb_const_get_at, rb_const_get, rb_mod_remove_const): use Qundef
as autoload marker. [ruby-dev:18103], [ruby-dev:18184]
* eval.c (rb_mod_autoload, rb_mod_autoload_p): new method;
Module#autoload, Module#autoload?.
* variable.c (rb_autoload, rb_autoload_load, rb_autoload_p):
manage autoload constants per classes/modules.
* variable.c (rb_const_defined_at, rb_const_defined): return false
for autoloading constants.
* class.c (rb_define_class, rb_define_module), eval.c (rb_eval),
variable.c (rb_mod_const_at, rb_const_assign): removed autoload
stuff.
* intern.h: prototypes; rb_autoload, rb_autoload_load,
rb_autoload_p.
* lib/optparse.rb (OptionParser::Switch::PlacedArgument::parse):
do not treat unmatched argument as an option.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-05-29 04:11:11 +04:00
|
|
|
|
2009-07-30 11:10:51 +04:00
|
|
|
if (st_lookup(RCLASS_IV_TBL(mod), (st_data_t)autoload, &val)) {
|
2008-10-08 06:23:04 +04:00
|
|
|
struct st_table *tbl = check_autoload_table((VALUE)val);
|
2018-05-10 11:54:26 +03:00
|
|
|
struct autoload_data_i *ele;
|
|
|
|
struct autoload_const *ac;
|
* eval.c (ev_const_defined, ev_const_get), variable.c
(rb_const_get_at, rb_const_get, rb_mod_remove_const): use Qundef
as autoload marker. [ruby-dev:18103], [ruby-dev:18184]
* eval.c (rb_mod_autoload, rb_mod_autoload_p): new method;
Module#autoload, Module#autoload?.
* variable.c (rb_autoload, rb_autoload_load, rb_autoload_p):
manage autoload constants per classes/modules.
* variable.c (rb_const_defined_at, rb_const_defined): return false
for autoloading constants.
* class.c (rb_define_class, rb_define_module), eval.c (rb_eval),
variable.c (rb_mod_const_at, rb_const_assign): removed autoload
stuff.
* intern.h: prototypes; rb_autoload, rb_autoload_load,
rb_autoload_p.
* lib/optparse.rb (OptionParser::Switch::PlacedArgument::parse):
do not treat unmatched argument as an option.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-05-29 04:11:11 +04:00
|
|
|
|
2008-10-08 06:23:04 +04:00
|
|
|
st_delete(tbl, &n, &load);
|
2018-05-10 11:54:26 +03:00
|
|
|
ele = get_autoload_data((VALUE)load, &ac);
|
|
|
|
VM_ASSERT(ele);
|
|
|
|
if (ele) {
|
|
|
|
VM_ASSERT(!list_empty(&ele->constants));
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* we must delete here to avoid "already initialized" warnings
|
|
|
|
* with parallel autoload. Using list_del_init here so list_del
|
|
|
|
* works in autoload_c_free
|
|
|
|
*/
|
|
|
|
list_del_init(&ac->cnode);
|
2018-05-10 04:19:20 +03:00
|
|
|
|
2003-06-25 09:28:24 +04:00
|
|
|
if (tbl->num_entries == 0) {
|
2008-10-08 06:23:04 +04:00
|
|
|
n = autoload;
|
2011-08-11 10:51:42 +04:00
|
|
|
st_delete(RCLASS_IV_TBL(mod), &n, &val);
|
* eval.c (ev_const_defined, ev_const_get), variable.c
(rb_const_get_at, rb_const_get, rb_mod_remove_const): use Qundef
as autoload marker. [ruby-dev:18103], [ruby-dev:18184]
* eval.c (rb_mod_autoload, rb_mod_autoload_p): new method;
Module#autoload, Module#autoload?.
* variable.c (rb_autoload, rb_autoload_load, rb_autoload_p):
manage autoload constants per classes/modules.
* variable.c (rb_const_defined_at, rb_const_defined): return false
for autoloading constants.
* class.c (rb_define_class, rb_define_module), eval.c (rb_eval),
variable.c (rb_mod_const_at, rb_const_assign): removed autoload
stuff.
* intern.h: prototypes; rb_autoload, rb_autoload_load,
rb_autoload_p.
* lib/optparse.rb (OptionParser::Switch::PlacedArgument::parse):
do not treat unmatched argument as an option.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-05-29 04:11:11 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-12-04 21:29:20 +03:00
|
|
|
static VALUE
|
|
|
|
autoload_provided(VALUE arg)
|
* eval.c (ev_const_defined, ev_const_get), variable.c
(rb_const_get_at, rb_const_get, rb_mod_remove_const): use Qundef
as autoload marker. [ruby-dev:18103], [ruby-dev:18184]
* eval.c (rb_mod_autoload, rb_mod_autoload_p): new method;
Module#autoload, Module#autoload?.
* variable.c (rb_autoload, rb_autoload_load, rb_autoload_p):
manage autoload constants per classes/modules.
* variable.c (rb_const_defined_at, rb_const_defined): return false
for autoloading constants.
* class.c (rb_define_class, rb_define_module), eval.c (rb_eval),
variable.c (rb_mod_const_at, rb_const_assign): removed autoload
stuff.
* intern.h: prototypes; rb_autoload, rb_autoload_load,
rb_autoload_p.
* lib/optparse.rb (OptionParser::Switch::PlacedArgument::parse):
do not treat unmatched argument as an option.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-05-29 04:11:11 +04:00
|
|
|
{
|
2008-12-04 21:29:20 +03:00
|
|
|
const char **p = (const char **)arg;
|
|
|
|
return rb_feature_provided(*p, p);
|
* eval.c (ev_const_defined, ev_const_get), variable.c
(rb_const_get_at, rb_const_get, rb_mod_remove_const): use Qundef
as autoload marker. [ruby-dev:18103], [ruby-dev:18184]
* eval.c (rb_mod_autoload, rb_mod_autoload_p): new method;
Module#autoload, Module#autoload?.
* variable.c (rb_autoload, rb_autoload_load, rb_autoload_p):
manage autoload constants per classes/modules.
* variable.c (rb_const_defined_at, rb_const_defined): return false
for autoloading constants.
* class.c (rb_define_class, rb_define_module), eval.c (rb_eval),
variable.c (rb_mod_const_at, rb_const_assign): removed autoload
stuff.
* intern.h: prototypes; rb_autoload, rb_autoload_load,
rb_autoload_p.
* lib/optparse.rb (OptionParser::Switch::PlacedArgument::parse):
do not treat unmatched argument as an option.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-05-29 04:11:11 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
2008-12-04 21:29:20 +03:00
|
|
|
reset_safe(VALUE safe)
|
|
|
|
{
|
|
|
|
rb_set_safe_level_force((int)safe);
|
|
|
|
return safe;
|
|
|
|
}
|
|
|
|
|
2011-08-31 12:28:19 +04:00
|
|
|
static VALUE
|
|
|
|
check_autoload_required(VALUE mod, ID id, const char **loadingpath)
|
* eval.c (ev_const_defined, ev_const_get), variable.c
(rb_const_get_at, rb_const_get, rb_mod_remove_const): use Qundef
as autoload marker. [ruby-dev:18103], [ruby-dev:18184]
* eval.c (rb_mod_autoload, rb_mod_autoload_p): new method;
Module#autoload, Module#autoload?.
* variable.c (rb_autoload, rb_autoload_load, rb_autoload_p):
manage autoload constants per classes/modules.
* variable.c (rb_const_defined_at, rb_const_defined): return false
for autoloading constants.
* class.c (rb_define_class, rb_define_module), eval.c (rb_eval),
variable.c (rb_mod_const_at, rb_const_assign): removed autoload
stuff.
* intern.h: prototypes; rb_autoload, rb_autoload_load,
rb_autoload_p.
* lib/optparse.rb (OptionParser::Switch::PlacedArgument::parse):
do not treat unmatched argument as an option.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-05-29 04:11:11 +04:00
|
|
|
{
|
2018-05-10 11:54:26 +03:00
|
|
|
VALUE file;
|
|
|
|
VALUE load = autoload_data(mod, id);
|
2011-08-31 12:28:19 +04:00
|
|
|
struct autoload_data_i *ele;
|
2008-12-04 21:29:20 +03:00
|
|
|
const char *loading;
|
|
|
|
int safe;
|
* eval.c (ev_const_defined, ev_const_get), variable.c
(rb_const_get_at, rb_const_get, rb_mod_remove_const): use Qundef
as autoload marker. [ruby-dev:18103], [ruby-dev:18184]
* eval.c (rb_mod_autoload, rb_mod_autoload_p): new method;
Module#autoload, Module#autoload?.
* variable.c (rb_autoload, rb_autoload_load, rb_autoload_p):
manage autoload constants per classes/modules.
* variable.c (rb_const_defined_at, rb_const_defined): return false
for autoloading constants.
* class.c (rb_define_class, rb_define_module), eval.c (rb_eval),
variable.c (rb_mod_const_at, rb_const_assign): removed autoload
stuff.
* intern.h: prototypes; rb_autoload, rb_autoload_load,
rb_autoload_p.
* lib/optparse.rb (OptionParser::Switch::PlacedArgument::parse):
do not treat unmatched argument as an option.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-05-29 04:11:11 +04:00
|
|
|
|
2018-05-10 11:54:26 +03:00
|
|
|
if (!load || !(ele = get_autoload_data(load, 0))) {
|
2008-12-04 21:29:20 +03:00
|
|
|
return 0;
|
* eval.c (ev_const_defined, ev_const_get), variable.c
(rb_const_get_at, rb_const_get, rb_mod_remove_const): use Qundef
as autoload marker. [ruby-dev:18103], [ruby-dev:18184]
* eval.c (rb_mod_autoload, rb_mod_autoload_p): new method;
Module#autoload, Module#autoload?.
* variable.c (rb_autoload, rb_autoload_load, rb_autoload_p):
manage autoload constants per classes/modules.
* variable.c (rb_const_defined_at, rb_const_defined): return false
for autoloading constants.
* class.c (rb_define_class, rb_define_module), eval.c (rb_eval),
variable.c (rb_mod_const_at, rb_const_assign): removed autoload
stuff.
* intern.h: prototypes; rb_autoload, rb_autoload_load,
rb_autoload_p.
* lib/optparse.rb (OptionParser::Switch::PlacedArgument::parse):
do not treat unmatched argument as an option.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-05-29 04:11:11 +04:00
|
|
|
}
|
2011-08-31 12:28:19 +04:00
|
|
|
file = ele->feature;
|
* eval.c (ev_const_defined, ev_const_get), variable.c
(rb_const_get_at, rb_const_get, rb_mod_remove_const): use Qundef
as autoload marker. [ruby-dev:18103], [ruby-dev:18184]
* eval.c (rb_mod_autoload, rb_mod_autoload_p): new method;
Module#autoload, Module#autoload?.
* variable.c (rb_autoload, rb_autoload_load, rb_autoload_p):
manage autoload constants per classes/modules.
* variable.c (rb_const_defined_at, rb_const_defined): return false
for autoloading constants.
* class.c (rb_define_class, rb_define_module), eval.c (rb_eval),
variable.c (rb_mod_const_at, rb_const_assign): removed autoload
stuff.
* intern.h: prototypes; rb_autoload, rb_autoload_load,
rb_autoload_p.
* lib/optparse.rb (OptionParser::Switch::PlacedArgument::parse):
do not treat unmatched argument as an option.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-05-29 04:11:11 +04:00
|
|
|
Check_Type(file, T_STRING);
|
2016-05-30 08:18:16 +03:00
|
|
|
if (!RSTRING_LEN(file) || !*RSTRING_PTR(file)) {
|
* eval.c (ev_const_defined, ev_const_get), variable.c
(rb_const_get_at, rb_const_get, rb_mod_remove_const): use Qundef
as autoload marker. [ruby-dev:18103], [ruby-dev:18184]
* eval.c (rb_mod_autoload, rb_mod_autoload_p): new method;
Module#autoload, Module#autoload?.
* variable.c (rb_autoload, rb_autoload_load, rb_autoload_p):
manage autoload constants per classes/modules.
* variable.c (rb_const_defined_at, rb_const_defined): return false
for autoloading constants.
* class.c (rb_define_class, rb_define_module), eval.c (rb_eval),
variable.c (rb_mod_const_at, rb_const_assign): removed autoload
stuff.
* intern.h: prototypes; rb_autoload, rb_autoload_load,
rb_autoload_p.
* lib/optparse.rb (OptionParser::Switch::PlacedArgument::parse):
do not treat unmatched argument as an option.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-05-29 04:11:11 +04:00
|
|
|
rb_raise(rb_eArgError, "empty file name");
|
|
|
|
}
|
2017-05-13 00:52:04 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* if somebody else is autoloading, we MUST wait for them, since
|
|
|
|
* rb_provide_feature can provide a feature before autoload_const_set
|
|
|
|
* completes. We must wait until autoload_const_set finishes in
|
|
|
|
* the other thread.
|
|
|
|
*/
|
|
|
|
if (ele->state && ele->state->thread != rb_thread_current()) {
|
|
|
|
return load;
|
|
|
|
}
|
|
|
|
|
2008-12-04 21:29:20 +03:00
|
|
|
loading = RSTRING_PTR(file);
|
|
|
|
safe = rb_safe_level();
|
|
|
|
rb_set_safe_level_force(0);
|
|
|
|
if (!rb_ensure(autoload_provided, (VALUE)&loading, reset_safe, (VALUE)safe)) {
|
|
|
|
return load;
|
* eval.c (ev_const_defined, ev_const_get), variable.c
(rb_const_get_at, rb_const_get, rb_mod_remove_const): use Qundef
as autoload marker. [ruby-dev:18103], [ruby-dev:18184]
* eval.c (rb_mod_autoload, rb_mod_autoload_p): new method;
Module#autoload, Module#autoload?.
* variable.c (rb_autoload, rb_autoload_load, rb_autoload_p):
manage autoload constants per classes/modules.
* variable.c (rb_const_defined_at, rb_const_defined): return false
for autoloading constants.
* class.c (rb_define_class, rb_define_module), eval.c (rb_eval),
variable.c (rb_mod_const_at, rb_const_assign): removed autoload
stuff.
* intern.h: prototypes; rb_autoload, rb_autoload_load,
rb_autoload_p.
* lib/optparse.rb (OptionParser::Switch::PlacedArgument::parse):
do not treat unmatched argument as an option.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-05-29 04:11:11 +04:00
|
|
|
}
|
2009-05-16 08:49:26 +04:00
|
|
|
if (loadingpath && loading) {
|
|
|
|
*loadingpath = loading;
|
2008-12-04 21:29:20 +03:00
|
|
|
return load;
|
* eval.c (ev_const_defined, ev_const_get), variable.c
(rb_const_get_at, rb_const_get, rb_mod_remove_const): use Qundef
as autoload marker. [ruby-dev:18103], [ruby-dev:18184]
* eval.c (rb_mod_autoload, rb_mod_autoload_p): new method;
Module#autoload, Module#autoload?.
* variable.c (rb_autoload, rb_autoload_load, rb_autoload_p):
manage autoload constants per classes/modules.
* variable.c (rb_const_defined_at, rb_const_defined): return false
for autoloading constants.
* class.c (rb_define_class, rb_define_module), eval.c (rb_eval),
variable.c (rb_mod_const_at, rb_const_assign): removed autoload
stuff.
* intern.h: prototypes; rb_autoload, rb_autoload_load,
rb_autoload_p.
* lib/optparse.rb (OptionParser::Switch::PlacedArgument::parse):
do not treat unmatched argument as an option.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-05-29 04:11:11 +04:00
|
|
|
}
|
2008-12-04 21:29:20 +03:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2019-06-22 20:49:39 +03:00
|
|
|
static struct autoload_const *autoloading_const_entry(VALUE mod, ID id);
|
2018-12-13 12:12:07 +03:00
|
|
|
|
mjit_compile.c: merge initial JIT compiler
which has been developed by Takashi Kokubun <takashikkbn@gmail> as
YARV-MJIT. Many of its bugs are fixed by wanabe <s.wanabe@gmail.com>.
This JIT compiler is designed to be a safe migration path to introduce
JIT compiler to MRI. So this commit does not include any bytecode
changes or dynamic instruction modifications, which are done in original
MJIT.
This commit even strips off some aggressive optimizations from
YARV-MJIT, and thus it's slower than YARV-MJIT too. But it's still
fairly faster than Ruby 2.5 in some benchmarks (attached below).
Note that this JIT compiler passes `make test`, `make test-all`, `make
test-spec` without JIT, and even with JIT. Not only it's perfectly safe
with JIT disabled because it does not replace VM instructions unlike
MJIT, but also with JIT enabled it stably runs Ruby applications
including Rails applications.
I'm expecting this version as just "initial" JIT compiler. I have many
optimization ideas which are skipped for initial merging, and you may
easily replace this JIT compiler with a faster one by just replacing
mjit_compile.c. `mjit_compile` interface is designed for the purpose.
common.mk: update dependencies for mjit_compile.c.
internal.h: declare `rb_vm_insn_addr2insn` for MJIT.
vm.c: exclude some definitions if `-DMJIT_HEADER` is provided to
compiler. This avoids to include some functions which take a long time
to compile, e.g. vm_exec_core. Some of the purpose is achieved in
transform_mjit_header.rb (see `IGNORED_FUNCTIONS`) but others are
manually resolved for now. Load mjit_helper.h for MJIT header.
mjit_helper.h: New. This is a file used only by JIT-ed code. I'll
refactor `mjit_call_cfunc` later.
vm_eval.c: add some #ifdef switches to skip compiling some functions
like Init_vm_eval.
win32/mkexports.rb: export thread/ec functions, which are used by MJIT.
include/ruby/defines.h: add MJIT_FUNC_EXPORTED macro alis to clarify
that a function is exported only for MJIT.
array.c: export a function used by MJIT.
bignum.c: ditto.
class.c: ditto.
compile.c: ditto.
error.c: ditto.
gc.c: ditto.
hash.c: ditto.
iseq.c: ditto.
numeric.c: ditto.
object.c: ditto.
proc.c: ditto.
re.c: ditto.
st.c: ditto.
string.c: ditto.
thread.c: ditto.
variable.c: ditto.
vm_backtrace.c: ditto.
vm_insnhelper.c: ditto.
vm_method.c: ditto.
I would like to improve maintainability of function exports, but I
believe this way is acceptable as initial merging if we clarify the
new exports are for MJIT (so that we can use them as TODO list to fix)
and add unit tests to detect unresolved symbols.
I'll add unit tests of JIT compilations in succeeding commits.
Author: Takashi Kokubun <takashikkbn@gmail.com>
Contributor: wanabe <s.wanabe@gmail.com>
Part of [Feature #14235]
---
* Known issues
* Code generated by gcc is faster than clang. The benchmark may be worse
in macOS. Following benchmark result is provided by gcc w/ Linux.
* Performance is decreased when Google Chrome is running
* JIT can work on MinGW, but it doesn't improve performance at least
in short running benchmark.
* Currently it doesn't perform well with Rails. We'll try to fix this
before release.
---
* Benchmark reslts
Benchmarked with:
Intel 4.0GHz i7-4790K with 16GB memory under x86-64 Ubuntu 8 Cores
- 2.0.0-p0: Ruby 2.0.0-p0
- r62186: Ruby trunk (early 2.6.0), before MJIT changes
- JIT off: On this commit, but without `--jit` option
- JIT on: On this commit, and with `--jit` option
** Optcarrot fps
Benchmark: https://github.com/mame/optcarrot
| |2.0.0-p0 |r62186 |JIT off |JIT on |
|:--------|:--------|:--------|:--------|:--------|
|fps |37.32 |51.46 |51.31 |58.88 |
|vs 2.0.0 |1.00x |1.38x |1.37x |1.58x |
** MJIT benchmarks
Benchmark: https://github.com/benchmark-driver/mjit-benchmarks
(Original: https://github.com/vnmakarov/ruby/tree/rtl_mjit_branch/MJIT-benchmarks)
| |2.0.0-p0 |r62186 |JIT off |JIT on |
|:----------|:--------|:--------|:--------|:--------|
|aread |1.00 |1.09 |1.07 |2.19 |
|aref |1.00 |1.13 |1.11 |2.22 |
|aset |1.00 |1.50 |1.45 |2.64 |
|awrite |1.00 |1.17 |1.13 |2.20 |
|call |1.00 |1.29 |1.26 |2.02 |
|const2 |1.00 |1.10 |1.10 |2.19 |
|const |1.00 |1.11 |1.10 |2.19 |
|fannk |1.00 |1.04 |1.02 |1.00 |
|fib |1.00 |1.32 |1.31 |1.84 |
|ivread |1.00 |1.13 |1.12 |2.43 |
|ivwrite |1.00 |1.23 |1.21 |2.40 |
|mandelbrot |1.00 |1.13 |1.16 |1.28 |
|meteor |1.00 |2.97 |2.92 |3.17 |
|nbody |1.00 |1.17 |1.15 |1.49 |
|nest-ntimes|1.00 |1.22 |1.20 |1.39 |
|nest-while |1.00 |1.10 |1.10 |1.37 |
|norm |1.00 |1.18 |1.16 |1.24 |
|nsvb |1.00 |1.16 |1.16 |1.17 |
|red-black |1.00 |1.02 |0.99 |1.12 |
|sieve |1.00 |1.30 |1.28 |1.62 |
|trees |1.00 |1.14 |1.13 |1.19 |
|while |1.00 |1.12 |1.11 |2.41 |
** Discourse's script/bench.rb
Benchmark: https://github.com/discourse/discourse/blob/v1.8.7/script/bench.rb
NOTE: Rails performance was somehow a little degraded with JIT for now.
We should fix this.
(At least I know opt_aref is performing badly in JIT and I have an idea
to fix it. Please wait for the fix.)
*** JIT off
Your Results: (note for timings- percentile is first, duration is second in millisecs)
categories_admin:
50: 17
75: 18
90: 22
99: 29
home_admin:
50: 21
75: 21
90: 27
99: 40
topic_admin:
50: 17
75: 18
90: 22
99: 32
categories:
50: 35
75: 41
90: 43
99: 77
home:
50: 39
75: 46
90: 49
99: 95
topic:
50: 46
75: 52
90: 56
99: 101
*** JIT on
Your Results: (note for timings- percentile is first, duration is second in millisecs)
categories_admin:
50: 19
75: 21
90: 25
99: 33
home_admin:
50: 24
75: 26
90: 30
99: 35
topic_admin:
50: 19
75: 20
90: 25
99: 30
categories:
50: 40
75: 44
90: 48
99: 76
home:
50: 42
75: 48
90: 51
99: 89
topic:
50: 49
75: 55
90: 58
99: 99
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62197 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2018-02-04 14:22:28 +03:00
|
|
|
MJIT_FUNC_EXPORTED int
|
2018-02-13 12:36:35 +03:00
|
|
|
rb_autoloading_value(VALUE mod, ID id, VALUE* value, rb_const_flag_t *flag)
|
2018-12-13 12:12:07 +03:00
|
|
|
{
|
|
|
|
struct autoload_const *ac = autoloading_const_entry(mod, id);
|
|
|
|
if (!ac) return FALSE;
|
|
|
|
|
|
|
|
if (value) {
|
|
|
|
*value = ac->value;
|
|
|
|
}
|
|
|
|
if (flag) {
|
|
|
|
*flag = ac->flag;
|
|
|
|
}
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct autoload_const *
|
|
|
|
autoloading_const_entry(VALUE mod, ID id)
|
2011-08-31 12:28:19 +04:00
|
|
|
{
|
2018-05-10 11:54:26 +03:00
|
|
|
VALUE load = autoload_data(mod, id);
|
2011-08-31 12:28:19 +04:00
|
|
|
struct autoload_data_i *ele;
|
2018-05-10 11:54:26 +03:00
|
|
|
struct autoload_const *ac;
|
2011-08-31 12:28:19 +04:00
|
|
|
|
2018-05-10 11:54:26 +03:00
|
|
|
if (!load || !(ele = get_autoload_data(load, &ac))) {
|
|
|
|
return 0;
|
2011-08-31 12:28:19 +04:00
|
|
|
}
|
2018-05-10 11:54:26 +03:00
|
|
|
|
2015-10-29 04:14:45 +03:00
|
|
|
if (ele->state && ele->state->thread == rb_thread_current()) {
|
2018-05-10 11:54:26 +03:00
|
|
|
if (ac->value != Qundef) {
|
2018-12-13 12:12:07 +03:00
|
|
|
return ac;
|
2011-08-31 12:28:19 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2011-09-01 04:31:18 +04:00
|
|
|
static int
|
|
|
|
autoload_defined_p(VALUE mod, ID id)
|
|
|
|
{
|
2014-08-04 05:12:53 +04:00
|
|
|
rb_const_entry_t *ce = rb_const_lookup(mod, id);
|
2011-09-01 04:31:18 +04:00
|
|
|
|
2014-08-04 05:12:53 +04:00
|
|
|
if (!ce || ce->value != Qundef) {
|
2011-09-01 04:31:18 +04:00
|
|
|
return 0;
|
|
|
|
}
|
2018-02-13 12:36:35 +03:00
|
|
|
return !rb_autoloading_value(mod, id, NULL, NULL);
|
2011-09-01 04:31:18 +04:00
|
|
|
}
|
|
|
|
|
2018-05-10 11:54:26 +03:00
|
|
|
static void const_tbl_update(struct autoload_const *);
|
use id_table for constant tables
valgrind 3.9.0 on x86-64 reports a minor reduction in memory usage
when loading only RubyGems and RDoc by running: ruby -rrdoc -eexit
before: HEAP SUMMARY:
in use at exit: 2,913,448 bytes in 27,394 blocks
total heap usage: 48,362 allocs, 20,968 frees, 9,034,621 bytes alloc
after: HEAP SUMMARY:
in use at exit: 2,880,056 bytes in 26,712 blocks
total heap usage: 47,791 allocs, 21,079 frees, 9,046,507 bytes alloc
* class.c (struct clone_const_arg): adjust for id_table
(clone_const): ditto
(clone_const_i): ditto
(rb_mod_init_copy): ditto
(rb_singleton_class_clone_and_attach): ditto
(rb_include_class_new): ditto
(include_modules_at): ditto
* constant.h (rb_free_const_table): ditto
* gc.c (free_const_entry_i): ditto
(rb_free_const_table): ditto
(obj_memsize_of): ditto
(mark_const_entry_i): ditto
(mark_const_tbl): ditto
* internal.h (struct rb_classext_struct): ditto
* object.c (rb_mod_const_set): resolve class name on assignment
* variable.c (const_update): replace with const_tbl_update
(const_tbl_update): new function
(fc_i): adjust for id_table
(find_class_path): ditto
(autoload_const_set): st_update => const_tbl_update
(rb_const_remove): adjust for id_table
(sv_i): ditto
(rb_local_constants_i): ditto
(rb_local_constants): ditto
(rb_mod_const_at): ditto
(rb_mod_const_set): ditto
(rb_const_lookup): ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53376 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-29 23:19:14 +03:00
|
|
|
|
2012-02-14 07:10:11 +04:00
|
|
|
static VALUE
|
|
|
|
autoload_const_set(VALUE arg)
|
2011-08-31 12:28:19 +04:00
|
|
|
{
|
2018-05-10 11:54:26 +03:00
|
|
|
struct autoload_const *ac = (struct autoload_const *)arg;
|
|
|
|
VALUE klass = ac->mod;
|
|
|
|
ID id = ac->id;
|
|
|
|
check_before_mod_set(klass, id, ac->value, "constant");
|
|
|
|
const_tbl_update(ac);
|
2012-02-14 07:10:11 +04:00
|
|
|
return 0; /* ignored */
|
2011-08-31 12:28:19 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
2012-02-14 07:10:11 +04:00
|
|
|
autoload_require(VALUE arg)
|
2011-08-31 12:28:19 +04:00
|
|
|
{
|
2015-10-29 02:59:45 +03:00
|
|
|
struct autoload_state *state = (struct autoload_state *)arg;
|
2018-05-10 11:54:26 +03:00
|
|
|
struct autoload_const *ac = state->ac;
|
|
|
|
struct autoload_data_i *ele;
|
2015-10-29 02:59:45 +03:00
|
|
|
|
2018-05-10 11:54:26 +03:00
|
|
|
ele = rb_check_typeddata(ac->ad, &autoload_data_i_type);
|
2015-10-29 02:59:45 +03:00
|
|
|
/* this may release GVL and switch threads: */
|
|
|
|
state->result = rb_funcall(rb_vm_top_self(), rb_intern("require"), 1,
|
2018-05-10 11:54:26 +03:00
|
|
|
ele->feature);
|
2015-10-29 02:59:45 +03:00
|
|
|
|
|
|
|
return state->result;
|
2011-08-31 12:28:19 +04:00
|
|
|
}
|
|
|
|
|
2015-04-13 10:54:39 +03:00
|
|
|
static VALUE
|
|
|
|
autoload_reset(VALUE arg)
|
|
|
|
{
|
2015-10-29 02:59:45 +03:00
|
|
|
struct autoload_state *state = (struct autoload_state *)arg;
|
|
|
|
int need_wakeups = 0;
|
2018-05-10 11:54:26 +03:00
|
|
|
struct autoload_const *ac = state->ac;
|
|
|
|
struct autoload_data_i *ele;
|
2015-10-29 02:59:45 +03:00
|
|
|
|
2018-05-10 11:54:26 +03:00
|
|
|
ele = rb_check_typeddata(ac->ad, &autoload_data_i_type);
|
|
|
|
if (ele->state == state) {
|
2018-04-20 06:22:26 +03:00
|
|
|
need_wakeups = 1;
|
2018-05-10 11:54:26 +03:00
|
|
|
ele->state = 0;
|
|
|
|
ele->fork_gen = 0;
|
2015-10-29 02:59:45 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* At the last, move a value defined in autoload to constant table */
|
2018-05-10 11:54:26 +03:00
|
|
|
if (RTEST(state->result)) {
|
|
|
|
struct autoload_const *next;
|
|
|
|
int safe_backup = rb_safe_level();
|
|
|
|
|
|
|
|
list_for_each_safe(&ele->constants, ac, next, cnode) {
|
|
|
|
if (ac->value != Qundef) {
|
|
|
|
rb_ensure(autoload_const_set, (VALUE)ac,
|
|
|
|
reset_safe, (VALUE)safe_backup);
|
|
|
|
}
|
|
|
|
}
|
2015-04-13 10:54:39 +03:00
|
|
|
}
|
2015-10-29 02:59:45 +03:00
|
|
|
|
|
|
|
/* wakeup any waiters we had */
|
|
|
|
if (need_wakeups) {
|
2015-11-04 09:59:15 +03:00
|
|
|
struct autoload_state *cur = 0, *nxt;
|
2015-10-29 02:59:45 +03:00
|
|
|
|
2018-01-03 00:51:59 +03:00
|
|
|
list_for_each_safe((struct list_head *)&state->waitq, cur, nxt, waitq) {
|
2015-10-29 04:14:45 +03:00
|
|
|
VALUE th = cur->thread;
|
2015-10-29 02:59:45 +03:00
|
|
|
|
2015-10-29 04:14:45 +03:00
|
|
|
cur->thread = Qfalse;
|
2018-01-03 00:51:59 +03:00
|
|
|
list_del_init(&cur->waitq); /* idempotent */
|
2015-10-29 02:59:45 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* cur is stored on the stack of cur->waiting_th,
|
|
|
|
* do not touch cur after waking up waiting_th
|
|
|
|
*/
|
|
|
|
rb_thread_wakeup_alive(th);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-04-13 10:54:39 +03:00
|
|
|
return 0; /* ignored */
|
|
|
|
}
|
|
|
|
|
2017-05-07 07:26:37 +03:00
|
|
|
static VALUE
|
|
|
|
autoload_sleep(VALUE arg)
|
|
|
|
{
|
|
|
|
struct autoload_state *state = (struct autoload_state *)arg;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* autoload_reset in other thread will resume us and remove us
|
|
|
|
* from the waitq list
|
|
|
|
*/
|
|
|
|
do {
|
|
|
|
rb_thread_sleep_deadly();
|
|
|
|
} while (state->thread != Qfalse);
|
|
|
|
|
|
|
|
return Qfalse;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
autoload_sleep_done(VALUE arg)
|
|
|
|
{
|
|
|
|
struct autoload_state *state = (struct autoload_state *)arg;
|
|
|
|
|
|
|
|
if (state->thread != Qfalse && rb_thread_to_be_killed(state->thread)) {
|
2018-01-03 00:51:59 +03:00
|
|
|
list_del(&state->waitq); /* idempotent after list_del_init */
|
2017-05-07 07:26:37 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
return Qfalse;
|
|
|
|
}
|
|
|
|
|
2008-12-04 21:29:20 +03:00
|
|
|
VALUE
|
2009-05-16 08:49:26 +04:00
|
|
|
rb_autoload_load(VALUE mod, ID id)
|
2008-12-04 21:29:20 +03:00
|
|
|
{
|
2011-08-31 12:28:19 +04:00
|
|
|
VALUE load, result;
|
2009-05-16 08:49:26 +04:00
|
|
|
const char *loading = 0, *src;
|
2011-08-31 12:28:19 +04:00
|
|
|
struct autoload_data_i *ele;
|
2018-05-10 11:54:26 +03:00
|
|
|
struct autoload_const *ac;
|
2015-10-29 02:59:45 +03:00
|
|
|
struct autoload_state state;
|
2008-12-04 21:29:20 +03:00
|
|
|
|
2011-08-31 12:28:19 +04:00
|
|
|
if (!autoload_defined_p(mod, id)) return Qfalse;
|
|
|
|
load = check_autoload_required(mod, id, &loading);
|
2008-12-04 21:29:20 +03:00
|
|
|
if (!load) return Qfalse;
|
2009-05-16 08:49:26 +04:00
|
|
|
src = rb_sourcefile();
|
|
|
|
if (src && loading && strcmp(src, loading) == 0) return Qfalse;
|
2011-08-31 12:28:19 +04:00
|
|
|
|
2015-10-29 04:14:45 +03:00
|
|
|
/* set ele->state for a marker of autoloading thread */
|
2018-05-10 11:54:26 +03:00
|
|
|
if (!(ele = get_autoload_data(load, &ac))) {
|
2011-08-31 12:28:19 +04:00
|
|
|
return Qfalse;
|
|
|
|
}
|
2018-05-10 11:54:26 +03:00
|
|
|
state.ac = ac;
|
2015-10-29 04:14:45 +03:00
|
|
|
state.thread = rb_thread_current();
|
|
|
|
if (!ele->state) {
|
|
|
|
ele->state = &state;
|
2018-04-20 06:22:26 +03:00
|
|
|
ele->fork_gen = GET_VM()->fork_gen;
|
2015-10-29 02:59:45 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* autoload_reset will wake up any threads added to this
|
|
|
|
* iff the GVL is released during autoload_require
|
|
|
|
*/
|
2018-01-03 00:51:59 +03:00
|
|
|
list_head_init((struct list_head *)&state.waitq);
|
2011-08-31 12:28:19 +04:00
|
|
|
}
|
2015-11-10 00:18:42 +03:00
|
|
|
else if (state.thread == ele->state->thread) {
|
|
|
|
return Qfalse;
|
|
|
|
}
|
2015-10-29 02:59:45 +03:00
|
|
|
else {
|
2018-01-03 00:51:59 +03:00
|
|
|
list_add_tail((struct list_head *)&ele->state->waitq, &state.waitq);
|
2017-05-07 07:26:37 +03:00
|
|
|
|
|
|
|
rb_ensure(autoload_sleep, (VALUE)&state,
|
|
|
|
autoload_sleep_done, (VALUE)&state);
|
2015-10-29 02:59:45 +03:00
|
|
|
}
|
|
|
|
|
2011-08-31 12:28:19 +04:00
|
|
|
/* autoload_data_i can be deleted by another thread while require */
|
2019-04-24 09:30:25 +03:00
|
|
|
state.result = Qfalse;
|
2015-10-29 02:59:45 +03:00
|
|
|
result = rb_ensure(autoload_require, (VALUE)&state,
|
|
|
|
autoload_reset, (VALUE)&state);
|
2011-08-31 12:28:19 +04:00
|
|
|
|
2011-08-31 12:35:27 +04:00
|
|
|
RB_GC_GUARD(load);
|
2011-08-31 12:28:19 +04:00
|
|
|
return result;
|
* eval.c (ev_const_defined, ev_const_get), variable.c
(rb_const_get_at, rb_const_get, rb_mod_remove_const): use Qundef
as autoload marker. [ruby-dev:18103], [ruby-dev:18184]
* eval.c (rb_mod_autoload, rb_mod_autoload_p): new method;
Module#autoload, Module#autoload?.
* variable.c (rb_autoload, rb_autoload_load, rb_autoload_p):
manage autoload constants per classes/modules.
* variable.c (rb_const_defined_at, rb_const_defined): return false
for autoloading constants.
* class.c (rb_define_class, rb_define_module), eval.c (rb_eval),
variable.c (rb_mod_const_at, rb_const_assign): removed autoload
stuff.
* intern.h: prototypes; rb_autoload, rb_autoload_load,
rb_autoload_p.
* lib/optparse.rb (OptionParser::Switch::PlacedArgument::parse):
do not treat unmatched argument as an option.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-05-29 04:11:11 +04: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 14:44:21 +04:00
|
|
|
rb_autoload_p(VALUE mod, ID id)
|
2019-05-07 13:52:24 +03:00
|
|
|
{
|
2019-06-21 11:21:34 +03:00
|
|
|
return rb_autoload_at_p(mod, id, TRUE);
|
2019-05-07 13:52:24 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
2019-06-21 11:21:34 +03:00
|
|
|
rb_autoload_at_p(VALUE mod, ID id, int recur)
|
* eval.c (ev_const_defined, ev_const_get), variable.c
(rb_const_get_at, rb_const_get, rb_mod_remove_const): use Qundef
as autoload marker. [ruby-dev:18103], [ruby-dev:18184]
* eval.c (rb_mod_autoload, rb_mod_autoload_p): new method;
Module#autoload, Module#autoload?.
* variable.c (rb_autoload, rb_autoload_load, rb_autoload_p):
manage autoload constants per classes/modules.
* variable.c (rb_const_defined_at, rb_const_defined): return false
for autoloading constants.
* class.c (rb_define_class, rb_define_module), eval.c (rb_eval),
variable.c (rb_mod_const_at, rb_const_assign): removed autoload
stuff.
* intern.h: prototypes; rb_autoload, rb_autoload_load,
rb_autoload_p.
* lib/optparse.rb (OptionParser::Switch::PlacedArgument::parse):
do not treat unmatched argument as an option.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-05-29 04:11:11 +04:00
|
|
|
{
|
2011-08-31 12:28:19 +04:00
|
|
|
VALUE load;
|
|
|
|
struct autoload_data_i *ele;
|
* eval.c (ev_const_defined, ev_const_get), variable.c
(rb_const_get_at, rb_const_get, rb_mod_remove_const): use Qundef
as autoload marker. [ruby-dev:18103], [ruby-dev:18184]
* eval.c (rb_mod_autoload, rb_mod_autoload_p): new method;
Module#autoload, Module#autoload?.
* variable.c (rb_autoload, rb_autoload_load, rb_autoload_p):
manage autoload constants per classes/modules.
* variable.c (rb_const_defined_at, rb_const_defined): return false
for autoloading constants.
* class.c (rb_define_class, rb_define_module), eval.c (rb_eval),
variable.c (rb_mod_const_at, rb_const_assign): removed autoload
stuff.
* intern.h: prototypes; rb_autoload, rb_autoload_load,
rb_autoload_p.
* lib/optparse.rb (OptionParser::Switch::PlacedArgument::parse):
do not treat unmatched argument as an option.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-05-29 04:11:11 +04:00
|
|
|
|
2011-08-31 12:28:19 +04:00
|
|
|
while (!autoload_defined_p(mod, id)) {
|
2019-06-21 11:29:08 +03:00
|
|
|
if (!recur) return Qnil;
|
2011-04-14 16:23:32 +04:00
|
|
|
mod = RCLASS_SUPER(mod);
|
|
|
|
if (!mod) return Qnil;
|
|
|
|
}
|
2011-08-31 12:28:19 +04:00
|
|
|
load = check_autoload_required(mod, id, 0);
|
2009-05-15 10:15:14 +04:00
|
|
|
if (!load) return Qnil;
|
2018-05-10 11:54:26 +03:00
|
|
|
return (ele = get_autoload_data(load, 0)) ? ele->feature : Qnil;
|
* eval.c (ev_const_defined, ev_const_get), variable.c
(rb_const_get_at, rb_const_get, rb_mod_remove_const): use Qundef
as autoload marker. [ruby-dev:18103], [ruby-dev:18184]
* eval.c (rb_mod_autoload, rb_mod_autoload_p): new method;
Module#autoload, Module#autoload?.
* variable.c (rb_autoload, rb_autoload_load, rb_autoload_p):
manage autoload constants per classes/modules.
* variable.c (rb_const_defined_at, rb_const_defined): return false
for autoloading constants.
* class.c (rb_define_class, rb_define_module), eval.c (rb_eval),
variable.c (rb_mod_const_at, rb_const_assign): removed autoload
stuff.
* intern.h: prototypes; rb_autoload, rb_autoload_load,
rb_autoload_p.
* lib/optparse.rb (OptionParser::Switch::PlacedArgument::parse):
do not treat unmatched argument as an option.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-05-29 04:11:11 +04:00
|
|
|
}
|
|
|
|
|
mjit_compile.c: merge initial JIT compiler
which has been developed by Takashi Kokubun <takashikkbn@gmail> as
YARV-MJIT. Many of its bugs are fixed by wanabe <s.wanabe@gmail.com>.
This JIT compiler is designed to be a safe migration path to introduce
JIT compiler to MRI. So this commit does not include any bytecode
changes or dynamic instruction modifications, which are done in original
MJIT.
This commit even strips off some aggressive optimizations from
YARV-MJIT, and thus it's slower than YARV-MJIT too. But it's still
fairly faster than Ruby 2.5 in some benchmarks (attached below).
Note that this JIT compiler passes `make test`, `make test-all`, `make
test-spec` without JIT, and even with JIT. Not only it's perfectly safe
with JIT disabled because it does not replace VM instructions unlike
MJIT, but also with JIT enabled it stably runs Ruby applications
including Rails applications.
I'm expecting this version as just "initial" JIT compiler. I have many
optimization ideas which are skipped for initial merging, and you may
easily replace this JIT compiler with a faster one by just replacing
mjit_compile.c. `mjit_compile` interface is designed for the purpose.
common.mk: update dependencies for mjit_compile.c.
internal.h: declare `rb_vm_insn_addr2insn` for MJIT.
vm.c: exclude some definitions if `-DMJIT_HEADER` is provided to
compiler. This avoids to include some functions which take a long time
to compile, e.g. vm_exec_core. Some of the purpose is achieved in
transform_mjit_header.rb (see `IGNORED_FUNCTIONS`) but others are
manually resolved for now. Load mjit_helper.h for MJIT header.
mjit_helper.h: New. This is a file used only by JIT-ed code. I'll
refactor `mjit_call_cfunc` later.
vm_eval.c: add some #ifdef switches to skip compiling some functions
like Init_vm_eval.
win32/mkexports.rb: export thread/ec functions, which are used by MJIT.
include/ruby/defines.h: add MJIT_FUNC_EXPORTED macro alis to clarify
that a function is exported only for MJIT.
array.c: export a function used by MJIT.
bignum.c: ditto.
class.c: ditto.
compile.c: ditto.
error.c: ditto.
gc.c: ditto.
hash.c: ditto.
iseq.c: ditto.
numeric.c: ditto.
object.c: ditto.
proc.c: ditto.
re.c: ditto.
st.c: ditto.
string.c: ditto.
thread.c: ditto.
variable.c: ditto.
vm_backtrace.c: ditto.
vm_insnhelper.c: ditto.
vm_method.c: ditto.
I would like to improve maintainability of function exports, but I
believe this way is acceptable as initial merging if we clarify the
new exports are for MJIT (so that we can use them as TODO list to fix)
and add unit tests to detect unresolved symbols.
I'll add unit tests of JIT compilations in succeeding commits.
Author: Takashi Kokubun <takashikkbn@gmail.com>
Contributor: wanabe <s.wanabe@gmail.com>
Part of [Feature #14235]
---
* Known issues
* Code generated by gcc is faster than clang. The benchmark may be worse
in macOS. Following benchmark result is provided by gcc w/ Linux.
* Performance is decreased when Google Chrome is running
* JIT can work on MinGW, but it doesn't improve performance at least
in short running benchmark.
* Currently it doesn't perform well with Rails. We'll try to fix this
before release.
---
* Benchmark reslts
Benchmarked with:
Intel 4.0GHz i7-4790K with 16GB memory under x86-64 Ubuntu 8 Cores
- 2.0.0-p0: Ruby 2.0.0-p0
- r62186: Ruby trunk (early 2.6.0), before MJIT changes
- JIT off: On this commit, but without `--jit` option
- JIT on: On this commit, and with `--jit` option
** Optcarrot fps
Benchmark: https://github.com/mame/optcarrot
| |2.0.0-p0 |r62186 |JIT off |JIT on |
|:--------|:--------|:--------|:--------|:--------|
|fps |37.32 |51.46 |51.31 |58.88 |
|vs 2.0.0 |1.00x |1.38x |1.37x |1.58x |
** MJIT benchmarks
Benchmark: https://github.com/benchmark-driver/mjit-benchmarks
(Original: https://github.com/vnmakarov/ruby/tree/rtl_mjit_branch/MJIT-benchmarks)
| |2.0.0-p0 |r62186 |JIT off |JIT on |
|:----------|:--------|:--------|:--------|:--------|
|aread |1.00 |1.09 |1.07 |2.19 |
|aref |1.00 |1.13 |1.11 |2.22 |
|aset |1.00 |1.50 |1.45 |2.64 |
|awrite |1.00 |1.17 |1.13 |2.20 |
|call |1.00 |1.29 |1.26 |2.02 |
|const2 |1.00 |1.10 |1.10 |2.19 |
|const |1.00 |1.11 |1.10 |2.19 |
|fannk |1.00 |1.04 |1.02 |1.00 |
|fib |1.00 |1.32 |1.31 |1.84 |
|ivread |1.00 |1.13 |1.12 |2.43 |
|ivwrite |1.00 |1.23 |1.21 |2.40 |
|mandelbrot |1.00 |1.13 |1.16 |1.28 |
|meteor |1.00 |2.97 |2.92 |3.17 |
|nbody |1.00 |1.17 |1.15 |1.49 |
|nest-ntimes|1.00 |1.22 |1.20 |1.39 |
|nest-while |1.00 |1.10 |1.10 |1.37 |
|norm |1.00 |1.18 |1.16 |1.24 |
|nsvb |1.00 |1.16 |1.16 |1.17 |
|red-black |1.00 |1.02 |0.99 |1.12 |
|sieve |1.00 |1.30 |1.28 |1.62 |
|trees |1.00 |1.14 |1.13 |1.19 |
|while |1.00 |1.12 |1.11 |2.41 |
** Discourse's script/bench.rb
Benchmark: https://github.com/discourse/discourse/blob/v1.8.7/script/bench.rb
NOTE: Rails performance was somehow a little degraded with JIT for now.
We should fix this.
(At least I know opt_aref is performing badly in JIT and I have an idea
to fix it. Please wait for the fix.)
*** JIT off
Your Results: (note for timings- percentile is first, duration is second in millisecs)
categories_admin:
50: 17
75: 18
90: 22
99: 29
home_admin:
50: 21
75: 21
90: 27
99: 40
topic_admin:
50: 17
75: 18
90: 22
99: 32
categories:
50: 35
75: 41
90: 43
99: 77
home:
50: 39
75: 46
90: 49
99: 95
topic:
50: 46
75: 52
90: 56
99: 101
*** JIT on
Your Results: (note for timings- percentile is first, duration is second in millisecs)
categories_admin:
50: 19
75: 21
90: 25
99: 33
home_admin:
50: 24
75: 26
90: 30
99: 35
topic_admin:
50: 19
75: 20
90: 25
99: 30
categories:
50: 40
75: 44
90: 48
99: 76
home:
50: 42
75: 48
90: 51
99: 89
topic:
50: 49
75: 55
90: 58
99: 99
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62197 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2018-02-04 14:22:28 +03:00
|
|
|
MJIT_FUNC_EXPORTED void
|
2016-05-15 04:57:28 +03:00
|
|
|
rb_const_warn_if_deprecated(const rb_const_entry_t *ce, VALUE klass, ID id)
|
|
|
|
{
|
|
|
|
if (RB_CONST_DEPRECATED_P(ce)) {
|
|
|
|
if (klass == rb_cObject) {
|
|
|
|
rb_warn("constant ::%"PRIsVALUE" is deprecated", QUOTE_ID(id));
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
rb_warn("constant %"PRIsVALUE"::%"PRIsVALUE" is deprecated",
|
|
|
|
rb_class_name(klass), QUOTE_ID(id));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-06-20 11:11:44 +04:00
|
|
|
static VALUE
|
2011-01-28 20:57:27 +03:00
|
|
|
rb_const_get_0(VALUE klass, ID id, int exclude, int recurse, int visibility)
|
2016-06-19 04:54:42 +03:00
|
|
|
{
|
|
|
|
VALUE c = rb_const_search(klass, id, exclude, recurse, visibility);
|
|
|
|
if (c != Qundef) return c;
|
|
|
|
return rb_const_missing(klass, ID2SYM(id));
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
2018-12-13 12:27:32 +03:00
|
|
|
rb_const_search_from(VALUE klass, ID id, int exclude, int recurse, int visibility)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2018-12-13 12:27:32 +03:00
|
|
|
VALUE value, tmp;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
tmp = klass;
|
2008-04-07 22:39:28 +04:00
|
|
|
while (RTEST(tmp)) {
|
2009-01-31 23:19:44 +03:00
|
|
|
VALUE am = 0;
|
2014-08-04 05:12:53 +04:00
|
|
|
rb_const_entry_t *ce;
|
|
|
|
|
|
|
|
while ((ce = rb_const_lookup(tmp, id))) {
|
2014-10-08 12:27:51 +04:00
|
|
|
if (visibility && RB_CONST_PRIVATE_P(ce)) {
|
2018-06-19 11:15:52 +03:00
|
|
|
if (BUILTIN_TYPE(tmp) == T_ICLASS) tmp = RBASIC(tmp)->klass;
|
2018-07-06 16:56:58 +03:00
|
|
|
GET_EC()->private_const_reference = tmp;
|
|
|
|
return Qundef;
|
2010-10-26 21:27:44 +04:00
|
|
|
}
|
2016-09-09 04:10:01 +03:00
|
|
|
rb_const_warn_if_deprecated(ce, tmp, id);
|
2010-10-26 21:27:44 +04:00
|
|
|
value = ce->value;
|
* eval.c (ev_const_defined, ev_const_get), variable.c
(rb_const_get_at, rb_const_get, rb_mod_remove_const): use Qundef
as autoload marker. [ruby-dev:18103], [ruby-dev:18184]
* eval.c (rb_mod_autoload, rb_mod_autoload_p): new method;
Module#autoload, Module#autoload?.
* variable.c (rb_autoload, rb_autoload_load, rb_autoload_p):
manage autoload constants per classes/modules.
* variable.c (rb_const_defined_at, rb_const_defined): return false
for autoloading constants.
* class.c (rb_define_class, rb_define_module), eval.c (rb_eval),
variable.c (rb_mod_const_at, rb_const_assign): removed autoload
stuff.
* intern.h: prototypes; rb_autoload, rb_autoload_load,
rb_autoload_p.
* lib/optparse.rb (OptionParser::Switch::PlacedArgument::parse):
do not treat unmatched argument as an option.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-05-29 04:11:11 +04:00
|
|
|
if (value == Qundef) {
|
2018-12-13 12:12:07 +03:00
|
|
|
struct autoload_const *ac;
|
2009-01-31 23:19:44 +03:00
|
|
|
if (am == tmp) break;
|
|
|
|
am = tmp;
|
2018-12-13 12:12:07 +03:00
|
|
|
ac = autoloading_const_entry(tmp, id);
|
|
|
|
if (ac) return ac->value;
|
2008-12-04 21:29:20 +03:00
|
|
|
rb_autoload_load(tmp, id);
|
* eval.c (ev_const_defined, ev_const_get), variable.c
(rb_const_get_at, rb_const_get, rb_mod_remove_const): use Qundef
as autoload marker. [ruby-dev:18103], [ruby-dev:18184]
* eval.c (rb_mod_autoload, rb_mod_autoload_p): new method;
Module#autoload, Module#autoload?.
* variable.c (rb_autoload, rb_autoload_load, rb_autoload_p):
manage autoload constants per classes/modules.
* variable.c (rb_const_defined_at, rb_const_defined): return false
for autoloading constants.
* class.c (rb_define_class, rb_define_module), eval.c (rb_eval),
variable.c (rb_mod_const_at, rb_const_assign): removed autoload
stuff.
* intern.h: prototypes; rb_autoload, rb_autoload_load,
rb_autoload_p.
* lib/optparse.rb (OptionParser::Switch::PlacedArgument::parse):
do not treat unmatched argument as an option.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-05-29 04:11:11 +04:00
|
|
|
continue;
|
|
|
|
}
|
2019-06-22 19:47:40 +03:00
|
|
|
if (exclude && tmp == rb_cObject) {
|
2018-07-06 16:56:58 +03:00
|
|
|
goto not_found;
|
2003-07-10 02:28:42 +04:00
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
return value;
|
|
|
|
}
|
2011-06-29 09:20:37 +04:00
|
|
|
if (!recurse) break;
|
2007-09-28 10:21:46 +04:00
|
|
|
tmp = RCLASS_SUPER(tmp);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2006-12-31 18:02:22 +03:00
|
|
|
|
2018-07-06 16:56:58 +03:00
|
|
|
not_found:
|
|
|
|
GET_EC()->private_const_reference = 0;
|
2016-06-19 04:54:42 +03:00
|
|
|
return Qundef;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2018-12-13 12:27:32 +03:00
|
|
|
static VALUE
|
|
|
|
rb_const_search(VALUE klass, ID id, int exclude, int recurse, int visibility)
|
|
|
|
{
|
|
|
|
VALUE value;
|
|
|
|
|
|
|
|
if (klass == rb_cObject) exclude = FALSE;
|
|
|
|
value = rb_const_search_from(klass, id, exclude, recurse, visibility);
|
|
|
|
if (value != Qundef) return value;
|
|
|
|
if (exclude) return value;
|
|
|
|
if (BUILTIN_TYPE(klass) != T_MODULE) return value;
|
|
|
|
/* search global const too, if klass is a module */
|
|
|
|
return rb_const_search_from(rb_cObject, id, FALSE, recurse, visibility);
|
|
|
|
}
|
|
|
|
|
2003-06-20 11:11:44 +04: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 14:44:21 +04:00
|
|
|
rb_const_get_from(VALUE klass, ID id)
|
2003-06-20 11:11:44 +04:00
|
|
|
{
|
2011-01-28 20:57:27 +03:00
|
|
|
return rb_const_get_0(klass, id, TRUE, TRUE, FALSE);
|
2003-06-20 11:11:44 +04: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 14:44:21 +04:00
|
|
|
rb_const_get(VALUE klass, ID id)
|
2003-06-20 11:11:44 +04:00
|
|
|
{
|
2011-01-28 20:57:27 +03:00
|
|
|
return rb_const_get_0(klass, id, FALSE, TRUE, FALSE);
|
2003-08-28 12:35:43 +04: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 14:44:21 +04:00
|
|
|
rb_const_get_at(VALUE klass, ID id)
|
2003-08-28 12:35:43 +04:00
|
|
|
{
|
2011-01-28 20:57:27 +03:00
|
|
|
return rb_const_get_0(klass, id, TRUE, FALSE, FALSE);
|
|
|
|
}
|
|
|
|
|
mjit_compile.c: merge initial JIT compiler
which has been developed by Takashi Kokubun <takashikkbn@gmail> as
YARV-MJIT. Many of its bugs are fixed by wanabe <s.wanabe@gmail.com>.
This JIT compiler is designed to be a safe migration path to introduce
JIT compiler to MRI. So this commit does not include any bytecode
changes or dynamic instruction modifications, which are done in original
MJIT.
This commit even strips off some aggressive optimizations from
YARV-MJIT, and thus it's slower than YARV-MJIT too. But it's still
fairly faster than Ruby 2.5 in some benchmarks (attached below).
Note that this JIT compiler passes `make test`, `make test-all`, `make
test-spec` without JIT, and even with JIT. Not only it's perfectly safe
with JIT disabled because it does not replace VM instructions unlike
MJIT, but also with JIT enabled it stably runs Ruby applications
including Rails applications.
I'm expecting this version as just "initial" JIT compiler. I have many
optimization ideas which are skipped for initial merging, and you may
easily replace this JIT compiler with a faster one by just replacing
mjit_compile.c. `mjit_compile` interface is designed for the purpose.
common.mk: update dependencies for mjit_compile.c.
internal.h: declare `rb_vm_insn_addr2insn` for MJIT.
vm.c: exclude some definitions if `-DMJIT_HEADER` is provided to
compiler. This avoids to include some functions which take a long time
to compile, e.g. vm_exec_core. Some of the purpose is achieved in
transform_mjit_header.rb (see `IGNORED_FUNCTIONS`) but others are
manually resolved for now. Load mjit_helper.h for MJIT header.
mjit_helper.h: New. This is a file used only by JIT-ed code. I'll
refactor `mjit_call_cfunc` later.
vm_eval.c: add some #ifdef switches to skip compiling some functions
like Init_vm_eval.
win32/mkexports.rb: export thread/ec functions, which are used by MJIT.
include/ruby/defines.h: add MJIT_FUNC_EXPORTED macro alis to clarify
that a function is exported only for MJIT.
array.c: export a function used by MJIT.
bignum.c: ditto.
class.c: ditto.
compile.c: ditto.
error.c: ditto.
gc.c: ditto.
hash.c: ditto.
iseq.c: ditto.
numeric.c: ditto.
object.c: ditto.
proc.c: ditto.
re.c: ditto.
st.c: ditto.
string.c: ditto.
thread.c: ditto.
variable.c: ditto.
vm_backtrace.c: ditto.
vm_insnhelper.c: ditto.
vm_method.c: ditto.
I would like to improve maintainability of function exports, but I
believe this way is acceptable as initial merging if we clarify the
new exports are for MJIT (so that we can use them as TODO list to fix)
and add unit tests to detect unresolved symbols.
I'll add unit tests of JIT compilations in succeeding commits.
Author: Takashi Kokubun <takashikkbn@gmail.com>
Contributor: wanabe <s.wanabe@gmail.com>
Part of [Feature #14235]
---
* Known issues
* Code generated by gcc is faster than clang. The benchmark may be worse
in macOS. Following benchmark result is provided by gcc w/ Linux.
* Performance is decreased when Google Chrome is running
* JIT can work on MinGW, but it doesn't improve performance at least
in short running benchmark.
* Currently it doesn't perform well with Rails. We'll try to fix this
before release.
---
* Benchmark reslts
Benchmarked with:
Intel 4.0GHz i7-4790K with 16GB memory under x86-64 Ubuntu 8 Cores
- 2.0.0-p0: Ruby 2.0.0-p0
- r62186: Ruby trunk (early 2.6.0), before MJIT changes
- JIT off: On this commit, but without `--jit` option
- JIT on: On this commit, and with `--jit` option
** Optcarrot fps
Benchmark: https://github.com/mame/optcarrot
| |2.0.0-p0 |r62186 |JIT off |JIT on |
|:--------|:--------|:--------|:--------|:--------|
|fps |37.32 |51.46 |51.31 |58.88 |
|vs 2.0.0 |1.00x |1.38x |1.37x |1.58x |
** MJIT benchmarks
Benchmark: https://github.com/benchmark-driver/mjit-benchmarks
(Original: https://github.com/vnmakarov/ruby/tree/rtl_mjit_branch/MJIT-benchmarks)
| |2.0.0-p0 |r62186 |JIT off |JIT on |
|:----------|:--------|:--------|:--------|:--------|
|aread |1.00 |1.09 |1.07 |2.19 |
|aref |1.00 |1.13 |1.11 |2.22 |
|aset |1.00 |1.50 |1.45 |2.64 |
|awrite |1.00 |1.17 |1.13 |2.20 |
|call |1.00 |1.29 |1.26 |2.02 |
|const2 |1.00 |1.10 |1.10 |2.19 |
|const |1.00 |1.11 |1.10 |2.19 |
|fannk |1.00 |1.04 |1.02 |1.00 |
|fib |1.00 |1.32 |1.31 |1.84 |
|ivread |1.00 |1.13 |1.12 |2.43 |
|ivwrite |1.00 |1.23 |1.21 |2.40 |
|mandelbrot |1.00 |1.13 |1.16 |1.28 |
|meteor |1.00 |2.97 |2.92 |3.17 |
|nbody |1.00 |1.17 |1.15 |1.49 |
|nest-ntimes|1.00 |1.22 |1.20 |1.39 |
|nest-while |1.00 |1.10 |1.10 |1.37 |
|norm |1.00 |1.18 |1.16 |1.24 |
|nsvb |1.00 |1.16 |1.16 |1.17 |
|red-black |1.00 |1.02 |0.99 |1.12 |
|sieve |1.00 |1.30 |1.28 |1.62 |
|trees |1.00 |1.14 |1.13 |1.19 |
|while |1.00 |1.12 |1.11 |2.41 |
** Discourse's script/bench.rb
Benchmark: https://github.com/discourse/discourse/blob/v1.8.7/script/bench.rb
NOTE: Rails performance was somehow a little degraded with JIT for now.
We should fix this.
(At least I know opt_aref is performing badly in JIT and I have an idea
to fix it. Please wait for the fix.)
*** JIT off
Your Results: (note for timings- percentile is first, duration is second in millisecs)
categories_admin:
50: 17
75: 18
90: 22
99: 29
home_admin:
50: 21
75: 21
90: 27
99: 40
topic_admin:
50: 17
75: 18
90: 22
99: 32
categories:
50: 35
75: 41
90: 43
99: 77
home:
50: 39
75: 46
90: 49
99: 95
topic:
50: 46
75: 52
90: 56
99: 101
*** JIT on
Your Results: (note for timings- percentile is first, duration is second in millisecs)
categories_admin:
50: 19
75: 21
90: 25
99: 33
home_admin:
50: 24
75: 26
90: 30
99: 35
topic_admin:
50: 19
75: 20
90: 25
99: 30
categories:
50: 40
75: 44
90: 48
99: 76
home:
50: 42
75: 48
90: 51
99: 89
topic:
50: 49
75: 55
90: 58
99: 99
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62197 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2018-02-04 14:22:28 +03:00
|
|
|
MJIT_FUNC_EXPORTED VALUE
|
2011-01-28 20:57:27 +03:00
|
|
|
rb_public_const_get_from(VALUE klass, ID id)
|
|
|
|
{
|
|
|
|
return rb_const_get_0(klass, id, TRUE, TRUE, TRUE);
|
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_public_const_get(VALUE klass, ID id)
|
|
|
|
{
|
|
|
|
return rb_const_get_0(klass, id, FALSE, TRUE, TRUE);
|
|
|
|
}
|
|
|
|
|
mjit_compile.c: merge initial JIT compiler
which has been developed by Takashi Kokubun <takashikkbn@gmail> as
YARV-MJIT. Many of its bugs are fixed by wanabe <s.wanabe@gmail.com>.
This JIT compiler is designed to be a safe migration path to introduce
JIT compiler to MRI. So this commit does not include any bytecode
changes or dynamic instruction modifications, which are done in original
MJIT.
This commit even strips off some aggressive optimizations from
YARV-MJIT, and thus it's slower than YARV-MJIT too. But it's still
fairly faster than Ruby 2.5 in some benchmarks (attached below).
Note that this JIT compiler passes `make test`, `make test-all`, `make
test-spec` without JIT, and even with JIT. Not only it's perfectly safe
with JIT disabled because it does not replace VM instructions unlike
MJIT, but also with JIT enabled it stably runs Ruby applications
including Rails applications.
I'm expecting this version as just "initial" JIT compiler. I have many
optimization ideas which are skipped for initial merging, and you may
easily replace this JIT compiler with a faster one by just replacing
mjit_compile.c. `mjit_compile` interface is designed for the purpose.
common.mk: update dependencies for mjit_compile.c.
internal.h: declare `rb_vm_insn_addr2insn` for MJIT.
vm.c: exclude some definitions if `-DMJIT_HEADER` is provided to
compiler. This avoids to include some functions which take a long time
to compile, e.g. vm_exec_core. Some of the purpose is achieved in
transform_mjit_header.rb (see `IGNORED_FUNCTIONS`) but others are
manually resolved for now. Load mjit_helper.h for MJIT header.
mjit_helper.h: New. This is a file used only by JIT-ed code. I'll
refactor `mjit_call_cfunc` later.
vm_eval.c: add some #ifdef switches to skip compiling some functions
like Init_vm_eval.
win32/mkexports.rb: export thread/ec functions, which are used by MJIT.
include/ruby/defines.h: add MJIT_FUNC_EXPORTED macro alis to clarify
that a function is exported only for MJIT.
array.c: export a function used by MJIT.
bignum.c: ditto.
class.c: ditto.
compile.c: ditto.
error.c: ditto.
gc.c: ditto.
hash.c: ditto.
iseq.c: ditto.
numeric.c: ditto.
object.c: ditto.
proc.c: ditto.
re.c: ditto.
st.c: ditto.
string.c: ditto.
thread.c: ditto.
variable.c: ditto.
vm_backtrace.c: ditto.
vm_insnhelper.c: ditto.
vm_method.c: ditto.
I would like to improve maintainability of function exports, but I
believe this way is acceptable as initial merging if we clarify the
new exports are for MJIT (so that we can use them as TODO list to fix)
and add unit tests to detect unresolved symbols.
I'll add unit tests of JIT compilations in succeeding commits.
Author: Takashi Kokubun <takashikkbn@gmail.com>
Contributor: wanabe <s.wanabe@gmail.com>
Part of [Feature #14235]
---
* Known issues
* Code generated by gcc is faster than clang. The benchmark may be worse
in macOS. Following benchmark result is provided by gcc w/ Linux.
* Performance is decreased when Google Chrome is running
* JIT can work on MinGW, but it doesn't improve performance at least
in short running benchmark.
* Currently it doesn't perform well with Rails. We'll try to fix this
before release.
---
* Benchmark reslts
Benchmarked with:
Intel 4.0GHz i7-4790K with 16GB memory under x86-64 Ubuntu 8 Cores
- 2.0.0-p0: Ruby 2.0.0-p0
- r62186: Ruby trunk (early 2.6.0), before MJIT changes
- JIT off: On this commit, but without `--jit` option
- JIT on: On this commit, and with `--jit` option
** Optcarrot fps
Benchmark: https://github.com/mame/optcarrot
| |2.0.0-p0 |r62186 |JIT off |JIT on |
|:--------|:--------|:--------|:--------|:--------|
|fps |37.32 |51.46 |51.31 |58.88 |
|vs 2.0.0 |1.00x |1.38x |1.37x |1.58x |
** MJIT benchmarks
Benchmark: https://github.com/benchmark-driver/mjit-benchmarks
(Original: https://github.com/vnmakarov/ruby/tree/rtl_mjit_branch/MJIT-benchmarks)
| |2.0.0-p0 |r62186 |JIT off |JIT on |
|:----------|:--------|:--------|:--------|:--------|
|aread |1.00 |1.09 |1.07 |2.19 |
|aref |1.00 |1.13 |1.11 |2.22 |
|aset |1.00 |1.50 |1.45 |2.64 |
|awrite |1.00 |1.17 |1.13 |2.20 |
|call |1.00 |1.29 |1.26 |2.02 |
|const2 |1.00 |1.10 |1.10 |2.19 |
|const |1.00 |1.11 |1.10 |2.19 |
|fannk |1.00 |1.04 |1.02 |1.00 |
|fib |1.00 |1.32 |1.31 |1.84 |
|ivread |1.00 |1.13 |1.12 |2.43 |
|ivwrite |1.00 |1.23 |1.21 |2.40 |
|mandelbrot |1.00 |1.13 |1.16 |1.28 |
|meteor |1.00 |2.97 |2.92 |3.17 |
|nbody |1.00 |1.17 |1.15 |1.49 |
|nest-ntimes|1.00 |1.22 |1.20 |1.39 |
|nest-while |1.00 |1.10 |1.10 |1.37 |
|norm |1.00 |1.18 |1.16 |1.24 |
|nsvb |1.00 |1.16 |1.16 |1.17 |
|red-black |1.00 |1.02 |0.99 |1.12 |
|sieve |1.00 |1.30 |1.28 |1.62 |
|trees |1.00 |1.14 |1.13 |1.19 |
|while |1.00 |1.12 |1.11 |2.41 |
** Discourse's script/bench.rb
Benchmark: https://github.com/discourse/discourse/blob/v1.8.7/script/bench.rb
NOTE: Rails performance was somehow a little degraded with JIT for now.
We should fix this.
(At least I know opt_aref is performing badly in JIT and I have an idea
to fix it. Please wait for the fix.)
*** JIT off
Your Results: (note for timings- percentile is first, duration is second in millisecs)
categories_admin:
50: 17
75: 18
90: 22
99: 29
home_admin:
50: 21
75: 21
90: 27
99: 40
topic_admin:
50: 17
75: 18
90: 22
99: 32
categories:
50: 35
75: 41
90: 43
99: 77
home:
50: 39
75: 46
90: 49
99: 95
topic:
50: 46
75: 52
90: 56
99: 101
*** JIT on
Your Results: (note for timings- percentile is first, duration is second in millisecs)
categories_admin:
50: 19
75: 21
90: 25
99: 33
home_admin:
50: 24
75: 26
90: 30
99: 35
topic_admin:
50: 19
75: 20
90: 25
99: 30
categories:
50: 40
75: 44
90: 48
99: 76
home:
50: 42
75: 48
90: 51
99: 89
topic:
50: 49
75: 55
90: 58
99: 99
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62197 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2018-02-04 14:22:28 +03:00
|
|
|
MJIT_FUNC_EXPORTED VALUE
|
2011-01-28 20:57:27 +03:00
|
|
|
rb_public_const_get_at(VALUE klass, ID id)
|
|
|
|
{
|
|
|
|
return rb_const_get_0(klass, id, TRUE, FALSE, TRUE);
|
2003-06-20 11:11:44 +04:00
|
|
|
}
|
|
|
|
|
2018-12-28 13:33:02 +03:00
|
|
|
NORETURN(static void undefined_constant(VALUE mod, VALUE name));
|
|
|
|
static void
|
|
|
|
undefined_constant(VALUE mod, VALUE name)
|
|
|
|
{
|
|
|
|
rb_name_err_raise("constant %2$s::%1$s not defined",
|
|
|
|
mod, name);
|
|
|
|
}
|
|
|
|
|
2018-12-13 15:49:05 +03:00
|
|
|
static VALUE
|
|
|
|
rb_const_location_from(VALUE klass, ID id, int exclude, int recurse, int visibility)
|
|
|
|
{
|
|
|
|
while (RTEST(klass)) {
|
2019-06-22 19:47:40 +03:00
|
|
|
rb_const_entry_t *ce;
|
2018-12-13 15:49:05 +03:00
|
|
|
|
2019-06-22 19:47:40 +03:00
|
|
|
while ((ce = rb_const_lookup(klass, id))) {
|
|
|
|
if (visibility && RB_CONST_PRIVATE_P(ce)) {
|
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
if (exclude && klass == rb_cObject) {
|
|
|
|
goto not_found;
|
|
|
|
}
|
|
|
|
if (NIL_P(ce->file)) return rb_ary_new();
|
|
|
|
return rb_assoc_new(ce->file, INT2NUM(ce->line));
|
|
|
|
}
|
|
|
|
if (!recurse) break;
|
|
|
|
klass = RCLASS_SUPER(klass);
|
2018-12-13 15:49:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
not_found:
|
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
rb_const_location(VALUE klass, ID id, int exclude, int recurse, int visibility)
|
|
|
|
{
|
|
|
|
VALUE loc;
|
|
|
|
|
|
|
|
if (klass == rb_cObject) exclude = FALSE;
|
|
|
|
loc = rb_const_location_from(klass, id, exclude, recurse, visibility);
|
|
|
|
if (!NIL_P(loc)) return loc;
|
|
|
|
if (exclude) return loc;
|
|
|
|
if (BUILTIN_TYPE(klass) != T_MODULE) return loc;
|
|
|
|
/* search global const too, if klass is a module */
|
|
|
|
return rb_const_location_from(rb_cObject, id, FALSE, recurse, visibility);
|
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_const_source_location_from(VALUE klass, ID id)
|
|
|
|
{
|
|
|
|
return rb_const_location(klass, id, TRUE, TRUE, FALSE);
|
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_const_source_location(VALUE klass, ID id)
|
|
|
|
{
|
|
|
|
return rb_const_location(klass, id, FALSE, TRUE, FALSE);
|
|
|
|
}
|
|
|
|
|
2019-09-01 10:25:01 +03:00
|
|
|
MJIT_FUNC_EXPORTED VALUE
|
2018-12-13 15:49:05 +03:00
|
|
|
rb_const_source_location_at(VALUE klass, ID id)
|
|
|
|
{
|
|
|
|
return rb_const_location(klass, id, TRUE, FALSE, FALSE);
|
|
|
|
}
|
|
|
|
|
2003-12-28 09:33:07 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* remove_const(sym) -> obj
|
2009-02-15 05:45:31 +03:00
|
|
|
*
|
2003-12-28 09:33:07 +03:00
|
|
|
* Removes the definition of the given constant, returning that
|
2012-03-14 08:48:02 +04:00
|
|
|
* constant's previous value. If that constant referred to
|
|
|
|
* a module, this will not change that module's name and can lead
|
|
|
|
* to confusion.
|
2003-12-28 09:33:07 +03:00
|
|
|
*/
|
|
|
|
|
1999-01-20 07:59:39 +03: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 14:44:21 +04:00
|
|
|
rb_mod_remove_const(VALUE mod, VALUE name)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
2015-10-28 09:24:12 +03:00
|
|
|
const ID id = id_for_var(mod, name, a, constant);
|
1999-01-20 07:59:39 +03:00
|
|
|
|
2011-07-23 19:05:03 +04:00
|
|
|
if (!id) {
|
2018-12-28 13:33:02 +03:00
|
|
|
undefined_constant(mod, name);
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
2010-03-12 01:15:11 +03:00
|
|
|
return rb_const_remove(mod, id);
|
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_const_remove(VALUE mod, ID id)
|
|
|
|
{
|
|
|
|
VALUE val;
|
use id_table for constant tables
valgrind 3.9.0 on x86-64 reports a minor reduction in memory usage
when loading only RubyGems and RDoc by running: ruby -rrdoc -eexit
before: HEAP SUMMARY:
in use at exit: 2,913,448 bytes in 27,394 blocks
total heap usage: 48,362 allocs, 20,968 frees, 9,034,621 bytes alloc
after: HEAP SUMMARY:
in use at exit: 2,880,056 bytes in 26,712 blocks
total heap usage: 47,791 allocs, 21,079 frees, 9,046,507 bytes alloc
* class.c (struct clone_const_arg): adjust for id_table
(clone_const): ditto
(clone_const_i): ditto
(rb_mod_init_copy): ditto
(rb_singleton_class_clone_and_attach): ditto
(rb_include_class_new): ditto
(include_modules_at): ditto
* constant.h (rb_free_const_table): ditto
* gc.c (free_const_entry_i): ditto
(rb_free_const_table): ditto
(obj_memsize_of): ditto
(mark_const_entry_i): ditto
(mark_const_tbl): ditto
* internal.h (struct rb_classext_struct): ditto
* object.c (rb_mod_const_set): resolve class name on assignment
* variable.c (const_update): replace with const_tbl_update
(const_tbl_update): new function
(fc_i): adjust for id_table
(find_class_path): ditto
(autoload_const_set): st_update => const_tbl_update
(rb_const_remove): adjust for id_table
(sv_i): ditto
(rb_local_constants_i): ditto
(rb_local_constants): ditto
(rb_mod_const_at): ditto
(rb_mod_const_set): ditto
(rb_const_lookup): ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53376 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-29 23:19:14 +03:00
|
|
|
rb_const_entry_t *ce;
|
2010-03-12 01:15:11 +03:00
|
|
|
|
* array.c, gc.c, hash.c, object.c, string.c, struct.c,
transcode.c, variable.c, vm.c, vm_insnhelper.c, vm_method.c:
replace calls to rb_error_frozen() with rb_check_frozen(). a
patch from Run Paint Run Run at [ruby-core:32014]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29583 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-10-24 12:14:05 +04:00
|
|
|
rb_check_frozen(mod);
|
use id_table for constant tables
valgrind 3.9.0 on x86-64 reports a minor reduction in memory usage
when loading only RubyGems and RDoc by running: ruby -rrdoc -eexit
before: HEAP SUMMARY:
in use at exit: 2,913,448 bytes in 27,394 blocks
total heap usage: 48,362 allocs, 20,968 frees, 9,034,621 bytes alloc
after: HEAP SUMMARY:
in use at exit: 2,880,056 bytes in 26,712 blocks
total heap usage: 47,791 allocs, 21,079 frees, 9,046,507 bytes alloc
* class.c (struct clone_const_arg): adjust for id_table
(clone_const): ditto
(clone_const_i): ditto
(rb_mod_init_copy): ditto
(rb_singleton_class_clone_and_attach): ditto
(rb_include_class_new): ditto
(include_modules_at): ditto
* constant.h (rb_free_const_table): ditto
* gc.c (free_const_entry_i): ditto
(rb_free_const_table): ditto
(obj_memsize_of): ditto
(mark_const_entry_i): ditto
(mark_const_tbl): ditto
* internal.h (struct rb_classext_struct): ditto
* object.c (rb_mod_const_set): resolve class name on assignment
* variable.c (const_update): replace with const_tbl_update
(const_tbl_update): new function
(fc_i): adjust for id_table
(find_class_path): ditto
(autoload_const_set): st_update => const_tbl_update
(rb_const_remove): adjust for id_table
(sv_i): ditto
(rb_local_constants_i): ditto
(rb_local_constants): ditto
(rb_mod_const_at): ditto
(rb_mod_const_set): ditto
(rb_const_lookup): ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53376 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-29 23:19:14 +03:00
|
|
|
ce = rb_const_lookup(mod, id);
|
|
|
|
if (!ce || !rb_id_table_delete(RCLASS_CONST_TBL(mod), id)) {
|
2009-09-13 17:18:35 +04:00
|
|
|
if (rb_const_defined_at(mod, id)) {
|
2015-10-28 09:24:12 +03:00
|
|
|
rb_name_err_raise("cannot remove %2$s::%1$s",
|
|
|
|
mod, ID2SYM(id));
|
2003-05-30 01:21:23 +04:00
|
|
|
}
|
2018-12-28 13:33:02 +03:00
|
|
|
undefined_constant(mod, ID2SYM(id));
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
2009-09-13 17:18:35 +04:00
|
|
|
|
* insns.def, vm.c, vm_insnhelper.c, vm_insnhelper.h, vm_method.c: split
ruby_vm_global_state_version into two separate counters - one for the
global method state and one for the global constant state. This means
changes to constants do not affect method caches, and changes to
methods do not affect constant caches. In particular, this means
inclusions of modules containing constants no longer globally
invalidate the method cache.
* class.c, eval.c, include/ruby/intern.h, insns.def, vm.c, vm_method.c:
rename rb_clear_cache_by_class to rb_clear_method_cache_by_class
* class.c, include/ruby/intern.h, variable.c, vm_method.c: add
rb_clear_constant_cache
* compile.c, vm_core.h, vm_insnhelper.c: rename vmstat field in
rb_call_info_struct to method_state
* vm_method.c: rename vmstat field in struct cache_entry to method_state
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43455 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-10-29 04:52:38 +04:00
|
|
|
rb_clear_constant_cache();
|
2009-09-13 17:18:35 +04:00
|
|
|
|
use id_table for constant tables
valgrind 3.9.0 on x86-64 reports a minor reduction in memory usage
when loading only RubyGems and RDoc by running: ruby -rrdoc -eexit
before: HEAP SUMMARY:
in use at exit: 2,913,448 bytes in 27,394 blocks
total heap usage: 48,362 allocs, 20,968 frees, 9,034,621 bytes alloc
after: HEAP SUMMARY:
in use at exit: 2,880,056 bytes in 26,712 blocks
total heap usage: 47,791 allocs, 21,079 frees, 9,046,507 bytes alloc
* class.c (struct clone_const_arg): adjust for id_table
(clone_const): ditto
(clone_const_i): ditto
(rb_mod_init_copy): ditto
(rb_singleton_class_clone_and_attach): ditto
(rb_include_class_new): ditto
(include_modules_at): ditto
* constant.h (rb_free_const_table): ditto
* gc.c (free_const_entry_i): ditto
(rb_free_const_table): ditto
(obj_memsize_of): ditto
(mark_const_entry_i): ditto
(mark_const_tbl): ditto
* internal.h (struct rb_classext_struct): ditto
* object.c (rb_mod_const_set): resolve class name on assignment
* variable.c (const_update): replace with const_tbl_update
(const_tbl_update): new function
(fc_i): adjust for id_table
(find_class_path): ditto
(autoload_const_set): st_update => const_tbl_update
(rb_const_remove): adjust for id_table
(sv_i): ditto
(rb_local_constants_i): ditto
(rb_local_constants): ditto
(rb_mod_const_at): ditto
(rb_mod_const_set): ditto
(rb_const_lookup): ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53376 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-29 23:19:14 +03:00
|
|
|
val = ce->value;
|
2009-09-13 17:18:35 +04:00
|
|
|
if (val == Qundef) {
|
|
|
|
autoload_delete(mod, id);
|
|
|
|
val = Qnil;
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
use id_table for constant tables
valgrind 3.9.0 on x86-64 reports a minor reduction in memory usage
when loading only RubyGems and RDoc by running: ruby -rrdoc -eexit
before: HEAP SUMMARY:
in use at exit: 2,913,448 bytes in 27,394 blocks
total heap usage: 48,362 allocs, 20,968 frees, 9,034,621 bytes alloc
after: HEAP SUMMARY:
in use at exit: 2,880,056 bytes in 26,712 blocks
total heap usage: 47,791 allocs, 21,079 frees, 9,046,507 bytes alloc
* class.c (struct clone_const_arg): adjust for id_table
(clone_const): ditto
(clone_const_i): ditto
(rb_mod_init_copy): ditto
(rb_singleton_class_clone_and_attach): ditto
(rb_include_class_new): ditto
(include_modules_at): ditto
* constant.h (rb_free_const_table): ditto
* gc.c (free_const_entry_i): ditto
(rb_free_const_table): ditto
(obj_memsize_of): ditto
(mark_const_entry_i): ditto
(mark_const_tbl): ditto
* internal.h (struct rb_classext_struct): ditto
* object.c (rb_mod_const_set): resolve class name on assignment
* variable.c (const_update): replace with const_tbl_update
(const_tbl_update): new function
(fc_i): adjust for id_table
(find_class_path): ditto
(autoload_const_set): st_update => const_tbl_update
(rb_const_remove): adjust for id_table
(sv_i): ditto
(rb_local_constants_i): ditto
(rb_local_constants): ditto
(rb_mod_const_at): ditto
(rb_mod_const_set): ditto
(rb_const_lookup): ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53376 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-29 23:19:14 +03:00
|
|
|
xfree(ce);
|
2009-09-13 17:18:35 +04:00
|
|
|
return val;
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
|
|
|
|
2014-10-08 12:27:54 +04:00
|
|
|
static int
|
|
|
|
cv_i_update(st_data_t *k, st_data_t *v, st_data_t a, int existing)
|
|
|
|
{
|
|
|
|
if (existing) return ST_STOP;
|
|
|
|
*v = a;
|
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
use id_table for constant tables
valgrind 3.9.0 on x86-64 reports a minor reduction in memory usage
when loading only RubyGems and RDoc by running: ruby -rrdoc -eexit
before: HEAP SUMMARY:
in use at exit: 2,913,448 bytes in 27,394 blocks
total heap usage: 48,362 allocs, 20,968 frees, 9,034,621 bytes alloc
after: HEAP SUMMARY:
in use at exit: 2,880,056 bytes in 26,712 blocks
total heap usage: 47,791 allocs, 21,079 frees, 9,046,507 bytes alloc
* class.c (struct clone_const_arg): adjust for id_table
(clone_const): ditto
(clone_const_i): ditto
(rb_mod_init_copy): ditto
(rb_singleton_class_clone_and_attach): ditto
(rb_include_class_new): ditto
(include_modules_at): ditto
* constant.h (rb_free_const_table): ditto
* gc.c (free_const_entry_i): ditto
(rb_free_const_table): ditto
(obj_memsize_of): ditto
(mark_const_entry_i): ditto
(mark_const_tbl): ditto
* internal.h (struct rb_classext_struct): ditto
* object.c (rb_mod_const_set): resolve class name on assignment
* variable.c (const_update): replace with const_tbl_update
(const_tbl_update): new function
(fc_i): adjust for id_table
(find_class_path): ditto
(autoload_const_set): st_update => const_tbl_update
(rb_const_remove): adjust for id_table
(sv_i): ditto
(rb_local_constants_i): ditto
(rb_local_constants): ditto
(rb_mod_const_at): ditto
(rb_mod_const_set): ditto
(rb_const_lookup): ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53376 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-29 23:19:14 +03:00
|
|
|
static enum rb_id_table_iterator_result
|
|
|
|
sv_i(ID key, VALUE v, void *a)
|
2001-06-05 11:19:39 +04:00
|
|
|
{
|
2012-03-31 02:40:54 +04:00
|
|
|
rb_const_entry_t *ce = (rb_const_entry_t *)v;
|
use id_table for constant tables
valgrind 3.9.0 on x86-64 reports a minor reduction in memory usage
when loading only RubyGems and RDoc by running: ruby -rrdoc -eexit
before: HEAP SUMMARY:
in use at exit: 2,913,448 bytes in 27,394 blocks
total heap usage: 48,362 allocs, 20,968 frees, 9,034,621 bytes alloc
after: HEAP SUMMARY:
in use at exit: 2,880,056 bytes in 26,712 blocks
total heap usage: 47,791 allocs, 21,079 frees, 9,046,507 bytes alloc
* class.c (struct clone_const_arg): adjust for id_table
(clone_const): ditto
(clone_const_i): ditto
(rb_mod_init_copy): ditto
(rb_singleton_class_clone_and_attach): ditto
(rb_include_class_new): ditto
(include_modules_at): ditto
* constant.h (rb_free_const_table): ditto
* gc.c (free_const_entry_i): ditto
(rb_free_const_table): ditto
(obj_memsize_of): ditto
(mark_const_entry_i): ditto
(mark_const_tbl): ditto
* internal.h (struct rb_classext_struct): ditto
* object.c (rb_mod_const_set): resolve class name on assignment
* variable.c (const_update): replace with const_tbl_update
(const_tbl_update): new function
(fc_i): adjust for id_table
(find_class_path): ditto
(autoload_const_set): st_update => const_tbl_update
(rb_const_remove): adjust for id_table
(sv_i): ditto
(rb_local_constants_i): ditto
(rb_local_constants): ditto
(rb_mod_const_at): ditto
(rb_mod_const_set): ditto
(rb_const_lookup): ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53376 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-29 23:19:14 +03:00
|
|
|
st_table *tbl = a;
|
2012-03-31 02:40:54 +04:00
|
|
|
|
2001-06-05 11:19:39 +04:00
|
|
|
if (rb_is_const_id(key)) {
|
2014-10-08 12:27:54 +04:00
|
|
|
st_update(tbl, (st_data_t)key, cv_i_update, (st_data_t)ce);
|
2001-06-05 11:19:39 +04:00
|
|
|
}
|
use id_table for constant tables
valgrind 3.9.0 on x86-64 reports a minor reduction in memory usage
when loading only RubyGems and RDoc by running: ruby -rrdoc -eexit
before: HEAP SUMMARY:
in use at exit: 2,913,448 bytes in 27,394 blocks
total heap usage: 48,362 allocs, 20,968 frees, 9,034,621 bytes alloc
after: HEAP SUMMARY:
in use at exit: 2,880,056 bytes in 26,712 blocks
total heap usage: 47,791 allocs, 21,079 frees, 9,046,507 bytes alloc
* class.c (struct clone_const_arg): adjust for id_table
(clone_const): ditto
(clone_const_i): ditto
(rb_mod_init_copy): ditto
(rb_singleton_class_clone_and_attach): ditto
(rb_include_class_new): ditto
(include_modules_at): ditto
* constant.h (rb_free_const_table): ditto
* gc.c (free_const_entry_i): ditto
(rb_free_const_table): ditto
(obj_memsize_of): ditto
(mark_const_entry_i): ditto
(mark_const_tbl): ditto
* internal.h (struct rb_classext_struct): ditto
* object.c (rb_mod_const_set): resolve class name on assignment
* variable.c (const_update): replace with const_tbl_update
(const_tbl_update): new function
(fc_i): adjust for id_table
(find_class_path): ditto
(autoload_const_set): st_update => const_tbl_update
(rb_const_remove): adjust for id_table
(sv_i): ditto
(rb_local_constants_i): ditto
(rb_local_constants): ditto
(rb_mod_const_at): ditto
(rb_mod_const_set): ditto
(rb_const_lookup): ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53376 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-29 23:19:14 +03:00
|
|
|
return ID_TABLE_CONTINUE;
|
2001-06-05 11:19:39 +04:00
|
|
|
}
|
|
|
|
|
use id_table for constant tables
valgrind 3.9.0 on x86-64 reports a minor reduction in memory usage
when loading only RubyGems and RDoc by running: ruby -rrdoc -eexit
before: HEAP SUMMARY:
in use at exit: 2,913,448 bytes in 27,394 blocks
total heap usage: 48,362 allocs, 20,968 frees, 9,034,621 bytes alloc
after: HEAP SUMMARY:
in use at exit: 2,880,056 bytes in 26,712 blocks
total heap usage: 47,791 allocs, 21,079 frees, 9,046,507 bytes alloc
* class.c (struct clone_const_arg): adjust for id_table
(clone_const): ditto
(clone_const_i): ditto
(rb_mod_init_copy): ditto
(rb_singleton_class_clone_and_attach): ditto
(rb_include_class_new): ditto
(include_modules_at): ditto
* constant.h (rb_free_const_table): ditto
* gc.c (free_const_entry_i): ditto
(rb_free_const_table): ditto
(obj_memsize_of): ditto
(mark_const_entry_i): ditto
(mark_const_tbl): ditto
* internal.h (struct rb_classext_struct): ditto
* object.c (rb_mod_const_set): resolve class name on assignment
* variable.c (const_update): replace with const_tbl_update
(const_tbl_update): new function
(fc_i): adjust for id_table
(find_class_path): ditto
(autoload_const_set): st_update => const_tbl_update
(rb_const_remove): adjust for id_table
(sv_i): ditto
(rb_local_constants_i): ditto
(rb_local_constants): ditto
(rb_mod_const_at): ditto
(rb_mod_const_set): ditto
(rb_const_lookup): ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53376 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-29 23:19:14 +03:00
|
|
|
static enum rb_id_table_iterator_result
|
|
|
|
rb_local_constants_i(ID const_name, VALUE const_value, void *ary)
|
2013-12-02 12:26:29 +04:00
|
|
|
{
|
2016-07-19 09:39:01 +03:00
|
|
|
if (rb_is_const_id(const_name) && !RB_CONST_PRIVATE_P((rb_const_entry_t *)const_value)) {
|
2016-05-27 11:38:50 +03:00
|
|
|
rb_ary_push((VALUE)ary, ID2SYM(const_name));
|
|
|
|
}
|
use id_table for constant tables
valgrind 3.9.0 on x86-64 reports a minor reduction in memory usage
when loading only RubyGems and RDoc by running: ruby -rrdoc -eexit
before: HEAP SUMMARY:
in use at exit: 2,913,448 bytes in 27,394 blocks
total heap usage: 48,362 allocs, 20,968 frees, 9,034,621 bytes alloc
after: HEAP SUMMARY:
in use at exit: 2,880,056 bytes in 26,712 blocks
total heap usage: 47,791 allocs, 21,079 frees, 9,046,507 bytes alloc
* class.c (struct clone_const_arg): adjust for id_table
(clone_const): ditto
(clone_const_i): ditto
(rb_mod_init_copy): ditto
(rb_singleton_class_clone_and_attach): ditto
(rb_include_class_new): ditto
(include_modules_at): ditto
* constant.h (rb_free_const_table): ditto
* gc.c (free_const_entry_i): ditto
(rb_free_const_table): ditto
(obj_memsize_of): ditto
(mark_const_entry_i): ditto
(mark_const_tbl): ditto
* internal.h (struct rb_classext_struct): ditto
* object.c (rb_mod_const_set): resolve class name on assignment
* variable.c (const_update): replace with const_tbl_update
(const_tbl_update): new function
(fc_i): adjust for id_table
(find_class_path): ditto
(autoload_const_set): st_update => const_tbl_update
(rb_const_remove): adjust for id_table
(sv_i): ditto
(rb_local_constants_i): ditto
(rb_local_constants): ditto
(rb_mod_const_at): ditto
(rb_mod_const_set): ditto
(rb_const_lookup): ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53376 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-29 23:19:14 +03:00
|
|
|
return ID_TABLE_CONTINUE;
|
2013-12-02 12:26:29 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
rb_local_constants(VALUE mod)
|
|
|
|
{
|
use id_table for constant tables
valgrind 3.9.0 on x86-64 reports a minor reduction in memory usage
when loading only RubyGems and RDoc by running: ruby -rrdoc -eexit
before: HEAP SUMMARY:
in use at exit: 2,913,448 bytes in 27,394 blocks
total heap usage: 48,362 allocs, 20,968 frees, 9,034,621 bytes alloc
after: HEAP SUMMARY:
in use at exit: 2,880,056 bytes in 26,712 blocks
total heap usage: 47,791 allocs, 21,079 frees, 9,046,507 bytes alloc
* class.c (struct clone_const_arg): adjust for id_table
(clone_const): ditto
(clone_const_i): ditto
(rb_mod_init_copy): ditto
(rb_singleton_class_clone_and_attach): ditto
(rb_include_class_new): ditto
(include_modules_at): ditto
* constant.h (rb_free_const_table): ditto
* gc.c (free_const_entry_i): ditto
(rb_free_const_table): ditto
(obj_memsize_of): ditto
(mark_const_entry_i): ditto
(mark_const_tbl): ditto
* internal.h (struct rb_classext_struct): ditto
* object.c (rb_mod_const_set): resolve class name on assignment
* variable.c (const_update): replace with const_tbl_update
(const_tbl_update): new function
(fc_i): adjust for id_table
(find_class_path): ditto
(autoload_const_set): st_update => const_tbl_update
(rb_const_remove): adjust for id_table
(sv_i): ditto
(rb_local_constants_i): ditto
(rb_local_constants): ditto
(rb_mod_const_at): ditto
(rb_mod_const_set): ditto
(rb_const_lookup): ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53376 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-29 23:19:14 +03:00
|
|
|
struct rb_id_table *tbl = RCLASS_CONST_TBL(mod);
|
2013-12-02 12:26:29 +04:00
|
|
|
VALUE ary;
|
|
|
|
|
|
|
|
if (!tbl) return rb_ary_new2(0);
|
|
|
|
|
use id_table for constant tables
valgrind 3.9.0 on x86-64 reports a minor reduction in memory usage
when loading only RubyGems and RDoc by running: ruby -rrdoc -eexit
before: HEAP SUMMARY:
in use at exit: 2,913,448 bytes in 27,394 blocks
total heap usage: 48,362 allocs, 20,968 frees, 9,034,621 bytes alloc
after: HEAP SUMMARY:
in use at exit: 2,880,056 bytes in 26,712 blocks
total heap usage: 47,791 allocs, 21,079 frees, 9,046,507 bytes alloc
* class.c (struct clone_const_arg): adjust for id_table
(clone_const): ditto
(clone_const_i): ditto
(rb_mod_init_copy): ditto
(rb_singleton_class_clone_and_attach): ditto
(rb_include_class_new): ditto
(include_modules_at): ditto
* constant.h (rb_free_const_table): ditto
* gc.c (free_const_entry_i): ditto
(rb_free_const_table): ditto
(obj_memsize_of): ditto
(mark_const_entry_i): ditto
(mark_const_tbl): ditto
* internal.h (struct rb_classext_struct): ditto
* object.c (rb_mod_const_set): resolve class name on assignment
* variable.c (const_update): replace with const_tbl_update
(const_tbl_update): new function
(fc_i): adjust for id_table
(find_class_path): ditto
(autoload_const_set): st_update => const_tbl_update
(rb_const_remove): adjust for id_table
(sv_i): ditto
(rb_local_constants_i): ditto
(rb_local_constants): ditto
(rb_mod_const_at): ditto
(rb_mod_const_set): ditto
(rb_const_lookup): ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53376 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-29 23:19:14 +03:00
|
|
|
ary = rb_ary_new2(rb_id_table_size(tbl));
|
|
|
|
rb_id_table_foreach(tbl, rb_local_constants_i, (void *)ary);
|
2013-12-02 12:26:29 +04:00
|
|
|
return ary;
|
|
|
|
}
|
|
|
|
|
2001-06-05 11:19:39 +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 14:44:21 +04:00
|
|
|
rb_mod_const_at(VALUE mod, void *data)
|
1998-01-16 15:19:22 +03:00
|
|
|
{
|
2001-06-05 11:19:39 +04:00
|
|
|
st_table *tbl = data;
|
|
|
|
if (!tbl) {
|
|
|
|
tbl = st_init_numtable();
|
|
|
|
}
|
2010-10-26 21:27:21 +04:00
|
|
|
if (RCLASS_CONST_TBL(mod)) {
|
use id_table for constant tables
valgrind 3.9.0 on x86-64 reports a minor reduction in memory usage
when loading only RubyGems and RDoc by running: ruby -rrdoc -eexit
before: HEAP SUMMARY:
in use at exit: 2,913,448 bytes in 27,394 blocks
total heap usage: 48,362 allocs, 20,968 frees, 9,034,621 bytes alloc
after: HEAP SUMMARY:
in use at exit: 2,880,056 bytes in 26,712 blocks
total heap usage: 47,791 allocs, 21,079 frees, 9,046,507 bytes alloc
* class.c (struct clone_const_arg): adjust for id_table
(clone_const): ditto
(clone_const_i): ditto
(rb_mod_init_copy): ditto
(rb_singleton_class_clone_and_attach): ditto
(rb_include_class_new): ditto
(include_modules_at): ditto
* constant.h (rb_free_const_table): ditto
* gc.c (free_const_entry_i): ditto
(rb_free_const_table): ditto
(obj_memsize_of): ditto
(mark_const_entry_i): ditto
(mark_const_tbl): ditto
* internal.h (struct rb_classext_struct): ditto
* object.c (rb_mod_const_set): resolve class name on assignment
* variable.c (const_update): replace with const_tbl_update
(const_tbl_update): new function
(fc_i): adjust for id_table
(find_class_path): ditto
(autoload_const_set): st_update => const_tbl_update
(rb_const_remove): adjust for id_table
(sv_i): ditto
(rb_local_constants_i): ditto
(rb_local_constants): ditto
(rb_mod_const_at): ditto
(rb_mod_const_set): ditto
(rb_const_lookup): ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53376 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-29 23:19:14 +03:00
|
|
|
rb_id_table_foreach(RCLASS_CONST_TBL(mod), sv_i, tbl);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2001-06-05 11:19:39 +04:00
|
|
|
return tbl;
|
1998-01-16 15:19:22 +03:00
|
|
|
}
|
|
|
|
|
2001-06-05 11:19:39 +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 14:44:21 +04:00
|
|
|
rb_mod_const_of(VALUE mod, void *data)
|
1998-01-16 15:19:22 +03:00
|
|
|
{
|
2003-07-03 15:02:53 +04:00
|
|
|
VALUE tmp = mod;
|
1998-01-16 15:19:22 +03:00
|
|
|
for (;;) {
|
2003-07-03 15:02:53 +04:00
|
|
|
data = rb_mod_const_at(tmp, data);
|
2007-09-28 10:21:46 +04:00
|
|
|
tmp = RCLASS_SUPER(tmp);
|
2003-07-03 15:02:53 +04:00
|
|
|
if (!tmp) break;
|
|
|
|
if (tmp == rb_cObject && mod != rb_cObject) break;
|
1998-01-16 15:19:22 +03:00
|
|
|
}
|
2001-06-05 11:19:39 +04:00
|
|
|
return data;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2011-01-28 20:57:48 +03:00
|
|
|
list_i(st_data_t key, st_data_t value, VALUE ary)
|
2001-06-05 11:19:39 +04:00
|
|
|
{
|
2011-01-28 20:57:48 +03:00
|
|
|
ID sym = (ID)key;
|
|
|
|
rb_const_entry_t *ce = (rb_const_entry_t *)value;
|
2014-10-08 12:27:51 +04:00
|
|
|
if (RB_CONST_PUBLIC_P(ce)) rb_ary_push(ary, ID2SYM(sym));
|
2001-06-05 11:19:39 +04:00
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
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 14:44:21 +04:00
|
|
|
rb_const_list(void *data)
|
2001-06-05 11:19:39 +04:00
|
|
|
{
|
|
|
|
st_table *tbl = data;
|
|
|
|
VALUE ary;
|
|
|
|
|
|
|
|
if (!tbl) return rb_ary_new2(0);
|
|
|
|
ary = rb_ary_new2(tbl->num_entries);
|
2004-09-29 09:15:33 +04:00
|
|
|
st_foreach_safe(tbl, list_i, ary);
|
2002-03-20 14:15:19 +03:00
|
|
|
st_free_table(tbl);
|
2001-06-05 11:19:39 +04:00
|
|
|
|
1998-01-16 15:19:22 +03:00
|
|
|
return ary;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-28 09:33:07 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* mod.constants(inherit=true) -> array
|
2009-02-15 05:45:31 +03:00
|
|
|
*
|
2003-12-28 09:33:07 +03:00
|
|
|
* Returns an array of the names of the constants accessible in
|
|
|
|
* <i>mod</i>. This includes the names of constants in any included
|
2012-07-19 10:41:47 +04:00
|
|
|
* modules (example at start of section), unless the <i>inherit</i>
|
2006-12-04 18:19:33 +03:00
|
|
|
* parameter is set to <code>false</code>.
|
|
|
|
*
|
2016-03-23 04:39:41 +03:00
|
|
|
* The implementation makes no guarantees about the order in which the
|
|
|
|
* constants are yielded.
|
|
|
|
*
|
2010-05-18 01:07:33 +04:00
|
|
|
* IO.constants.include?(:SYNC) #=> true
|
|
|
|
* IO.constants(false).include?(:SYNC) #=> false
|
2006-12-04 18:19:33 +03:00
|
|
|
*
|
2019-03-28 06:33:36 +03:00
|
|
|
* Also see Module#const_defined?.
|
2003-12-28 09:33:07 +03:00
|
|
|
*/
|
|
|
|
|
1999-11-17 10:30:37 +03:00
|
|
|
VALUE
|
2014-06-18 10:16:39 +04:00
|
|
|
rb_mod_constants(int argc, const VALUE *argv, VALUE mod)
|
1999-11-17 10:30:37 +03:00
|
|
|
{
|
2018-12-06 10:49:24 +03:00
|
|
|
bool inherit = TRUE;
|
2006-12-04 18:19:33 +03:00
|
|
|
|
2018-12-06 10:49:24 +03:00
|
|
|
if (rb_check_arity(argc, 0, 1)) inherit = RTEST(argv[0]);
|
2013-12-02 12:26:29 +04:00
|
|
|
|
2018-12-06 10:49:24 +03:00
|
|
|
if (inherit) {
|
2013-12-02 12:26:29 +04:00
|
|
|
return rb_const_list(rb_mod_const_of(mod, 0));
|
2006-12-04 18:19:33 +03:00
|
|
|
}
|
|
|
|
else {
|
2013-12-02 12:26:29 +04:00
|
|
|
return rb_local_constants(mod);
|
2006-12-04 18:19:33 +03:00
|
|
|
}
|
1999-11-17 10:30:37 +03:00
|
|
|
}
|
|
|
|
|
2003-08-30 04:04:02 +04:00
|
|
|
static int
|
2011-01-28 20:57:27 +03:00
|
|
|
rb_const_defined_0(VALUE klass, ID id, int exclude, int recurse, int visibility)
|
2003-06-20 11:11:44 +04:00
|
|
|
{
|
2009-07-30 11:10:51 +04:00
|
|
|
VALUE tmp;
|
2006-12-31 18:02:22 +03:00
|
|
|
int mod_retry = 0;
|
2014-08-04 05:12:53 +04:00
|
|
|
rb_const_entry_t *ce;
|
2003-06-20 11:11:44 +04:00
|
|
|
|
2003-10-02 07:00:23 +04:00
|
|
|
tmp = klass;
|
|
|
|
retry:
|
2003-06-20 11:11:44 +04:00
|
|
|
while (tmp) {
|
2014-08-04 05:12:53 +04:00
|
|
|
if ((ce = rb_const_lookup(tmp, id))) {
|
2014-10-08 12:27:51 +04:00
|
|
|
if (visibility && RB_CONST_PRIVATE_P(ce)) {
|
2011-01-28 20:57:27 +03:00
|
|
|
return (int)Qfalse;
|
|
|
|
}
|
2015-08-04 06:13:19 +03:00
|
|
|
if (ce->value == Qundef && !check_autoload_required(tmp, id, 0) &&
|
2018-02-13 12:36:35 +03:00
|
|
|
!rb_autoloading_value(tmp, id, NULL, NULL))
|
2009-09-22 17:11:21 +04:00
|
|
|
return (int)Qfalse;
|
2018-01-27 09:12:09 +03:00
|
|
|
|
|
|
|
if (exclude && tmp == rb_cObject && klass != rb_cObject) {
|
|
|
|
return (int)Qfalse;
|
|
|
|
}
|
|
|
|
|
2009-09-22 17:11:21 +04:00
|
|
|
return (int)Qtrue;
|
2003-06-20 11:11:44 +04:00
|
|
|
}
|
2011-06-30 22:34:09 +04:00
|
|
|
if (!recurse) break;
|
2007-09-28 10:21:46 +04:00
|
|
|
tmp = RCLASS_SUPER(tmp);
|
2003-06-20 11:11:44 +04:00
|
|
|
}
|
2006-12-31 18:02:22 +03:00
|
|
|
if (!exclude && !mod_retry && BUILTIN_TYPE(klass) == T_MODULE) {
|
|
|
|
mod_retry = 1;
|
|
|
|
tmp = rb_cObject;
|
|
|
|
goto retry;
|
2003-08-30 04:04:02 +04:00
|
|
|
}
|
2009-09-22 17:11:21 +04:00
|
|
|
return (int)Qfalse;
|
2003-06-20 11:11:44 +04:00
|
|
|
}
|
|
|
|
|
1998-01-16 15:13:05 +03: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 14:44:21 +04:00
|
|
|
rb_const_defined_from(VALUE klass, ID id)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2011-01-28 20:57:27 +03:00
|
|
|
return rb_const_defined_0(klass, id, TRUE, TRUE, FALSE);
|
2003-08-30 04:04:02 +04:00
|
|
|
}
|
1999-01-20 07:59:39 +03:00
|
|
|
|
2003-08-30 04:04:02 +04: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 14:44:21 +04:00
|
|
|
rb_const_defined(VALUE klass, ID id)
|
2003-08-30 04:04:02 +04:00
|
|
|
{
|
2011-01-28 20:57:27 +03:00
|
|
|
return rb_const_defined_0(klass, id, FALSE, TRUE, FALSE);
|
2003-08-30 04:04:02 +04: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 14:44:21 +04:00
|
|
|
rb_const_defined_at(VALUE klass, ID id)
|
2003-08-30 04:04:02 +04:00
|
|
|
{
|
2011-01-28 20:57:27 +03:00
|
|
|
return rb_const_defined_0(klass, id, TRUE, FALSE, FALSE);
|
|
|
|
}
|
|
|
|
|
mjit_compile.c: merge initial JIT compiler
which has been developed by Takashi Kokubun <takashikkbn@gmail> as
YARV-MJIT. Many of its bugs are fixed by wanabe <s.wanabe@gmail.com>.
This JIT compiler is designed to be a safe migration path to introduce
JIT compiler to MRI. So this commit does not include any bytecode
changes or dynamic instruction modifications, which are done in original
MJIT.
This commit even strips off some aggressive optimizations from
YARV-MJIT, and thus it's slower than YARV-MJIT too. But it's still
fairly faster than Ruby 2.5 in some benchmarks (attached below).
Note that this JIT compiler passes `make test`, `make test-all`, `make
test-spec` without JIT, and even with JIT. Not only it's perfectly safe
with JIT disabled because it does not replace VM instructions unlike
MJIT, but also with JIT enabled it stably runs Ruby applications
including Rails applications.
I'm expecting this version as just "initial" JIT compiler. I have many
optimization ideas which are skipped for initial merging, and you may
easily replace this JIT compiler with a faster one by just replacing
mjit_compile.c. `mjit_compile` interface is designed for the purpose.
common.mk: update dependencies for mjit_compile.c.
internal.h: declare `rb_vm_insn_addr2insn` for MJIT.
vm.c: exclude some definitions if `-DMJIT_HEADER` is provided to
compiler. This avoids to include some functions which take a long time
to compile, e.g. vm_exec_core. Some of the purpose is achieved in
transform_mjit_header.rb (see `IGNORED_FUNCTIONS`) but others are
manually resolved for now. Load mjit_helper.h for MJIT header.
mjit_helper.h: New. This is a file used only by JIT-ed code. I'll
refactor `mjit_call_cfunc` later.
vm_eval.c: add some #ifdef switches to skip compiling some functions
like Init_vm_eval.
win32/mkexports.rb: export thread/ec functions, which are used by MJIT.
include/ruby/defines.h: add MJIT_FUNC_EXPORTED macro alis to clarify
that a function is exported only for MJIT.
array.c: export a function used by MJIT.
bignum.c: ditto.
class.c: ditto.
compile.c: ditto.
error.c: ditto.
gc.c: ditto.
hash.c: ditto.
iseq.c: ditto.
numeric.c: ditto.
object.c: ditto.
proc.c: ditto.
re.c: ditto.
st.c: ditto.
string.c: ditto.
thread.c: ditto.
variable.c: ditto.
vm_backtrace.c: ditto.
vm_insnhelper.c: ditto.
vm_method.c: ditto.
I would like to improve maintainability of function exports, but I
believe this way is acceptable as initial merging if we clarify the
new exports are for MJIT (so that we can use them as TODO list to fix)
and add unit tests to detect unresolved symbols.
I'll add unit tests of JIT compilations in succeeding commits.
Author: Takashi Kokubun <takashikkbn@gmail.com>
Contributor: wanabe <s.wanabe@gmail.com>
Part of [Feature #14235]
---
* Known issues
* Code generated by gcc is faster than clang. The benchmark may be worse
in macOS. Following benchmark result is provided by gcc w/ Linux.
* Performance is decreased when Google Chrome is running
* JIT can work on MinGW, but it doesn't improve performance at least
in short running benchmark.
* Currently it doesn't perform well with Rails. We'll try to fix this
before release.
---
* Benchmark reslts
Benchmarked with:
Intel 4.0GHz i7-4790K with 16GB memory under x86-64 Ubuntu 8 Cores
- 2.0.0-p0: Ruby 2.0.0-p0
- r62186: Ruby trunk (early 2.6.0), before MJIT changes
- JIT off: On this commit, but without `--jit` option
- JIT on: On this commit, and with `--jit` option
** Optcarrot fps
Benchmark: https://github.com/mame/optcarrot
| |2.0.0-p0 |r62186 |JIT off |JIT on |
|:--------|:--------|:--------|:--------|:--------|
|fps |37.32 |51.46 |51.31 |58.88 |
|vs 2.0.0 |1.00x |1.38x |1.37x |1.58x |
** MJIT benchmarks
Benchmark: https://github.com/benchmark-driver/mjit-benchmarks
(Original: https://github.com/vnmakarov/ruby/tree/rtl_mjit_branch/MJIT-benchmarks)
| |2.0.0-p0 |r62186 |JIT off |JIT on |
|:----------|:--------|:--------|:--------|:--------|
|aread |1.00 |1.09 |1.07 |2.19 |
|aref |1.00 |1.13 |1.11 |2.22 |
|aset |1.00 |1.50 |1.45 |2.64 |
|awrite |1.00 |1.17 |1.13 |2.20 |
|call |1.00 |1.29 |1.26 |2.02 |
|const2 |1.00 |1.10 |1.10 |2.19 |
|const |1.00 |1.11 |1.10 |2.19 |
|fannk |1.00 |1.04 |1.02 |1.00 |
|fib |1.00 |1.32 |1.31 |1.84 |
|ivread |1.00 |1.13 |1.12 |2.43 |
|ivwrite |1.00 |1.23 |1.21 |2.40 |
|mandelbrot |1.00 |1.13 |1.16 |1.28 |
|meteor |1.00 |2.97 |2.92 |3.17 |
|nbody |1.00 |1.17 |1.15 |1.49 |
|nest-ntimes|1.00 |1.22 |1.20 |1.39 |
|nest-while |1.00 |1.10 |1.10 |1.37 |
|norm |1.00 |1.18 |1.16 |1.24 |
|nsvb |1.00 |1.16 |1.16 |1.17 |
|red-black |1.00 |1.02 |0.99 |1.12 |
|sieve |1.00 |1.30 |1.28 |1.62 |
|trees |1.00 |1.14 |1.13 |1.19 |
|while |1.00 |1.12 |1.11 |2.41 |
** Discourse's script/bench.rb
Benchmark: https://github.com/discourse/discourse/blob/v1.8.7/script/bench.rb
NOTE: Rails performance was somehow a little degraded with JIT for now.
We should fix this.
(At least I know opt_aref is performing badly in JIT and I have an idea
to fix it. Please wait for the fix.)
*** JIT off
Your Results: (note for timings- percentile is first, duration is second in millisecs)
categories_admin:
50: 17
75: 18
90: 22
99: 29
home_admin:
50: 21
75: 21
90: 27
99: 40
topic_admin:
50: 17
75: 18
90: 22
99: 32
categories:
50: 35
75: 41
90: 43
99: 77
home:
50: 39
75: 46
90: 49
99: 95
topic:
50: 46
75: 52
90: 56
99: 101
*** JIT on
Your Results: (note for timings- percentile is first, duration is second in millisecs)
categories_admin:
50: 19
75: 21
90: 25
99: 33
home_admin:
50: 24
75: 26
90: 30
99: 35
topic_admin:
50: 19
75: 20
90: 25
99: 30
categories:
50: 40
75: 44
90: 48
99: 76
home:
50: 42
75: 48
90: 51
99: 89
topic:
50: 49
75: 55
90: 58
99: 99
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62197 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2018-02-04 14:22:28 +03:00
|
|
|
MJIT_FUNC_EXPORTED int
|
2011-01-28 20:57:27 +03:00
|
|
|
rb_public_const_defined_from(VALUE klass, ID id)
|
|
|
|
{
|
|
|
|
return rb_const_defined_0(klass, id, TRUE, TRUE, TRUE);
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
rb_public_const_defined(VALUE klass, ID id)
|
|
|
|
{
|
|
|
|
return rb_const_defined_0(klass, id, FALSE, TRUE, TRUE);
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
rb_public_const_defined_at(VALUE klass, ID id)
|
|
|
|
{
|
|
|
|
return rb_const_defined_0(klass, id, TRUE, FALSE, TRUE);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2011-08-03 07:47:10 +04:00
|
|
|
static void
|
2010-10-26 21:27:21 +04:00
|
|
|
check_before_mod_set(VALUE klass, ID id, VALUE val, const char *dest)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
* array.c, gc.c, hash.c, object.c, string.c, struct.c,
transcode.c, variable.c, vm.c, vm_insnhelper.c, vm_method.c:
replace calls to rb_error_frozen() with rb_check_frozen(). a
patch from Run Paint Run Run at [ruby-core:32014]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29583 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-10-24 12:14:05 +04:00
|
|
|
rb_check_frozen(klass);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2000-12-08 10:10:38 +03:00
|
|
|
|
2019-04-19 00:37:01 +03:00
|
|
|
static void set_namespace_path(VALUE named_namespace, VALUE name);
|
2019-04-12 06:46:28 +03:00
|
|
|
|
|
|
|
static enum rb_id_table_iterator_result
|
2019-04-19 00:37:01 +03:00
|
|
|
set_namespace_path_i(ID id, VALUE v, void *payload)
|
2019-04-12 06:46:28 +03:00
|
|
|
{
|
|
|
|
rb_const_entry_t *ce = (rb_const_entry_t *)v;
|
|
|
|
VALUE value = ce->value;
|
|
|
|
int has_permanent_classpath;
|
|
|
|
VALUE parental_path = *((VALUE *) payload);
|
|
|
|
if (!rb_is_const_id(id)) {
|
|
|
|
return ID_TABLE_CONTINUE;
|
|
|
|
}
|
|
|
|
if (!rb_namespace_p(value)) {
|
|
|
|
return ID_TABLE_CONTINUE;
|
|
|
|
}
|
|
|
|
classname(value, &has_permanent_classpath);
|
|
|
|
if (has_permanent_classpath) {
|
|
|
|
return ID_TABLE_CONTINUE;
|
|
|
|
}
|
2019-04-19 00:37:01 +03:00
|
|
|
set_namespace_path(value, build_const_path(parental_path, id));
|
2019-04-12 06:46:28 +03:00
|
|
|
if (RCLASS_IV_TBL(value)) {
|
|
|
|
st_data_t tmp = tmp_classpath;
|
|
|
|
st_delete(RCLASS_IV_TBL(value), &tmp, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
return ID_TABLE_CONTINUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Assign permanent classpaths to all namespaces that are directly or indirectly
|
|
|
|
* nested under +named_namespace+. +named_namespace+ must have a permanent
|
|
|
|
* classpath.
|
|
|
|
*/
|
|
|
|
static void
|
2019-04-19 00:37:01 +03:00
|
|
|
set_namespace_path(VALUE named_namespace, VALUE namespace_path)
|
2019-04-12 06:46:28 +03:00
|
|
|
{
|
|
|
|
struct rb_id_table *const_table = RCLASS_CONST_TBL(named_namespace);
|
2019-05-31 19:46:23 +03:00
|
|
|
if (!RCLASS_IV_TBL(named_namespace)) {
|
|
|
|
RCLASS_IV_TBL(named_namespace) = st_init_numtable();
|
|
|
|
}
|
|
|
|
rb_class_ivar_set(named_namespace, classpath, namespace_path);
|
2019-04-12 06:46:28 +03:00
|
|
|
if (const_table) {
|
2019-04-19 00:37:01 +03:00
|
|
|
rb_id_table_foreach(const_table, set_namespace_path_i, &namespace_path);
|
2019-04-12 06:46:28 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2000-02-18 09:59:36 +03: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 14:44:21 +04:00
|
|
|
rb_const_set(VALUE klass, ID id, VALUE val)
|
2000-02-18 09:59:36 +03:00
|
|
|
{
|
2010-10-26 21:27:32 +04:00
|
|
|
rb_const_entry_t *ce;
|
use id_table for constant tables
valgrind 3.9.0 on x86-64 reports a minor reduction in memory usage
when loading only RubyGems and RDoc by running: ruby -rrdoc -eexit
before: HEAP SUMMARY:
in use at exit: 2,913,448 bytes in 27,394 blocks
total heap usage: 48,362 allocs, 20,968 frees, 9,034,621 bytes alloc
after: HEAP SUMMARY:
in use at exit: 2,880,056 bytes in 26,712 blocks
total heap usage: 47,791 allocs, 21,079 frees, 9,046,507 bytes alloc
* class.c (struct clone_const_arg): adjust for id_table
(clone_const): ditto
(clone_const_i): ditto
(rb_mod_init_copy): ditto
(rb_singleton_class_clone_and_attach): ditto
(rb_include_class_new): ditto
(include_modules_at): ditto
* constant.h (rb_free_const_table): ditto
* gc.c (free_const_entry_i): ditto
(rb_free_const_table): ditto
(obj_memsize_of): ditto
(mark_const_entry_i): ditto
(mark_const_tbl): ditto
* internal.h (struct rb_classext_struct): ditto
* object.c (rb_mod_const_set): resolve class name on assignment
* variable.c (const_update): replace with const_tbl_update
(const_tbl_update): new function
(fc_i): adjust for id_table
(find_class_path): ditto
(autoload_const_set): st_update => const_tbl_update
(rb_const_remove): adjust for id_table
(sv_i): ditto
(rb_local_constants_i): ditto
(rb_local_constants): ditto
(rb_mod_const_at): ditto
(rb_mod_const_set): ditto
(rb_const_lookup): ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53376 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-29 23:19:14 +03:00
|
|
|
struct rb_id_table *tbl = RCLASS_CONST_TBL(klass);
|
2010-10-26 21:27:32 +04:00
|
|
|
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-10 01:20:17 +04:00
|
|
|
if (NIL_P(klass)) {
|
2012-12-22 19:04:57 +04:00
|
|
|
rb_raise(rb_eTypeError, "no class/module to define constant %"PRIsVALUE"",
|
|
|
|
QUOTE_ID(id));
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-10 01:20:17 +04:00
|
|
|
}
|
2010-10-26 21:27:21 +04:00
|
|
|
|
|
|
|
check_before_mod_set(klass, id, val, "constant");
|
2015-04-13 10:54:52 +03:00
|
|
|
if (!tbl) {
|
use id_table for constant tables
valgrind 3.9.0 on x86-64 reports a minor reduction in memory usage
when loading only RubyGems and RDoc by running: ruby -rrdoc -eexit
before: HEAP SUMMARY:
in use at exit: 2,913,448 bytes in 27,394 blocks
total heap usage: 48,362 allocs, 20,968 frees, 9,034,621 bytes alloc
after: HEAP SUMMARY:
in use at exit: 2,880,056 bytes in 26,712 blocks
total heap usage: 47,791 allocs, 21,079 frees, 9,046,507 bytes alloc
* class.c (struct clone_const_arg): adjust for id_table
(clone_const): ditto
(clone_const_i): ditto
(rb_mod_init_copy): ditto
(rb_singleton_class_clone_and_attach): ditto
(rb_include_class_new): ditto
(include_modules_at): ditto
* constant.h (rb_free_const_table): ditto
* gc.c (free_const_entry_i): ditto
(rb_free_const_table): ditto
(obj_memsize_of): ditto
(mark_const_entry_i): ditto
(mark_const_tbl): ditto
* internal.h (struct rb_classext_struct): ditto
* object.c (rb_mod_const_set): resolve class name on assignment
* variable.c (const_update): replace with const_tbl_update
(const_tbl_update): new function
(fc_i): adjust for id_table
(find_class_path): ditto
(autoload_const_set): st_update => const_tbl_update
(rb_const_remove): adjust for id_table
(sv_i): ditto
(rb_local_constants_i): ditto
(rb_local_constants): ditto
(rb_mod_const_at): ditto
(rb_mod_const_set): ditto
(rb_const_lookup): ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53376 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-29 23:19:14 +03:00
|
|
|
RCLASS_CONST_TBL(klass) = tbl = rb_id_table_create(0);
|
2015-04-13 10:54:59 +03:00
|
|
|
rb_clear_constant_cache();
|
|
|
|
ce = ZALLOC(rb_const_entry_t);
|
use id_table for constant tables
valgrind 3.9.0 on x86-64 reports a minor reduction in memory usage
when loading only RubyGems and RDoc by running: ruby -rrdoc -eexit
before: HEAP SUMMARY:
in use at exit: 2,913,448 bytes in 27,394 blocks
total heap usage: 48,362 allocs, 20,968 frees, 9,034,621 bytes alloc
after: HEAP SUMMARY:
in use at exit: 2,880,056 bytes in 26,712 blocks
total heap usage: 47,791 allocs, 21,079 frees, 9,046,507 bytes alloc
* class.c (struct clone_const_arg): adjust for id_table
(clone_const): ditto
(clone_const_i): ditto
(rb_mod_init_copy): ditto
(rb_singleton_class_clone_and_attach): ditto
(rb_include_class_new): ditto
(include_modules_at): ditto
* constant.h (rb_free_const_table): ditto
* gc.c (free_const_entry_i): ditto
(rb_free_const_table): ditto
(obj_memsize_of): ditto
(mark_const_entry_i): ditto
(mark_const_tbl): ditto
* internal.h (struct rb_classext_struct): ditto
* object.c (rb_mod_const_set): resolve class name on assignment
* variable.c (const_update): replace with const_tbl_update
(const_tbl_update): new function
(fc_i): adjust for id_table
(find_class_path): ditto
(autoload_const_set): st_update => const_tbl_update
(rb_const_remove): adjust for id_table
(sv_i): ditto
(rb_local_constants_i): ditto
(rb_local_constants): ditto
(rb_mod_const_at): ditto
(rb_mod_const_set): ditto
(rb_const_lookup): ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53376 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-29 23:19:14 +03:00
|
|
|
rb_id_table_insert(tbl, id, (VALUE)ce);
|
2015-04-13 10:54:59 +03:00
|
|
|
setup_const_entry(ce, klass, val, CONST_PUBLIC);
|
2010-10-26 21:27:21 +04:00
|
|
|
}
|
|
|
|
else {
|
2018-05-10 11:54:26 +03:00
|
|
|
struct autoload_const ac;
|
|
|
|
ac.mod = klass;
|
|
|
|
ac.id = id;
|
|
|
|
ac.value = val;
|
|
|
|
ac.flag = CONST_PUBLIC;
|
|
|
|
const_tbl_update(&ac);
|
2015-04-13 10:54:59 +03:00
|
|
|
}
|
resolve class name earlier and more consistently
This further avoids class name resolution issues which came
about due to relying on hash table ordering before r53376.
Pre-caching the class name when it is never used raises memory
use, but the overall gain from moving away from st still gives
us a small gain. Reverting r53376 and this patch and testing with
"valgrind -v ./ruby -rrdoc -eexit" on x86 (32-bit) shows:
before:
in use at exit: 1,662,239 bytes in 25,286 blocks
total heap usage: 49,514 allocs, 24,228 frees, 6,005,561 bytes allocated
after, with this change:
in use at exit: 1,646,529 bytes in 24,572 blocks
total heap usage: 48,891 allocs, 24,319 frees, 6,003,921 bytes allocated
* class.c (Init_class_hierarchy): resolve name for rb_cObject ASAP
* object.c (rb_mod_const_set): move name resolution to rb_const_set
* variable.c (rb_const_set): do class resolution here
[ruby-core:72807] [Bug #11977]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53518 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-01-12 22:26:07 +03:00
|
|
|
/*
|
|
|
|
* Resolve and cache class name immediately to resolve ambiguity
|
|
|
|
* and avoid order-dependency on const_tbl
|
|
|
|
*/
|
2019-03-09 03:12:52 +03:00
|
|
|
if (rb_cObject && rb_namespace_p(val)) {
|
2019-04-12 06:46:28 +03:00
|
|
|
int val_path_permanent;
|
|
|
|
VALUE val_path = classname(val, &val_path_permanent);
|
|
|
|
if (NIL_P(val_path) || !val_path_permanent) {
|
2017-01-11 07:12:56 +03:00
|
|
|
if (klass == rb_cObject) {
|
2019-04-19 00:37:01 +03:00
|
|
|
set_namespace_path(val, rb_id2str(id));
|
2017-01-11 07:12:56 +03:00
|
|
|
}
|
|
|
|
else {
|
2019-04-12 06:46:28 +03:00
|
|
|
int parental_path_permanent;
|
|
|
|
VALUE parental_path = classname(klass, &parental_path_permanent);
|
|
|
|
if (!NIL_P(parental_path)) {
|
|
|
|
if (parental_path_permanent && !val_path_permanent) {
|
2019-04-19 00:37:01 +03:00
|
|
|
set_namespace_path(val, build_const_path(parental_path, id));
|
2019-04-12 06:46:28 +03:00
|
|
|
}
|
|
|
|
else if (!parental_path_permanent && NIL_P(val_path)) {
|
2019-04-12 06:46:28 +03:00
|
|
|
rb_ivar_set(val, tmp_classpath, build_const_path(parental_path, id));
|
|
|
|
}
|
2017-01-11 07:12:56 +03:00
|
|
|
}
|
2017-01-08 04:59:54 +03:00
|
|
|
}
|
|
|
|
}
|
resolve class name earlier and more consistently
This further avoids class name resolution issues which came
about due to relying on hash table ordering before r53376.
Pre-caching the class name when it is never used raises memory
use, but the overall gain from moving away from st still gives
us a small gain. Reverting r53376 and this patch and testing with
"valgrind -v ./ruby -rrdoc -eexit" on x86 (32-bit) shows:
before:
in use at exit: 1,662,239 bytes in 25,286 blocks
total heap usage: 49,514 allocs, 24,228 frees, 6,005,561 bytes allocated
after, with this change:
in use at exit: 1,646,529 bytes in 24,572 blocks
total heap usage: 48,891 allocs, 24,319 frees, 6,003,921 bytes allocated
* class.c (Init_class_hierarchy): resolve name for rb_cObject ASAP
* object.c (rb_mod_const_set): move name resolution to rb_const_set
* variable.c (rb_const_set): do class resolution here
[ruby-core:72807] [Bug #11977]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53518 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-01-12 22:26:07 +03:00
|
|
|
}
|
2015-04-13 10:54:59 +03:00
|
|
|
}
|
|
|
|
|
2018-02-13 12:36:35 +03:00
|
|
|
static struct autoload_data_i *
|
2018-05-10 11:54:26 +03:00
|
|
|
current_autoload_data(VALUE mod, ID id, struct autoload_const **acp)
|
2018-02-13 12:36:35 +03:00
|
|
|
{
|
|
|
|
struct autoload_data_i *ele;
|
|
|
|
VALUE load = autoload_data(mod, id);
|
|
|
|
if (!load) return 0;
|
2018-05-10 11:54:26 +03:00
|
|
|
ele = get_autoload_data(load, acp);
|
2018-02-13 12:36:35 +03:00
|
|
|
if (!ele) return 0;
|
|
|
|
/* for autoloading thread, keep the defined value to autoloading storage */
|
|
|
|
if (ele->state && (ele->state->thread == rb_thread_current())) {
|
|
|
|
return ele;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
use id_table for constant tables
valgrind 3.9.0 on x86-64 reports a minor reduction in memory usage
when loading only RubyGems and RDoc by running: ruby -rrdoc -eexit
before: HEAP SUMMARY:
in use at exit: 2,913,448 bytes in 27,394 blocks
total heap usage: 48,362 allocs, 20,968 frees, 9,034,621 bytes alloc
after: HEAP SUMMARY:
in use at exit: 2,880,056 bytes in 26,712 blocks
total heap usage: 47,791 allocs, 21,079 frees, 9,046,507 bytes alloc
* class.c (struct clone_const_arg): adjust for id_table
(clone_const): ditto
(clone_const_i): ditto
(rb_mod_init_copy): ditto
(rb_singleton_class_clone_and_attach): ditto
(rb_include_class_new): ditto
(include_modules_at): ditto
* constant.h (rb_free_const_table): ditto
* gc.c (free_const_entry_i): ditto
(rb_free_const_table): ditto
(obj_memsize_of): ditto
(mark_const_entry_i): ditto
(mark_const_tbl): ditto
* internal.h (struct rb_classext_struct): ditto
* object.c (rb_mod_const_set): resolve class name on assignment
* variable.c (const_update): replace with const_tbl_update
(const_tbl_update): new function
(fc_i): adjust for id_table
(find_class_path): ditto
(autoload_const_set): st_update => const_tbl_update
(rb_const_remove): adjust for id_table
(sv_i): ditto
(rb_local_constants_i): ditto
(rb_local_constants): ditto
(rb_mod_const_at): ditto
(rb_mod_const_set): ditto
(rb_const_lookup): ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53376 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-29 23:19:14 +03:00
|
|
|
static void
|
2018-05-10 11:54:26 +03:00
|
|
|
const_tbl_update(struct autoload_const *ac)
|
2015-04-13 10:54:59 +03:00
|
|
|
{
|
use id_table for constant tables
valgrind 3.9.0 on x86-64 reports a minor reduction in memory usage
when loading only RubyGems and RDoc by running: ruby -rrdoc -eexit
before: HEAP SUMMARY:
in use at exit: 2,913,448 bytes in 27,394 blocks
total heap usage: 48,362 allocs, 20,968 frees, 9,034,621 bytes alloc
after: HEAP SUMMARY:
in use at exit: 2,880,056 bytes in 26,712 blocks
total heap usage: 47,791 allocs, 21,079 frees, 9,046,507 bytes alloc
* class.c (struct clone_const_arg): adjust for id_table
(clone_const): ditto
(clone_const_i): ditto
(rb_mod_init_copy): ditto
(rb_singleton_class_clone_and_attach): ditto
(rb_include_class_new): ditto
(include_modules_at): ditto
* constant.h (rb_free_const_table): ditto
* gc.c (free_const_entry_i): ditto
(rb_free_const_table): ditto
(obj_memsize_of): ditto
(mark_const_entry_i): ditto
(mark_const_tbl): ditto
* internal.h (struct rb_classext_struct): ditto
* object.c (rb_mod_const_set): resolve class name on assignment
* variable.c (const_update): replace with const_tbl_update
(const_tbl_update): new function
(fc_i): adjust for id_table
(find_class_path): ditto
(autoload_const_set): st_update => const_tbl_update
(rb_const_remove): adjust for id_table
(sv_i): ditto
(rb_local_constants_i): ditto
(rb_local_constants): ditto
(rb_mod_const_at): ditto
(rb_mod_const_set): ditto
(rb_const_lookup): ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53376 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-29 23:19:14 +03:00
|
|
|
VALUE value;
|
2018-05-10 11:54:26 +03:00
|
|
|
VALUE klass = ac->mod;
|
|
|
|
VALUE val = ac->value;
|
|
|
|
ID id = ac->id;
|
use id_table for constant tables
valgrind 3.9.0 on x86-64 reports a minor reduction in memory usage
when loading only RubyGems and RDoc by running: ruby -rrdoc -eexit
before: HEAP SUMMARY:
in use at exit: 2,913,448 bytes in 27,394 blocks
total heap usage: 48,362 allocs, 20,968 frees, 9,034,621 bytes alloc
after: HEAP SUMMARY:
in use at exit: 2,880,056 bytes in 26,712 blocks
total heap usage: 47,791 allocs, 21,079 frees, 9,046,507 bytes alloc
* class.c (struct clone_const_arg): adjust for id_table
(clone_const): ditto
(clone_const_i): ditto
(rb_mod_init_copy): ditto
(rb_singleton_class_clone_and_attach): ditto
(rb_include_class_new): ditto
(include_modules_at): ditto
* constant.h (rb_free_const_table): ditto
* gc.c (free_const_entry_i): ditto
(rb_free_const_table): ditto
(obj_memsize_of): ditto
(mark_const_entry_i): ditto
(mark_const_tbl): ditto
* internal.h (struct rb_classext_struct): ditto
* object.c (rb_mod_const_set): resolve class name on assignment
* variable.c (const_update): replace with const_tbl_update
(const_tbl_update): new function
(fc_i): adjust for id_table
(find_class_path): ditto
(autoload_const_set): st_update => const_tbl_update
(rb_const_remove): adjust for id_table
(sv_i): ditto
(rb_local_constants_i): ditto
(rb_local_constants): ditto
(rb_mod_const_at): ditto
(rb_mod_const_set): ditto
(rb_const_lookup): ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53376 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-29 23:19:14 +03:00
|
|
|
struct rb_id_table *tbl = RCLASS_CONST_TBL(klass);
|
2018-05-10 11:54:26 +03:00
|
|
|
rb_const_flag_t visibility = ac->flag;
|
2015-04-13 10:54:59 +03:00
|
|
|
rb_const_entry_t *ce;
|
|
|
|
|
use id_table for constant tables
valgrind 3.9.0 on x86-64 reports a minor reduction in memory usage
when loading only RubyGems and RDoc by running: ruby -rrdoc -eexit
before: HEAP SUMMARY:
in use at exit: 2,913,448 bytes in 27,394 blocks
total heap usage: 48,362 allocs, 20,968 frees, 9,034,621 bytes alloc
after: HEAP SUMMARY:
in use at exit: 2,880,056 bytes in 26,712 blocks
total heap usage: 47,791 allocs, 21,079 frees, 9,046,507 bytes alloc
* class.c (struct clone_const_arg): adjust for id_table
(clone_const): ditto
(clone_const_i): ditto
(rb_mod_init_copy): ditto
(rb_singleton_class_clone_and_attach): ditto
(rb_include_class_new): ditto
(include_modules_at): ditto
* constant.h (rb_free_const_table): ditto
* gc.c (free_const_entry_i): ditto
(rb_free_const_table): ditto
(obj_memsize_of): ditto
(mark_const_entry_i): ditto
(mark_const_tbl): ditto
* internal.h (struct rb_classext_struct): ditto
* object.c (rb_mod_const_set): resolve class name on assignment
* variable.c (const_update): replace with const_tbl_update
(const_tbl_update): new function
(fc_i): adjust for id_table
(find_class_path): ditto
(autoload_const_set): st_update => const_tbl_update
(rb_const_remove): adjust for id_table
(sv_i): ditto
(rb_local_constants_i): ditto
(rb_local_constants): ditto
(rb_mod_const_at): ditto
(rb_mod_const_set): ditto
(rb_const_lookup): ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53376 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-29 23:19:14 +03:00
|
|
|
if (rb_id_table_lookup(tbl, id, &value)) {
|
|
|
|
ce = (rb_const_entry_t *)value;
|
|
|
|
if (ce->value == Qundef) {
|
2018-05-10 11:54:26 +03:00
|
|
|
struct autoload_data_i *ele = current_autoload_data(klass, id, &ac);
|
use id_table for constant tables
valgrind 3.9.0 on x86-64 reports a minor reduction in memory usage
when loading only RubyGems and RDoc by running: ruby -rrdoc -eexit
before: HEAP SUMMARY:
in use at exit: 2,913,448 bytes in 27,394 blocks
total heap usage: 48,362 allocs, 20,968 frees, 9,034,621 bytes alloc
after: HEAP SUMMARY:
in use at exit: 2,880,056 bytes in 26,712 blocks
total heap usage: 47,791 allocs, 21,079 frees, 9,046,507 bytes alloc
* class.c (struct clone_const_arg): adjust for id_table
(clone_const): ditto
(clone_const_i): ditto
(rb_mod_init_copy): ditto
(rb_singleton_class_clone_and_attach): ditto
(rb_include_class_new): ditto
(include_modules_at): ditto
* constant.h (rb_free_const_table): ditto
* gc.c (free_const_entry_i): ditto
(rb_free_const_table): ditto
(obj_memsize_of): ditto
(mark_const_entry_i): ditto
(mark_const_tbl): ditto
* internal.h (struct rb_classext_struct): ditto
* object.c (rb_mod_const_set): resolve class name on assignment
* variable.c (const_update): replace with const_tbl_update
(const_tbl_update): new function
(fc_i): adjust for id_table
(find_class_path): ditto
(autoload_const_set): st_update => const_tbl_update
(rb_const_remove): adjust for id_table
(sv_i): ditto
(rb_local_constants_i): ditto
(rb_local_constants): ditto
(rb_mod_const_at): ditto
(rb_mod_const_set): ditto
(rb_const_lookup): ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53376 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-29 23:19:14 +03:00
|
|
|
|
2018-02-13 12:36:35 +03:00
|
|
|
if (ele) {
|
use id_table for constant tables
valgrind 3.9.0 on x86-64 reports a minor reduction in memory usage
when loading only RubyGems and RDoc by running: ruby -rrdoc -eexit
before: HEAP SUMMARY:
in use at exit: 2,913,448 bytes in 27,394 blocks
total heap usage: 48,362 allocs, 20,968 frees, 9,034,621 bytes alloc
after: HEAP SUMMARY:
in use at exit: 2,880,056 bytes in 26,712 blocks
total heap usage: 47,791 allocs, 21,079 frees, 9,046,507 bytes alloc
* class.c (struct clone_const_arg): adjust for id_table
(clone_const): ditto
(clone_const_i): ditto
(rb_mod_init_copy): ditto
(rb_singleton_class_clone_and_attach): ditto
(rb_include_class_new): ditto
(include_modules_at): ditto
* constant.h (rb_free_const_table): ditto
* gc.c (free_const_entry_i): ditto
(rb_free_const_table): ditto
(obj_memsize_of): ditto
(mark_const_entry_i): ditto
(mark_const_tbl): ditto
* internal.h (struct rb_classext_struct): ditto
* object.c (rb_mod_const_set): resolve class name on assignment
* variable.c (const_update): replace with const_tbl_update
(const_tbl_update): new function
(fc_i): adjust for id_table
(find_class_path): ditto
(autoload_const_set): st_update => const_tbl_update
(rb_const_remove): adjust for id_table
(sv_i): ditto
(rb_local_constants_i): ditto
(rb_local_constants): ditto
(rb_mod_const_at): ditto
(rb_mod_const_set): ditto
(rb_const_lookup): ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53376 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-29 23:19:14 +03:00
|
|
|
rb_clear_constant_cache();
|
|
|
|
|
2018-05-10 11:54:26 +03:00
|
|
|
ac->value = val; /* autoload_i is non-WB-protected */
|
use id_table for constant tables
valgrind 3.9.0 on x86-64 reports a minor reduction in memory usage
when loading only RubyGems and RDoc by running: ruby -rrdoc -eexit
before: HEAP SUMMARY:
in use at exit: 2,913,448 bytes in 27,394 blocks
total heap usage: 48,362 allocs, 20,968 frees, 9,034,621 bytes alloc
after: HEAP SUMMARY:
in use at exit: 2,880,056 bytes in 26,712 blocks
total heap usage: 47,791 allocs, 21,079 frees, 9,046,507 bytes alloc
* class.c (struct clone_const_arg): adjust for id_table
(clone_const): ditto
(clone_const_i): ditto
(rb_mod_init_copy): ditto
(rb_singleton_class_clone_and_attach): ditto
(rb_include_class_new): ditto
(include_modules_at): ditto
* constant.h (rb_free_const_table): ditto
* gc.c (free_const_entry_i): ditto
(rb_free_const_table): ditto
(obj_memsize_of): ditto
(mark_const_entry_i): ditto
(mark_const_tbl): ditto
* internal.h (struct rb_classext_struct): ditto
* object.c (rb_mod_const_set): resolve class name on assignment
* variable.c (const_update): replace with const_tbl_update
(const_tbl_update): new function
(fc_i): adjust for id_table
(find_class_path): ditto
(autoload_const_set): st_update => const_tbl_update
(rb_const_remove): adjust for id_table
(sv_i): ditto
(rb_local_constants_i): ditto
(rb_local_constants): ditto
(rb_mod_const_at): ditto
(rb_mod_const_set): ditto
(rb_const_lookup): ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53376 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-29 23:19:14 +03:00
|
|
|
return;
|
2011-08-31 12:28:19 +04:00
|
|
|
}
|
use id_table for constant tables
valgrind 3.9.0 on x86-64 reports a minor reduction in memory usage
when loading only RubyGems and RDoc by running: ruby -rrdoc -eexit
before: HEAP SUMMARY:
in use at exit: 2,913,448 bytes in 27,394 blocks
total heap usage: 48,362 allocs, 20,968 frees, 9,034,621 bytes alloc
after: HEAP SUMMARY:
in use at exit: 2,880,056 bytes in 26,712 blocks
total heap usage: 47,791 allocs, 21,079 frees, 9,046,507 bytes alloc
* class.c (struct clone_const_arg): adjust for id_table
(clone_const): ditto
(clone_const_i): ditto
(rb_mod_init_copy): ditto
(rb_singleton_class_clone_and_attach): ditto
(rb_include_class_new): ditto
(include_modules_at): ditto
* constant.h (rb_free_const_table): ditto
* gc.c (free_const_entry_i): ditto
(rb_free_const_table): ditto
(obj_memsize_of): ditto
(mark_const_entry_i): ditto
(mark_const_tbl): ditto
* internal.h (struct rb_classext_struct): ditto
* object.c (rb_mod_const_set): resolve class name on assignment
* variable.c (const_update): replace with const_tbl_update
(const_tbl_update): new function
(fc_i): adjust for id_table
(find_class_path): ditto
(autoload_const_set): st_update => const_tbl_update
(rb_const_remove): adjust for id_table
(sv_i): ditto
(rb_local_constants_i): ditto
(rb_local_constants): ditto
(rb_mod_const_at): ditto
(rb_mod_const_set): ditto
(rb_const_lookup): ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53376 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-29 23:19:14 +03:00
|
|
|
/* otherwise, allow to override */
|
|
|
|
autoload_delete(klass, id);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
VALUE name = QUOTE_ID(id);
|
|
|
|
visibility = ce->flag;
|
|
|
|
if (klass == rb_cObject)
|
|
|
|
rb_warn("already initialized constant %"PRIsVALUE"", name);
|
|
|
|
else
|
|
|
|
rb_warn("already initialized constant %"PRIsVALUE"::%"PRIsVALUE"",
|
|
|
|
rb_class_name(klass), name);
|
|
|
|
if (!NIL_P(ce->file) && ce->line) {
|
|
|
|
rb_compile_warn(RSTRING_PTR(ce->file), ce->line,
|
|
|
|
"previous definition of %"PRIsVALUE" was here", name);
|
2011-01-28 20:57:42 +03:00
|
|
|
}
|
2010-10-26 21:27:21 +04:00
|
|
|
}
|
use id_table for constant tables
valgrind 3.9.0 on x86-64 reports a minor reduction in memory usage
when loading only RubyGems and RDoc by running: ruby -rrdoc -eexit
before: HEAP SUMMARY:
in use at exit: 2,913,448 bytes in 27,394 blocks
total heap usage: 48,362 allocs, 20,968 frees, 9,034,621 bytes alloc
after: HEAP SUMMARY:
in use at exit: 2,880,056 bytes in 26,712 blocks
total heap usage: 47,791 allocs, 21,079 frees, 9,046,507 bytes alloc
* class.c (struct clone_const_arg): adjust for id_table
(clone_const): ditto
(clone_const_i): ditto
(rb_mod_init_copy): ditto
(rb_singleton_class_clone_and_attach): ditto
(rb_include_class_new): ditto
(include_modules_at): ditto
* constant.h (rb_free_const_table): ditto
* gc.c (free_const_entry_i): ditto
(rb_free_const_table): ditto
(obj_memsize_of): ditto
(mark_const_entry_i): ditto
(mark_const_tbl): ditto
* internal.h (struct rb_classext_struct): ditto
* object.c (rb_mod_const_set): resolve class name on assignment
* variable.c (const_update): replace with const_tbl_update
(const_tbl_update): new function
(fc_i): adjust for id_table
(find_class_path): ditto
(autoload_const_set): st_update => const_tbl_update
(rb_const_remove): adjust for id_table
(sv_i): ditto
(rb_local_constants_i): ditto
(rb_local_constants): ditto
(rb_mod_const_at): ditto
(rb_mod_const_set): ditto
(rb_const_lookup): ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53376 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-29 23:19:14 +03:00
|
|
|
rb_clear_constant_cache();
|
|
|
|
setup_const_entry(ce, klass, val, visibility);
|
2017-01-08 04:59:54 +03:00
|
|
|
}
|
|
|
|
else {
|
use id_table for constant tables
valgrind 3.9.0 on x86-64 reports a minor reduction in memory usage
when loading only RubyGems and RDoc by running: ruby -rrdoc -eexit
before: HEAP SUMMARY:
in use at exit: 2,913,448 bytes in 27,394 blocks
total heap usage: 48,362 allocs, 20,968 frees, 9,034,621 bytes alloc
after: HEAP SUMMARY:
in use at exit: 2,880,056 bytes in 26,712 blocks
total heap usage: 47,791 allocs, 21,079 frees, 9,046,507 bytes alloc
* class.c (struct clone_const_arg): adjust for id_table
(clone_const): ditto
(clone_const_i): ditto
(rb_mod_init_copy): ditto
(rb_singleton_class_clone_and_attach): ditto
(rb_include_class_new): ditto
(include_modules_at): ditto
* constant.h (rb_free_const_table): ditto
* gc.c (free_const_entry_i): ditto
(rb_free_const_table): ditto
(obj_memsize_of): ditto
(mark_const_entry_i): ditto
(mark_const_tbl): ditto
* internal.h (struct rb_classext_struct): ditto
* object.c (rb_mod_const_set): resolve class name on assignment
* variable.c (const_update): replace with const_tbl_update
(const_tbl_update): new function
(fc_i): adjust for id_table
(find_class_path): ditto
(autoload_const_set): st_update => const_tbl_update
(rb_const_remove): adjust for id_table
(sv_i): ditto
(rb_local_constants_i): ditto
(rb_local_constants): ditto
(rb_mod_const_at): ditto
(rb_mod_const_set): ditto
(rb_const_lookup): ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53376 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-29 23:19:14 +03:00
|
|
|
rb_clear_constant_cache();
|
* class.c, compile.c, eval.c, gc.h, insns.def, internal.h, method.h,
variable.c, vm.c, vm_core.c, vm_insnhelper.c, vm_insnhelper.h,
vm_method.c: Implement class hierarchy method cache invalidation.
[ruby-core:55053] [Feature #8426] [GH-387]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42822 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-09-04 09:25:06 +04:00
|
|
|
|
use id_table for constant tables
valgrind 3.9.0 on x86-64 reports a minor reduction in memory usage
when loading only RubyGems and RDoc by running: ruby -rrdoc -eexit
before: HEAP SUMMARY:
in use at exit: 2,913,448 bytes in 27,394 blocks
total heap usage: 48,362 allocs, 20,968 frees, 9,034,621 bytes alloc
after: HEAP SUMMARY:
in use at exit: 2,880,056 bytes in 26,712 blocks
total heap usage: 47,791 allocs, 21,079 frees, 9,046,507 bytes alloc
* class.c (struct clone_const_arg): adjust for id_table
(clone_const): ditto
(clone_const_i): ditto
(rb_mod_init_copy): ditto
(rb_singleton_class_clone_and_attach): ditto
(rb_include_class_new): ditto
(include_modules_at): ditto
* constant.h (rb_free_const_table): ditto
* gc.c (free_const_entry_i): ditto
(rb_free_const_table): ditto
(obj_memsize_of): ditto
(mark_const_entry_i): ditto
(mark_const_tbl): ditto
* internal.h (struct rb_classext_struct): ditto
* object.c (rb_mod_const_set): resolve class name on assignment
* variable.c (const_update): replace with const_tbl_update
(const_tbl_update): new function
(fc_i): adjust for id_table
(find_class_path): ditto
(autoload_const_set): st_update => const_tbl_update
(rb_const_remove): adjust for id_table
(sv_i): ditto
(rb_local_constants_i): ditto
(rb_local_constants): ditto
(rb_mod_const_at): ditto
(rb_mod_const_set): ditto
(rb_const_lookup): ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53376 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-29 23:19:14 +03:00
|
|
|
ce = ZALLOC(rb_const_entry_t);
|
|
|
|
rb_id_table_insert(tbl, id, (VALUE)ce);
|
|
|
|
setup_const_entry(ce, klass, val, visibility);
|
|
|
|
}
|
2015-04-13 10:54:52 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2015-08-04 06:13:19 +03:00
|
|
|
setup_const_entry(rb_const_entry_t *ce, VALUE klass, VALUE val,
|
|
|
|
rb_const_flag_t visibility)
|
2015-04-13 10:54:52 +03:00
|
|
|
{
|
2013-06-07 17:25:41 +04:00
|
|
|
ce->flag = visibility;
|
* include/ruby/ruby.h: rename OBJ_WRITE and OBJ_WRITTEN into
RB_OBJ_WRITE and RB_OBJ_WRITTEN.
* array.c, class.c, compile.c, hash.c, internal.h, iseq.c,
proc.c, process.c, re.c, string.c, variable.c, vm.c,
vm_eval.c, vm_insnhelper.c, vm_insnhelper.h,
vm_method.c: catch up this change.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44299 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-20 12:07:47 +04:00
|
|
|
RB_OBJ_WRITE(klass, &ce->value, val);
|
2015-10-31 04:02:26 +03:00
|
|
|
RB_OBJ_WRITE(klass, &ce->file, rb_source_location(&ce->line));
|
2000-02-18 09:59:36 +03:00
|
|
|
}
|
1998-01-16 15:13:05 +03: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 14:44:21 +04:00
|
|
|
rb_define_const(VALUE klass, const char *name, VALUE val)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
ID id = rb_intern(name);
|
1999-01-20 07:59:39 +03:00
|
|
|
|
2003-07-24 09:18:47 +04:00
|
|
|
if (!rb_is_const_id(id)) {
|
2006-12-11 05:49:37 +03:00
|
|
|
rb_warn("rb_define_const: invalid name `%s' for constant", name);
|
2003-07-24 09:18:47 +04:00
|
|
|
}
|
2019-04-20 04:19:47 +03:00
|
|
|
rb_gc_register_mark_object(val);
|
1999-12-14 09:50:43 +03:00
|
|
|
rb_const_set(klass, id, val);
|
1998-01-16 15:13:05 +03: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 14:44:21 +04:00
|
|
|
rb_define_global_const(const char *name, VALUE val)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_define_const(rb_cObject, name, val);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2010-10-26 21:27:44 +04:00
|
|
|
static void
|
2015-08-04 06:13:19 +03:00
|
|
|
set_const_visibility(VALUE mod, int argc, const VALUE *argv,
|
|
|
|
rb_const_flag_t flag, rb_const_flag_t mask)
|
2010-10-26 21:27:44 +04:00
|
|
|
{
|
|
|
|
int i;
|
2014-08-04 05:12:53 +04:00
|
|
|
rb_const_entry_t *ce;
|
2010-10-26 21:27:44 +04:00
|
|
|
ID id;
|
|
|
|
|
2018-07-27 16:57:14 +03:00
|
|
|
rb_class_modify_check(mod);
|
2011-12-03 15:52:14 +04:00
|
|
|
if (argc == 0) {
|
2012-12-22 19:04:57 +04:00
|
|
|
rb_warning("%"PRIsVALUE" with no argument is just ignored",
|
2013-05-25 06:24:33 +04:00
|
|
|
QUOTE_ID(rb_frame_callee()));
|
2013-05-25 06:28:51 +04:00
|
|
|
return;
|
2011-12-03 15:52:14 +04:00
|
|
|
}
|
|
|
|
|
2010-10-26 21:27:44 +04:00
|
|
|
for (i = 0; i < argc; i++) {
|
2018-05-10 11:54:26 +03:00
|
|
|
struct autoload_const *ac;
|
2011-07-26 20:05:35 +04:00
|
|
|
VALUE val = argv[i];
|
|
|
|
id = rb_check_id(&val);
|
|
|
|
if (!id) {
|
* class.c, compile.c, eval.c, gc.h, insns.def, internal.h, method.h,
variable.c, vm.c, vm_core.c, vm_insnhelper.c, vm_insnhelper.h,
vm_method.c: Implement class hierarchy method cache invalidation.
[ruby-core:55053] [Feature #8426] [GH-387]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42822 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-09-04 09:25:06 +04:00
|
|
|
if (i > 0) {
|
* insns.def, vm.c, vm_insnhelper.c, vm_insnhelper.h, vm_method.c: split
ruby_vm_global_state_version into two separate counters - one for the
global method state and one for the global constant state. This means
changes to constants do not affect method caches, and changes to
methods do not affect constant caches. In particular, this means
inclusions of modules containing constants no longer globally
invalidate the method cache.
* class.c, eval.c, include/ruby/intern.h, insns.def, vm.c, vm_method.c:
rename rb_clear_cache_by_class to rb_clear_method_cache_by_class
* class.c, include/ruby/intern.h, variable.c, vm_method.c: add
rb_clear_constant_cache
* compile.c, vm_core.h, vm_insnhelper.c: rename vmstat field in
rb_call_info_struct to method_state
* vm_method.c: rename vmstat field in struct cache_entry to method_state
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43455 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-10-29 04:52:38 +04:00
|
|
|
rb_clear_constant_cache();
|
* class.c, compile.c, eval.c, gc.h, insns.def, internal.h, method.h,
variable.c, vm.c, vm_core.c, vm_insnhelper.c, vm_insnhelper.h,
vm_method.c: Implement class hierarchy method cache invalidation.
[ruby-core:55053] [Feature #8426] [GH-387]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42822 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-09-04 09:25:06 +04:00
|
|
|
}
|
|
|
|
|
2018-12-28 13:33:02 +03:00
|
|
|
undefined_constant(mod, val);
|
2011-07-26 20:05:35 +04:00
|
|
|
}
|
2014-08-04 05:12:53 +04:00
|
|
|
if ((ce = rb_const_lookup(mod, id))) {
|
2015-07-30 07:20:00 +03:00
|
|
|
ce->flag &= ~mask;
|
|
|
|
ce->flag |= flag;
|
2018-02-13 12:36:35 +03:00
|
|
|
if (ce->value == Qundef) {
|
2018-05-10 11:54:26 +03:00
|
|
|
struct autoload_data_i *ele;
|
|
|
|
|
|
|
|
ele = current_autoload_data(mod, id, &ac);
|
2018-02-13 12:36:35 +03:00
|
|
|
if (ele) {
|
2018-05-10 11:54:26 +03:00
|
|
|
ac->flag &= ~mask;
|
|
|
|
ac->flag |= flag;
|
2018-02-13 12:36:35 +03:00
|
|
|
}
|
|
|
|
}
|
2010-10-26 21:27:44 +04:00
|
|
|
}
|
2011-12-08 18:47:19 +04:00
|
|
|
else {
|
* class.c, compile.c, eval.c, gc.h, insns.def, internal.h, method.h,
variable.c, vm.c, vm_core.c, vm_insnhelper.c, vm_insnhelper.h,
vm_method.c: Implement class hierarchy method cache invalidation.
[ruby-core:55053] [Feature #8426] [GH-387]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42822 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-09-04 09:25:06 +04:00
|
|
|
if (i > 0) {
|
* insns.def, vm.c, vm_insnhelper.c, vm_insnhelper.h, vm_method.c: split
ruby_vm_global_state_version into two separate counters - one for the
global method state and one for the global constant state. This means
changes to constants do not affect method caches, and changes to
methods do not affect constant caches. In particular, this means
inclusions of modules containing constants no longer globally
invalidate the method cache.
* class.c, eval.c, include/ruby/intern.h, insns.def, vm.c, vm_method.c:
rename rb_clear_cache_by_class to rb_clear_method_cache_by_class
* class.c, include/ruby/intern.h, variable.c, vm_method.c: add
rb_clear_constant_cache
* compile.c, vm_core.h, vm_insnhelper.c: rename vmstat field in
rb_call_info_struct to method_state
* vm_method.c: rename vmstat field in struct cache_entry to method_state
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43455 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-10-29 04:52:38 +04:00
|
|
|
rb_clear_constant_cache();
|
* class.c, compile.c, eval.c, gc.h, insns.def, internal.h, method.h,
variable.c, vm.c, vm_core.c, vm_insnhelper.c, vm_insnhelper.h,
vm_method.c: Implement class hierarchy method cache invalidation.
[ruby-core:55053] [Feature #8426] [GH-387]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42822 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-09-04 09:25:06 +04:00
|
|
|
}
|
2018-12-28 13:33:02 +03:00
|
|
|
undefined_constant(mod, ID2SYM(id));
|
2011-12-08 18:47:19 +04:00
|
|
|
}
|
2010-10-26 21:27:44 +04:00
|
|
|
}
|
* insns.def, vm.c, vm_insnhelper.c, vm_insnhelper.h, vm_method.c: split
ruby_vm_global_state_version into two separate counters - one for the
global method state and one for the global constant state. This means
changes to constants do not affect method caches, and changes to
methods do not affect constant caches. In particular, this means
inclusions of modules containing constants no longer globally
invalidate the method cache.
* class.c, eval.c, include/ruby/intern.h, insns.def, vm.c, vm_method.c:
rename rb_clear_cache_by_class to rb_clear_method_cache_by_class
* class.c, include/ruby/intern.h, variable.c, vm_method.c: add
rb_clear_constant_cache
* compile.c, vm_core.h, vm_insnhelper.c: rename vmstat field in
rb_call_info_struct to method_state
* vm_method.c: rename vmstat field in struct cache_entry to method_state
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43455 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-10-29 04:52:38 +04:00
|
|
|
rb_clear_constant_cache();
|
2010-10-26 21:27:44 +04:00
|
|
|
}
|
|
|
|
|
2016-09-09 06:02:22 +03:00
|
|
|
void
|
|
|
|
rb_deprecate_constant(VALUE mod, const char *name)
|
|
|
|
{
|
|
|
|
rb_const_entry_t *ce;
|
|
|
|
ID id;
|
|
|
|
long len = strlen(name);
|
|
|
|
|
2018-07-27 16:57:14 +03:00
|
|
|
rb_class_modify_check(mod);
|
2018-12-28 13:33:02 +03:00
|
|
|
if (!(id = rb_check_id_cstr(name, len, NULL))) {
|
2018-12-28 13:33:04 +03:00
|
|
|
undefined_constant(mod, rb_fstring_new(name, len));
|
2018-12-28 13:33:02 +03:00
|
|
|
}
|
|
|
|
if (!(ce = rb_const_lookup(mod, id))) {
|
|
|
|
undefined_constant(mod, ID2SYM(id));
|
2016-09-09 06:02:22 +03:00
|
|
|
}
|
|
|
|
ce->flag |= CONST_DEPRECATED;
|
|
|
|
}
|
|
|
|
|
2010-10-26 21:27:44 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* mod.private_constant(symbol, ...) => mod
|
|
|
|
*
|
|
|
|
* Makes a list of existing constants private.
|
|
|
|
*/
|
|
|
|
|
|
|
|
VALUE
|
2014-06-18 10:16:39 +04:00
|
|
|
rb_mod_private_constant(int argc, const VALUE *argv, VALUE obj)
|
2010-10-26 21:27:44 +04:00
|
|
|
{
|
2015-07-30 07:20:00 +03:00
|
|
|
set_const_visibility(obj, argc, argv, CONST_PRIVATE, CONST_VISIBILITY_MASK);
|
2010-10-26 21:27:44 +04:00
|
|
|
return obj;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* mod.public_constant(symbol, ...) => mod
|
|
|
|
*
|
|
|
|
* Makes a list of existing constants public.
|
|
|
|
*/
|
|
|
|
|
|
|
|
VALUE
|
2014-06-18 10:16:39 +04:00
|
|
|
rb_mod_public_constant(int argc, const VALUE *argv, VALUE obj)
|
2010-10-26 21:27:44 +04:00
|
|
|
{
|
2015-07-30 07:20:00 +03:00
|
|
|
set_const_visibility(obj, argc, argv, CONST_PUBLIC, CONST_VISIBILITY_MASK);
|
|
|
|
return obj;
|
|
|
|
}
|
|
|
|
|
2016-01-04 10:08:05 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* mod.deprecate_constant(symbol, ...) => mod
|
|
|
|
*
|
|
|
|
* Makes a list of existing constants deprecated.
|
|
|
|
*/
|
|
|
|
|
2015-07-30 07:20:00 +03:00
|
|
|
VALUE
|
|
|
|
rb_mod_deprecate_constant(int argc, const VALUE *argv, VALUE obj)
|
|
|
|
{
|
|
|
|
set_const_visibility(obj, argc, argv, CONST_DEPRECATED, CONST_DEPRECATED);
|
2010-10-26 21:27:44 +04:00
|
|
|
return obj;
|
|
|
|
}
|
|
|
|
|
2007-10-03 10:48:06 +04:00
|
|
|
static VALUE
|
2007-12-24 12:25:27 +03:00
|
|
|
original_module(VALUE c)
|
2007-10-03 10:48:06 +04:00
|
|
|
{
|
2011-09-29 15:07:45 +04:00
|
|
|
if (RB_TYPE_P(c, T_ICLASS))
|
2007-10-03 10:48:06 +04:00
|
|
|
return RBASIC(c)->klass;
|
|
|
|
return c;
|
|
|
|
}
|
|
|
|
|
2012-08-06 19:24:01 +04:00
|
|
|
static int
|
|
|
|
cvar_lookup_at(VALUE klass, ID id, st_data_t *v)
|
|
|
|
{
|
|
|
|
if (!RCLASS_IV_TBL(klass)) return 0;
|
|
|
|
return st_lookup(RCLASS_IV_TBL(klass), (st_data_t)id, v);
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
cvar_front_klass(VALUE klass)
|
|
|
|
{
|
|
|
|
if (FL_TEST(klass, FL_SINGLETON)) {
|
2013-05-02 11:54:17 +04:00
|
|
|
VALUE obj = rb_ivar_get(klass, id__attached__);
|
2019-03-09 03:12:53 +03:00
|
|
|
if (rb_namespace_p(obj)) {
|
2012-08-06 19:24:01 +04:00
|
|
|
return obj;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return RCLASS_SUPER(klass);
|
|
|
|
}
|
|
|
|
|
2018-03-15 10:15:26 +03:00
|
|
|
static void
|
|
|
|
cvar_overtaken(VALUE front, VALUE target, ID id)
|
|
|
|
{
|
|
|
|
if (front && target != front) {
|
|
|
|
st_data_t did = (st_data_t)id;
|
|
|
|
|
|
|
|
if (RTEST(ruby_verbose)) {
|
|
|
|
rb_warning("class variable % "PRIsVALUE" of %"PRIsVALUE" is overtaken by %"PRIsVALUE"",
|
|
|
|
ID2SYM(id), rb_class_name(original_module(front)),
|
|
|
|
rb_class_name(original_module(target)));
|
|
|
|
}
|
|
|
|
if (BUILTIN_TYPE(front) == T_CLASS) {
|
|
|
|
st_delete(RCLASS_IV_TBL(front), &did, 0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-08-06 19:24:01 +04:00
|
|
|
#define CVAR_FOREACH_ANCESTORS(klass, v, r) \
|
|
|
|
for (klass = cvar_front_klass(klass); klass; klass = RCLASS_SUPER(klass)) { \
|
|
|
|
if (cvar_lookup_at(klass, id, (v))) { \
|
|
|
|
r; \
|
|
|
|
} \
|
|
|
|
}
|
|
|
|
|
2007-02-02 12:47:55 +03:00
|
|
|
#define CVAR_LOOKUP(v,r) do {\
|
2012-08-06 19:24:01 +04:00
|
|
|
if (cvar_lookup_at(klass, id, (v))) {r;}\
|
|
|
|
CVAR_FOREACH_ANCESTORS(klass, v, r);\
|
2007-02-02 12:47:55 +03:00
|
|
|
} while(0)
|
|
|
|
|
2007-11-09 11:14:42 +03:00
|
|
|
void
|
|
|
|
rb_cvar_set(VALUE klass, ID id, VALUE val)
|
|
|
|
{
|
|
|
|
VALUE tmp, front = 0, target = 0;
|
|
|
|
|
|
|
|
tmp = klass;
|
|
|
|
CVAR_LOOKUP(0, {if (!front) front = klass; target = klass;});
|
|
|
|
if (target) {
|
2018-03-15 10:15:26 +03:00
|
|
|
cvar_overtaken(front, target, id);
|
2007-11-09 11:14:42 +03:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
target = tmp;
|
|
|
|
}
|
2010-10-26 21:27:21 +04:00
|
|
|
|
|
|
|
check_before_mod_set(target, id, val, "class variable");
|
|
|
|
if (!RCLASS_IV_TBL(target)) {
|
|
|
|
RCLASS_IV_TBL(target) = st_init_numtable();
|
|
|
|
}
|
|
|
|
|
2015-11-03 00:50:24 +03:00
|
|
|
rb_class_ivar_set(target, id, val);
|
2007-11-09 11:14:42 +03:00
|
|
|
}
|
|
|
|
|
2000-02-18 09:59:36 +03: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 14:44:21 +04:00
|
|
|
rb_cvar_get(VALUE klass, ID id)
|
2000-02-18 09:59:36 +03:00
|
|
|
{
|
* compile.c (iseq_build_body), error.c (set_syserr, get_syserr),
(syserr_initialize), gc.c (define_final, rb_gc_copy_finalizer),
(run_final), hash.c (rb_hash_aref, rb_hash_lookup2),
(rb_hash_fetch_m, rb_hash_clear, rb_hash_aset, eql_i),
iseq.c (iseq_load, iseq_data_to_ary), marshal.c (r_symlink),
thread.c (rb_thread_local_aref),
variable.c (generic_ivar_remove, ivar_get, rb_const_get_0),
(rb_cvar_get), vm.c (rb_vm_check_redefinition_opt_method),
vm_insnhelper.c (vm_get_ev_const), vm_method.c (remove_method),
ext/iconv/iconv.c (map_charset): use st_data_t.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29462 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-10-12 18:47:23 +04:00
|
|
|
VALUE tmp, front = 0, target = 0;
|
|
|
|
st_data_t value;
|
2000-02-18 09:59:36 +03:00
|
|
|
|
2007-02-02 12:47:55 +03:00
|
|
|
tmp = klass;
|
2007-10-03 10:48:06 +04:00
|
|
|
CVAR_LOOKUP(&value, {if (!front) front = klass; target = klass;});
|
|
|
|
if (!target) {
|
2015-10-28 09:24:12 +03:00
|
|
|
rb_name_err_raise("uninitialized class variable %1$s in %2$s",
|
|
|
|
tmp, ID2SYM(id));
|
2007-10-03 10:48:06 +04:00
|
|
|
}
|
2018-03-15 10:15:26 +03:00
|
|
|
cvar_overtaken(front, target, id);
|
* compile.c (iseq_build_body), error.c (set_syserr, get_syserr),
(syserr_initialize), gc.c (define_final, rb_gc_copy_finalizer),
(run_final), hash.c (rb_hash_aref, rb_hash_lookup2),
(rb_hash_fetch_m, rb_hash_clear, rb_hash_aset, eql_i),
iseq.c (iseq_load, iseq_data_to_ary), marshal.c (r_symlink),
thread.c (rb_thread_local_aref),
variable.c (generic_ivar_remove, ivar_get, rb_const_get_0),
(rb_cvar_get), vm.c (rb_vm_check_redefinition_opt_method),
vm_insnhelper.c (vm_get_ev_const), vm_method.c (remove_method),
ext/iconv/iconv.c (map_charset): use st_data_t.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29462 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-10-12 18:47:23 +04:00
|
|
|
return (VALUE)value;
|
2000-02-18 09:59:36 +03:00
|
|
|
}
|
|
|
|
|
2000-12-08 10:10:38 +03: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 14:44:21 +04:00
|
|
|
rb_cvar_defined(VALUE klass, ID id)
|
2000-02-18 09:59:36 +03:00
|
|
|
{
|
2007-02-02 12:47:55 +03:00
|
|
|
if (!klass) return Qfalse;
|
2007-10-03 10:48:06 +04:00
|
|
|
CVAR_LOOKUP(0,return Qtrue);
|
2000-02-18 09:59:36 +03:00
|
|
|
return Qfalse;
|
|
|
|
}
|
|
|
|
|
2015-10-28 09:24:12 +03:00
|
|
|
static ID
|
|
|
|
cv_intern(VALUE klass, const char *name)
|
2000-03-23 11:37:35 +03:00
|
|
|
{
|
2001-05-02 08:22:21 +04:00
|
|
|
ID id = rb_intern(name);
|
|
|
|
if (!rb_is_class_id(id)) {
|
2015-10-28 09:24:12 +03:00
|
|
|
rb_name_err_raise("wrong class variable name %1$s",
|
|
|
|
klass, rb_str_new_cstr(name));
|
2001-05-02 08:22:21 +04:00
|
|
|
}
|
2015-10-28 09:24:12 +03:00
|
|
|
return id;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
rb_cv_set(VALUE klass, const char *name, VALUE val)
|
|
|
|
{
|
|
|
|
ID id = cv_intern(klass, name);
|
2007-02-02 12:41:47 +03:00
|
|
|
rb_cvar_set(klass, id, val);
|
2000-03-23 11:37:35 +03: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 14:44:21 +04:00
|
|
|
rb_cv_get(VALUE klass, const char *name)
|
2000-03-23 11:37:35 +03:00
|
|
|
{
|
2015-10-28 09:24:12 +03:00
|
|
|
ID id = cv_intern(klass, name);
|
2001-05-02 08:22:21 +04:00
|
|
|
return rb_cvar_get(klass, id);
|
2000-03-23 11:37:35 +03: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 14:44:21 +04:00
|
|
|
rb_define_class_variable(VALUE klass, const char *name, VALUE val)
|
2000-02-18 09:59:36 +03:00
|
|
|
{
|
2015-10-28 09:24:12 +03:00
|
|
|
ID id = cv_intern(klass, name);
|
2007-02-02 12:41:47 +03:00
|
|
|
rb_cvar_set(klass, id, val);
|
2000-02-18 09:59:36 +03:00
|
|
|
}
|
|
|
|
|
2000-09-15 10:00:30 +04:00
|
|
|
static int
|
2012-03-31 02:40:54 +04:00
|
|
|
cv_i(st_data_t k, st_data_t v, st_data_t a)
|
2000-09-15 10:00:30 +04:00
|
|
|
{
|
2012-03-31 02:40:54 +04:00
|
|
|
ID key = (ID)k;
|
2012-07-19 10:41:47 +04:00
|
|
|
st_table *tbl = (st_table *)a;
|
2012-03-31 02:40:54 +04:00
|
|
|
|
2000-09-15 10:00:30 +04:00
|
|
|
if (rb_is_class_id(key)) {
|
2014-10-08 12:27:54 +04:00
|
|
|
st_update(tbl, (st_data_t)key, cv_i_update, 0);
|
2000-09-15 10:00:30 +04:00
|
|
|
}
|
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
2012-08-23 11:45:46 +04:00
|
|
|
|
2012-07-19 10:41:47 +04:00
|
|
|
static void*
|
|
|
|
mod_cvar_at(VALUE mod, void *data)
|
|
|
|
{
|
|
|
|
st_table *tbl = data;
|
|
|
|
if (!tbl) {
|
|
|
|
tbl = st_init_numtable();
|
|
|
|
}
|
|
|
|
if (RCLASS_IV_TBL(mod)) {
|
|
|
|
st_foreach_safe(RCLASS_IV_TBL(mod), cv_i, (st_data_t)tbl);
|
|
|
|
}
|
|
|
|
return tbl;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void*
|
|
|
|
mod_cvar_of(VALUE mod, void *data)
|
|
|
|
{
|
|
|
|
VALUE tmp = mod;
|
|
|
|
for (;;) {
|
|
|
|
data = mod_cvar_at(tmp, data);
|
|
|
|
tmp = RCLASS_SUPER(tmp);
|
|
|
|
if (!tmp) break;
|
|
|
|
}
|
|
|
|
return data;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
cv_list_i(st_data_t key, st_data_t value, VALUE ary)
|
|
|
|
{
|
|
|
|
ID sym = (ID)key;
|
|
|
|
rb_ary_push(ary, ID2SYM(sym));
|
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
cvar_list(void *data)
|
|
|
|
{
|
|
|
|
st_table *tbl = data;
|
|
|
|
VALUE ary;
|
|
|
|
|
|
|
|
if (!tbl) return rb_ary_new2(0);
|
|
|
|
ary = rb_ary_new2(tbl->num_entries);
|
|
|
|
st_foreach_safe(tbl, cv_list_i, ary);
|
|
|
|
st_free_table(tbl);
|
|
|
|
|
|
|
|
return ary;
|
|
|
|
}
|
2000-09-15 10:00:30 +04:00
|
|
|
|
2003-12-28 09:33:07 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2012-07-19 10:41:47 +04:00
|
|
|
* mod.class_variables(inherit=true) -> array
|
2009-02-15 05:45:31 +03:00
|
|
|
*
|
2004-06-26 10:17:20 +04:00
|
|
|
* Returns an array of the names of class variables in <i>mod</i>.
|
2012-07-19 10:41:47 +04:00
|
|
|
* This includes the names of class variables in any included
|
|
|
|
* modules, unless the <i>inherit</i> parameter is set to
|
|
|
|
* <code>false</code>.
|
2009-02-15 05:45:31 +03:00
|
|
|
*
|
2003-12-28 09:33:07 +03:00
|
|
|
* class One
|
|
|
|
* @@var1 = 1
|
|
|
|
* end
|
|
|
|
* class Two < One
|
|
|
|
* @@var2 = 2
|
|
|
|
* end
|
2013-12-30 18:39:35 +04:00
|
|
|
* One.class_variables #=> [:@@var1]
|
|
|
|
* Two.class_variables #=> [:@@var2, :@@var1]
|
|
|
|
* Two.class_variables(false) #=> [:@@var2]
|
2003-12-28 09:33:07 +03:00
|
|
|
*/
|
|
|
|
|
2000-09-15 10:00:30 +04:00
|
|
|
VALUE
|
2014-06-18 10:16:39 +04:00
|
|
|
rb_mod_class_variables(int argc, const VALUE *argv, VALUE mod)
|
2000-09-15 10:00:30 +04:00
|
|
|
{
|
2018-12-06 10:49:24 +03:00
|
|
|
bool inherit = TRUE;
|
2012-07-19 10:41:47 +04:00
|
|
|
st_table *tbl;
|
2000-09-15 10:00:30 +04:00
|
|
|
|
2018-12-06 10:49:24 +03:00
|
|
|
if (rb_check_arity(argc, 0, 1)) inherit = RTEST(argv[0]);
|
|
|
|
if (inherit) {
|
2012-07-19 10:41:47 +04:00
|
|
|
tbl = mod_cvar_of(mod, 0);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
tbl = mod_cvar_at(mod, 0);
|
|
|
|
}
|
|
|
|
return cvar_list(tbl);
|
2000-09-15 10:00:30 +04:00
|
|
|
}
|
|
|
|
|
2003-12-28 09:33:07 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* remove_class_variable(sym) -> obj
|
2009-02-15 05:45:31 +03:00
|
|
|
*
|
2003-12-28 09:33:07 +03:00
|
|
|
* Removes the definition of the <i>sym</i>, returning that
|
|
|
|
* constant's value.
|
2009-02-15 05:45:31 +03:00
|
|
|
*
|
2003-12-28 09:33:07 +03:00
|
|
|
* class Dummy
|
|
|
|
* @@var = 99
|
|
|
|
* puts @@var
|
|
|
|
* remove_class_variable(:@@var)
|
2008-10-09 17:07:28 +04:00
|
|
|
* p(defined? @@var)
|
2003-12-28 09:33:07 +03:00
|
|
|
* end
|
2009-02-15 05:45:31 +03:00
|
|
|
*
|
2003-12-28 09:33:07 +03:00
|
|
|
* <em>produces:</em>
|
2009-02-15 05:45:31 +03:00
|
|
|
*
|
2003-12-28 09:33:07 +03:00
|
|
|
* 99
|
|
|
|
* nil
|
|
|
|
*/
|
|
|
|
|
2000-12-08 10:10:38 +03: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 14:44:21 +04:00
|
|
|
rb_mod_remove_cvar(VALUE mod, VALUE name)
|
2000-12-08 10:10:38 +03:00
|
|
|
{
|
2015-10-28 09:24:12 +03:00
|
|
|
const ID id = id_for_var_message(mod, name, class, "wrong class variable name %1$s");
|
2008-10-09 17:07:28 +04:00
|
|
|
st_data_t val, n = id;
|
2000-12-08 10:10:38 +03:00
|
|
|
|
2011-07-23 19:05:03 +04:00
|
|
|
if (!id) {
|
2015-10-28 09:24:12 +03:00
|
|
|
not_defined:
|
|
|
|
rb_name_err_raise("class variable %1$s not defined for %2$s",
|
|
|
|
mod, name);
|
2000-12-08 10:10:38 +03:00
|
|
|
}
|
* array.c, gc.c, hash.c, object.c, string.c, struct.c,
transcode.c, variable.c, vm.c, vm_insnhelper.c, vm_method.c:
replace calls to rb_error_frozen() with rb_check_frozen(). a
patch from Run Paint Run Run at [ruby-core:32014]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29583 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-10-24 12:14:05 +04:00
|
|
|
rb_check_frozen(mod);
|
2008-10-08 06:23:04 +04:00
|
|
|
if (RCLASS_IV_TBL(mod) && st_delete(RCLASS_IV_TBL(mod), &n, &val)) {
|
|
|
|
return (VALUE)val;
|
2000-12-08 10:10:38 +03:00
|
|
|
}
|
|
|
|
if (rb_cvar_defined(mod, id)) {
|
2015-10-28 09:24:12 +03:00
|
|
|
rb_name_err_raise("cannot remove %1$s for %2$s", mod, ID2SYM(id));
|
2000-12-08 10:10:38 +03:00
|
|
|
}
|
2015-10-28 09:24:12 +03:00
|
|
|
goto not_defined;
|
2000-12-08 10:10:38 +03:00
|
|
|
}
|
|
|
|
|
1998-01-16 15:13:05 +03: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 14:44:21 +04:00
|
|
|
rb_iv_get(VALUE obj, const char *name)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2019-07-01 07:56:55 +03:00
|
|
|
ID id = rb_check_id_cstr(name, strlen(name), rb_usascii_encoding());
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2019-07-01 07:56:55 +03:00
|
|
|
if (!id) {
|
2019-07-01 08:00:37 +03:00
|
|
|
if (RTEST(ruby_verbose))
|
|
|
|
rb_warning("instance variable %s not initialized", name);
|
|
|
|
return Qnil;
|
2019-07-01 07:56:55 +03:00
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
return rb_ivar_get(obj, id);
|
|
|
|
}
|
|
|
|
|
|
|
|
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 14:44:21 +04:00
|
|
|
rb_iv_set(VALUE obj, const char *name, VALUE val)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
ID id = rb_intern(name);
|
|
|
|
|
|
|
|
return rb_ivar_set(obj, id, val);
|
|
|
|
}
|
2013-06-14 13:23:54 +04:00
|
|
|
|
|
|
|
/* tbl = xx(obj); tbl[key] = value; */
|
|
|
|
int
|
2015-10-30 06:07:06 +03:00
|
|
|
rb_class_ivar_set(VALUE obj, ID key, VALUE value)
|
2013-06-14 13:23:54 +04:00
|
|
|
{
|
2015-10-30 04:40:28 +03:00
|
|
|
st_table *tbl = RCLASS_IV_TBL(obj);
|
2013-06-14 13:23:54 +04:00
|
|
|
int result = st_insert(tbl, (st_data_t)key, (st_data_t)value);
|
* include/ruby/ruby.h: rename OBJ_WRITE and OBJ_WRITTEN into
RB_OBJ_WRITE and RB_OBJ_WRITTEN.
* array.c, class.c, compile.c, hash.c, internal.h, iseq.c,
proc.c, process.c, re.c, string.c, variable.c, vm.c,
vm_eval.c, vm_insnhelper.c, vm_insnhelper.h,
vm_method.c: catch up this change.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44299 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-20 12:07:47 +04:00
|
|
|
RB_OBJ_WRITTEN(obj, Qundef, value);
|
2013-06-14 13:23:54 +04:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
tbl_copy_i(st_data_t key, st_data_t value, st_data_t data)
|
|
|
|
{
|
* include/ruby/ruby.h: rename OBJ_WRITE and OBJ_WRITTEN into
RB_OBJ_WRITE and RB_OBJ_WRITTEN.
* array.c, class.c, compile.c, hash.c, internal.h, iseq.c,
proc.c, process.c, re.c, string.c, variable.c, vm.c,
vm_eval.c, vm_insnhelper.c, vm_insnhelper.h,
vm_method.c: catch up this change.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44299 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-20 12:07:47 +04:00
|
|
|
RB_OBJ_WRITTEN((VALUE)data, Qundef, (VALUE)value);
|
2013-06-14 13:23:54 +04:00
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
st_table *
|
|
|
|
rb_st_copy(VALUE obj, struct st_table *orig_tbl)
|
|
|
|
{
|
|
|
|
st_table *new_tbl = st_copy(orig_tbl);
|
|
|
|
st_foreach(new_tbl, tbl_copy_i, (st_data_t)obj);
|
|
|
|
return new_tbl;
|
|
|
|
}
|
2014-08-04 05:12:53 +04:00
|
|
|
|
mjit_compile.c: merge initial JIT compiler
which has been developed by Takashi Kokubun <takashikkbn@gmail> as
YARV-MJIT. Many of its bugs are fixed by wanabe <s.wanabe@gmail.com>.
This JIT compiler is designed to be a safe migration path to introduce
JIT compiler to MRI. So this commit does not include any bytecode
changes or dynamic instruction modifications, which are done in original
MJIT.
This commit even strips off some aggressive optimizations from
YARV-MJIT, and thus it's slower than YARV-MJIT too. But it's still
fairly faster than Ruby 2.5 in some benchmarks (attached below).
Note that this JIT compiler passes `make test`, `make test-all`, `make
test-spec` without JIT, and even with JIT. Not only it's perfectly safe
with JIT disabled because it does not replace VM instructions unlike
MJIT, but also with JIT enabled it stably runs Ruby applications
including Rails applications.
I'm expecting this version as just "initial" JIT compiler. I have many
optimization ideas which are skipped for initial merging, and you may
easily replace this JIT compiler with a faster one by just replacing
mjit_compile.c. `mjit_compile` interface is designed for the purpose.
common.mk: update dependencies for mjit_compile.c.
internal.h: declare `rb_vm_insn_addr2insn` for MJIT.
vm.c: exclude some definitions if `-DMJIT_HEADER` is provided to
compiler. This avoids to include some functions which take a long time
to compile, e.g. vm_exec_core. Some of the purpose is achieved in
transform_mjit_header.rb (see `IGNORED_FUNCTIONS`) but others are
manually resolved for now. Load mjit_helper.h for MJIT header.
mjit_helper.h: New. This is a file used only by JIT-ed code. I'll
refactor `mjit_call_cfunc` later.
vm_eval.c: add some #ifdef switches to skip compiling some functions
like Init_vm_eval.
win32/mkexports.rb: export thread/ec functions, which are used by MJIT.
include/ruby/defines.h: add MJIT_FUNC_EXPORTED macro alis to clarify
that a function is exported only for MJIT.
array.c: export a function used by MJIT.
bignum.c: ditto.
class.c: ditto.
compile.c: ditto.
error.c: ditto.
gc.c: ditto.
hash.c: ditto.
iseq.c: ditto.
numeric.c: ditto.
object.c: ditto.
proc.c: ditto.
re.c: ditto.
st.c: ditto.
string.c: ditto.
thread.c: ditto.
variable.c: ditto.
vm_backtrace.c: ditto.
vm_insnhelper.c: ditto.
vm_method.c: ditto.
I would like to improve maintainability of function exports, but I
believe this way is acceptable as initial merging if we clarify the
new exports are for MJIT (so that we can use them as TODO list to fix)
and add unit tests to detect unresolved symbols.
I'll add unit tests of JIT compilations in succeeding commits.
Author: Takashi Kokubun <takashikkbn@gmail.com>
Contributor: wanabe <s.wanabe@gmail.com>
Part of [Feature #14235]
---
* Known issues
* Code generated by gcc is faster than clang. The benchmark may be worse
in macOS. Following benchmark result is provided by gcc w/ Linux.
* Performance is decreased when Google Chrome is running
* JIT can work on MinGW, but it doesn't improve performance at least
in short running benchmark.
* Currently it doesn't perform well with Rails. We'll try to fix this
before release.
---
* Benchmark reslts
Benchmarked with:
Intel 4.0GHz i7-4790K with 16GB memory under x86-64 Ubuntu 8 Cores
- 2.0.0-p0: Ruby 2.0.0-p0
- r62186: Ruby trunk (early 2.6.0), before MJIT changes
- JIT off: On this commit, but without `--jit` option
- JIT on: On this commit, and with `--jit` option
** Optcarrot fps
Benchmark: https://github.com/mame/optcarrot
| |2.0.0-p0 |r62186 |JIT off |JIT on |
|:--------|:--------|:--------|:--------|:--------|
|fps |37.32 |51.46 |51.31 |58.88 |
|vs 2.0.0 |1.00x |1.38x |1.37x |1.58x |
** MJIT benchmarks
Benchmark: https://github.com/benchmark-driver/mjit-benchmarks
(Original: https://github.com/vnmakarov/ruby/tree/rtl_mjit_branch/MJIT-benchmarks)
| |2.0.0-p0 |r62186 |JIT off |JIT on |
|:----------|:--------|:--------|:--------|:--------|
|aread |1.00 |1.09 |1.07 |2.19 |
|aref |1.00 |1.13 |1.11 |2.22 |
|aset |1.00 |1.50 |1.45 |2.64 |
|awrite |1.00 |1.17 |1.13 |2.20 |
|call |1.00 |1.29 |1.26 |2.02 |
|const2 |1.00 |1.10 |1.10 |2.19 |
|const |1.00 |1.11 |1.10 |2.19 |
|fannk |1.00 |1.04 |1.02 |1.00 |
|fib |1.00 |1.32 |1.31 |1.84 |
|ivread |1.00 |1.13 |1.12 |2.43 |
|ivwrite |1.00 |1.23 |1.21 |2.40 |
|mandelbrot |1.00 |1.13 |1.16 |1.28 |
|meteor |1.00 |2.97 |2.92 |3.17 |
|nbody |1.00 |1.17 |1.15 |1.49 |
|nest-ntimes|1.00 |1.22 |1.20 |1.39 |
|nest-while |1.00 |1.10 |1.10 |1.37 |
|norm |1.00 |1.18 |1.16 |1.24 |
|nsvb |1.00 |1.16 |1.16 |1.17 |
|red-black |1.00 |1.02 |0.99 |1.12 |
|sieve |1.00 |1.30 |1.28 |1.62 |
|trees |1.00 |1.14 |1.13 |1.19 |
|while |1.00 |1.12 |1.11 |2.41 |
** Discourse's script/bench.rb
Benchmark: https://github.com/discourse/discourse/blob/v1.8.7/script/bench.rb
NOTE: Rails performance was somehow a little degraded with JIT for now.
We should fix this.
(At least I know opt_aref is performing badly in JIT and I have an idea
to fix it. Please wait for the fix.)
*** JIT off
Your Results: (note for timings- percentile is first, duration is second in millisecs)
categories_admin:
50: 17
75: 18
90: 22
99: 29
home_admin:
50: 21
75: 21
90: 27
99: 40
topic_admin:
50: 17
75: 18
90: 22
99: 32
categories:
50: 35
75: 41
90: 43
99: 77
home:
50: 39
75: 46
90: 49
99: 95
topic:
50: 46
75: 52
90: 56
99: 101
*** JIT on
Your Results: (note for timings- percentile is first, duration is second in millisecs)
categories_admin:
50: 19
75: 21
90: 25
99: 33
home_admin:
50: 24
75: 26
90: 30
99: 35
topic_admin:
50: 19
75: 20
90: 25
99: 30
categories:
50: 40
75: 44
90: 48
99: 76
home:
50: 42
75: 48
90: 51
99: 89
topic:
50: 49
75: 55
90: 58
99: 99
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62197 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2018-02-04 14:22:28 +03:00
|
|
|
MJIT_FUNC_EXPORTED rb_const_entry_t *
|
2014-08-04 05:12:53 +04:00
|
|
|
rb_const_lookup(VALUE klass, ID id)
|
|
|
|
{
|
use id_table for constant tables
valgrind 3.9.0 on x86-64 reports a minor reduction in memory usage
when loading only RubyGems and RDoc by running: ruby -rrdoc -eexit
before: HEAP SUMMARY:
in use at exit: 2,913,448 bytes in 27,394 blocks
total heap usage: 48,362 allocs, 20,968 frees, 9,034,621 bytes alloc
after: HEAP SUMMARY:
in use at exit: 2,880,056 bytes in 26,712 blocks
total heap usage: 47,791 allocs, 21,079 frees, 9,046,507 bytes alloc
* class.c (struct clone_const_arg): adjust for id_table
(clone_const): ditto
(clone_const_i): ditto
(rb_mod_init_copy): ditto
(rb_singleton_class_clone_and_attach): ditto
(rb_include_class_new): ditto
(include_modules_at): ditto
* constant.h (rb_free_const_table): ditto
* gc.c (free_const_entry_i): ditto
(rb_free_const_table): ditto
(obj_memsize_of): ditto
(mark_const_entry_i): ditto
(mark_const_tbl): ditto
* internal.h (struct rb_classext_struct): ditto
* object.c (rb_mod_const_set): resolve class name on assignment
* variable.c (const_update): replace with const_tbl_update
(const_tbl_update): new function
(fc_i): adjust for id_table
(find_class_path): ditto
(autoload_const_set): st_update => const_tbl_update
(rb_const_remove): adjust for id_table
(sv_i): ditto
(rb_local_constants_i): ditto
(rb_local_constants): ditto
(rb_mod_const_at): ditto
(rb_mod_const_set): ditto
(rb_const_lookup): ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53376 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-29 23:19:14 +03:00
|
|
|
struct rb_id_table *tbl = RCLASS_CONST_TBL(klass);
|
|
|
|
VALUE val;
|
2014-08-04 05:12:53 +04:00
|
|
|
|
use id_table for constant tables
valgrind 3.9.0 on x86-64 reports a minor reduction in memory usage
when loading only RubyGems and RDoc by running: ruby -rrdoc -eexit
before: HEAP SUMMARY:
in use at exit: 2,913,448 bytes in 27,394 blocks
total heap usage: 48,362 allocs, 20,968 frees, 9,034,621 bytes alloc
after: HEAP SUMMARY:
in use at exit: 2,880,056 bytes in 26,712 blocks
total heap usage: 47,791 allocs, 21,079 frees, 9,046,507 bytes alloc
* class.c (struct clone_const_arg): adjust for id_table
(clone_const): ditto
(clone_const_i): ditto
(rb_mod_init_copy): ditto
(rb_singleton_class_clone_and_attach): ditto
(rb_include_class_new): ditto
(include_modules_at): ditto
* constant.h (rb_free_const_table): ditto
* gc.c (free_const_entry_i): ditto
(rb_free_const_table): ditto
(obj_memsize_of): ditto
(mark_const_entry_i): ditto
(mark_const_tbl): ditto
* internal.h (struct rb_classext_struct): ditto
* object.c (rb_mod_const_set): resolve class name on assignment
* variable.c (const_update): replace with const_tbl_update
(const_tbl_update): new function
(fc_i): adjust for id_table
(find_class_path): ditto
(autoload_const_set): st_update => const_tbl_update
(rb_const_remove): adjust for id_table
(sv_i): ditto
(rb_local_constants_i): ditto
(rb_local_constants): ditto
(rb_mod_const_at): ditto
(rb_mod_const_set): ditto
(rb_const_lookup): ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53376 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-29 23:19:14 +03:00
|
|
|
if (tbl && rb_id_table_lookup(tbl, id, &val)) {
|
2014-08-04 05:12:53 +04:00
|
|
|
return (rb_const_entry_t *)val;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|