ruby-changes:19829
From: tarui <ko1@a...>
Date: Wed, 1 Jun 2011 07:00:44 +0900 (JST)
Subject: [ruby-changes:19829] tarui:r31875 (trunk): * load.c (loaded_feature_path): cut nonsence loop execution to fix
tarui 2011-06-01 06:56:01 +0900 (Wed, 01 Jun 2011) New Revision: 31875 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=31875 Log: * load.c (loaded_feature_path): cut nonsence loop execution to fix performance bug. Modified files: trunk/ChangeLog trunk/load.c Index: ChangeLog =================================================================== --- ChangeLog (revision 31874) +++ ChangeLog (revision 31875) @@ -1,3 +1,8 @@ +Wed Jun 1 06:43:13 2011 Masaya Tarui <tarui@r...> + + * load.c (loaded_feature_path): cut nonsence loop execution to fix + performance bug. + Wed Jun 1 01:16:02 2011 Nobuyoshi Nakada <nobu@r...> * class.c (rb_mix_module): implement Module#mix. Index: load.c =================================================================== --- load.c (revision 31874) +++ load.c (revision 31875) @@ -73,16 +73,27 @@ 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; -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/