diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-07 10:04:22 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-07 10:04:22 +0000 |
commit | a5729b15f3435b0c1afa44b60ffee259fd96d457 (patch) | |
tree | d2d1a6275e4d711e097cac2b15d1f4e9e21c0b0e | |
parent | c88e3861e16c4a0cbf8e4ffb0bca4be193fa1268 (diff) |
merges r31875 from trunk into ruby_1_9_2.
--
* load.c (loaded_feature_path): cut nonsence loop execution to fix
performance bug.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@32882 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | load.c | 19 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 21 insertions, 5 deletions
@@ -1,3 +1,8 @@ +Wed Jun 1 06:43:13 2011 Masaya Tarui <tarui@ruby-lang.org> + + * load.c (loaded_feature_path): cut nonsence loop execution to fix + performance bug. + Sat Jun 25 23:45:30 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com> * vm_insnhelper.c (vm_search_superclass): avoid control frame @@ -73,16 +73,27 @@ loaded_feature_path(const char *name, long vlen, const char *feature, long len, int type, VALUE load_path) { long i; - + long plen; + const char *e; + + if(vlen < len) return 0; + if (!strncmp(name+(vlen-len),feature,len)){ + plen = vlen - len - 1; + } else { + for (e = name + vlen; name != e && *e != '.' && *e != '/'; --e); + if (*e!='.' || + e-name < len || + strncmp(e-len,feature,len) ) + return 0; + plen = e - name - len - 1; + } for (i = 0; i < RARRAY_LEN(load_path); ++i) { VALUE p = RARRAY_PTR(load_path)[i]; const char *s = StringValuePtr(p); long n = RSTRING_LEN(p); - if (vlen < n + len + 1) continue; + if (n != plen ) continue; if (n && (strncmp(name, s, n) || name[n] != '/')) continue; - if (strncmp(name + n + 1, feature, len)) continue; - if (name[n+len+1] && name[n+len+1] != '.') continue; switch (type) { case 's': if (IS_DLEXT(&name[n+len+1])) return p; @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 293 +#define RUBY_PATCHLEVEL 294 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 |