summaryrefslogtreecommitdiff
path: root/parse.y
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-10-11 11:45:38 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-10-11 11:45:38 +0000
commitf44b0e5b4fbeb58fa1b5cff2be44c359f9438cf7 (patch)
treec40e617a9dcc062f5ffdfde5ecc8ea53addc409f /parse.y
parent73e014407f6a464284ac76c44a6985ea64a089e1 (diff)
* gc.c, parse.y: support generational Symbol relatetd marking.
Each symbols has String objects respectively to represent Symbols. These objects are marked only when: * full marking * new symbols are added This hack reduce symbols (related strings) marking time. For example, on my Linux environment, the following code "20_000_000.times{''}" with 40k symbols (similar symbol number on Rails 3.2.14 app, @jugyo tells me) boosts, from 7.3sec to 4.2sec. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43255 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'parse.y')
-rw-r--r--parse.y15
1 files changed, 11 insertions, 4 deletions
diff --git a/parse.y b/parse.y
index 5ae81267e3..47ea9a3d07 100644
--- a/parse.y
+++ b/parse.y
@@ -10183,6 +10183,7 @@ static struct symbols {
st_table *id_ivar2;
#endif
VALUE op_sym[tLAST_OP_ID];
+ int minor_marked;
} global_symbols = {tLAST_TOKEN};
static const struct st_hash_type symhash = {
@@ -10237,11 +10238,14 @@ Init_sym(void)
}
void
-rb_gc_mark_symbols(void)
+rb_gc_mark_symbols(int full_marking)
{
- rb_mark_tbl(global_symbols.id_str);
- rb_gc_mark_locations(global_symbols.op_sym,
- global_symbols.op_sym + numberof(global_symbols.op_sym));
+ if (full_marking || global_symbols.minor_marked == 0) {
+ rb_mark_tbl(global_symbols.id_str);
+ rb_gc_mark_locations(global_symbols.op_sym,
+ global_symbols.op_sym + numberof(global_symbols.op_sym));
+ global_symbols.minor_marked = 1;
+ }
}
#endif /* !RIPPER */
@@ -10425,6 +10429,7 @@ register_symid_str(ID id, VALUE str)
st_add_direct(global_symbols.sym_id, (st_data_t)str, id);
st_add_direct(global_symbols.id_str, id, (st_data_t)str);
+ global_symbols.minor_marked = 0;
return id;
}
@@ -10628,6 +10633,7 @@ rb_id2str(ID id)
str = rb_usascii_str_new(name, 1);
OBJ_FREEZE(str);
global_symbols.op_sym[i] = str;
+ global_symbols.minor_marked = 0;
}
return str;
}
@@ -10638,6 +10644,7 @@ rb_id2str(ID id)
str = rb_usascii_str_new2(op_tbl[i].name);
OBJ_FREEZE(str);
global_symbols.op_sym[i] = str;
+ global_symbols.minor_marked = 0;
}
return str;
}