Refactoring of load_path scanning.

absolute/relative condition cleanup. File#isFile() is the bottleneck. It's called iif needed already.
jruby · May 31, 2011 · 60d89ba · 60d89ba
1 parent 17ab324
commit 60d89ba
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/bench/bench_full_load_path.rb b/bench/bench_full_load_path.rb
@@ -5,7 +5,12 @@
 target_size = (ARGV.shift || '10000').to_i # must be bigger than 50
 require_size = 50
 
-TEST_DIR = File.expand_path('full_load_path_test', File.dirname(__FILE__))
+# for testing with abloute path
+#TEST_DIR = File.expand_path('full_load_path_test', File.dirname(__FILE__))
+
+# for testing with relative path
+Dir.chdir File.dirname(__FILE__)
+TEST_DIR = 'full_load_path_test'
 
 unless File.directory?(TEST_DIR)
   FileUtils.mkdir(TEST_DIR)
@@ -32,6 +37,8 @@ def with_loadvars(size)
   end
 end
 
+gets
+
 Benchmark.bmbm do |bm|
   bm.report("empty counterpart") do
     with_loadvars(size) do

diff --git a/src/org/jruby/runtime/load/LoadService.java b/src/org/jruby/runtime/load/LoadService.java
@@ -1155,21 +1155,17 @@ protected LoadServiceResource tryResourceFromLoadPath( String namePlusSuffix,Str
         try {
             if (!Ruby.isSecurityRestricted()) {
                 String reportedPath = loadPathEntry + "/" + namePlusSuffix;
-                JRubyFile actualPath;
-                boolean absolute = false;
+                boolean absolute = true;
                 // we check length == 0 for 'load', which does not use load path
-                if (new File(reportedPath).isAbsolute()) {
-                    absolute = true;
-                    // it's an absolute path, use it as-is
-                    actualPath = JRubyFile.create(loadPathEntry, RubyFile.expandUserPath(runtime.getCurrentContext(), namePlusSuffix));
-                } else {
+                if (!new File(reportedPath).isAbsolute()) {
                     absolute = false;
                     // prepend ./ if . is not already there, since we're loading based on CWD
                     if (reportedPath.charAt(0) != '.') {
                         reportedPath = "./" + reportedPath;
                     }
-                    actualPath = JRubyFile.create(JRubyFile.create(runtime.getCurrentDirectory(), loadPathEntry).getAbsolutePath(), RubyFile.expandUserPath(runtime.getCurrentContext(), namePlusSuffix));
+                    loadPathEntry = JRubyFile.create(runtime.getCurrentDirectory(), loadPathEntry).getAbsolutePath();
                 }
+                JRubyFile actualPath = JRubyFile.create(loadPathEntry, RubyFile.expandUserPath(runtime.getCurrentContext(), namePlusSuffix));
                 if (RubyInstanceConfig.DEBUG_LOAD_SERVICE) {
                     debugLogTry("resourceFromLoadPath", "'" + actualPath.toString() + "' " + actualPath.isFile() + " " + actualPath.canRead());
                 }