diff options
| author | shirosaki <shirosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-05 15:27:05 +0000 |
|---|---|---|
| committer | shirosaki <shirosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-05 15:27:05 +0000 |
| commit | 9823c46189d7447692ea6c33e07b4cae5fed74f2 (patch) | |
| tree | 903bcd27b8de4f7fe6a64a5b62920d9e85489ef0 /ruby.c | |
| parent | b56a2afc14ebdc2e5524e0a8ebcf920626d463af (diff) | |
Cache the expanded load path
* load.c (rb_get_expanded_load_path): cache the expanded load
path. This saves 4KB of allocation and some stats for every
element of the load path (so nearly a MB in my Rails app)
on every require.
* load.c (rb_construct_expanded_load_path): ensure that $LOAD_PATH
entries are frozen strings. The user must mutate $LOAD_PATH
itself rather than its individual entries.
* vm_core.h (rb_vm_struct): add fields.
* vm.c (rb_vm_mark): mark new fields.
* ruby.c (process_options): modify $LOAD_PATH directly rather than
its elements.
Patch by Greg Price.
[ruby-core:47970] [Bug #7158]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37481 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ruby.c')
| -rw-r--r-- | ruby.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1418,7 +1418,8 @@ process_options(int argc, char **argv, struct cmdline_options *opt) long i; VALUE load_path = GET_VM()->load_path; for (i = 0; i < RARRAY_LEN(load_path); ++i) { - rb_enc_associate(RARRAY_PTR(load_path)[i], lenc); + RARRAY_PTR(load_path)[i] = + rb_enc_associate(rb_str_dup(RARRAY_PTR(load_path)[i]), lenc); } } if (!(opt->disable & DISABLE_BIT(gems))) { |