Changeset 326

Timestamp:

07/18/06 18:05:47 (4 years ago)

Author:

vasi

Message:

faster ktrace using external helper

Files:

• gtk-osx/trunk/scripts/gtk-osx/ktrace.rb (modified) (3 diffs)

gtk-osx/trunk/scripts/gtk-osx/ktrace.rb

@@ -6 +6 @@
         attr_reader :tracefile
         
-        def initialize(tracefile = 'ktrace.out')
+        @@helper_dir = Pathname.new(__FILE__) + '../../../kdump-parse'
+        def self.helper_dir=(dir)
+                @@helper_dir = dir
+        end
+        
+        def initialize(tracefile = 'ktrace.out', origdir = nil)
                 @tracefile = tracefile
-                @origdir = Dir.pwd
+                @origdir = origdir || Dir.pwd
         end
                 
@@ -18 +23 @@
         
         # Get the files that were written to.
-        # Not the prettiest implementation, but the previous one was far too slow.
         def write_paths
                 return @files if defined? @files                
+                catch :no_helper do
+                        c_write_paths
+                        return @files
+                end
+                ruby_write_paths
+                return @files
+        end
+        
+        def get_helper
+                return @@helper if defined? @@helper
                 
+                dir = Pathname.new(@@helper_dir)
+                program = 'kdump-parse'
+                
+                # Search for an existing executable
+                [dir, Pathname.new(__FILE__).parent].each do |d|
+                        file = d + program
+                        return (@@helper = file) if file.executable?
+                end
+                
+                # Try building it
+                makefile = dir + 'Makefile'
+                if dir.directory? && dir.writable? && makefile.exist?
+                        system("(cd #{dir.shellquote} && make #{program})")
+                        file = dir + program
+                        return (@@helper = file) if file.executable?
+                end
+                
+                # Give up
+                throw :no_helper
+        end
+        
+        # Use an external helper, for SPEED
+        def c_write_paths
+                helper = get_helper
+                IO.popen("#{helper.shellquote} #{@tracefile.shellquote} " +
+                                "#{@origdir.shellquote}", 'r') do |pipe|
+                        @files = pipe.readlines.map { |s| Pathname.new(s.chomp) }
+                end
+        end
+        
+        # Pure-ruby implementation
+        def ruby_write_paths
                 dest_idx = { 'open' => 0, 'symlink' => 0, 'link' => 1, 'chdir' => 0,
                         'rename' => 1 }
@@ -67 +113 @@
                 end
                 
-                return @files = files.keys
+                @files = files.keys
         end
 end