Changeset 310

Timestamp:

07/16/06 03:34:49 (4 years ago)

Author:

vasi

Message:

much faster AND shorter

Location:

gtk-osx/trunk/scripts/gtk-osx

Files:

• build/package.rb (modified) (2 diffs)
• ktrace (deleted)
• ktrace.rb (modified) (1 diff)

gtk-osx/trunk/scripts/gtk-osx/build/package.rb

@@ -12 +12 @@
                 sub = realpath
                 dir = Pathname.new(other).realpath.to_s
-                sub[0, dir.length] == dir
+                sub.to_s[0, dir.length] == dir
         end
 end
@@ -112 +112 @@
                                 
                                 if file.within?(@config.prefix)
-                                        files << file
+                                        files << file.to_s
                                 else
                                         $stderr.puts "WARNING: File #{file} was placed outside " +

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

@@ -1 @@
-#!/usr/bin/ruby -w
+require 'pathname'
 require 'gtk-osx/script'
-require 'gtk-osx/ktrace/kdump'
+require 'gtk-osx/shellquote'
 
 class KTrace
         def initialize(tracefile = 'ktrace.out')
                 @tracefile = tracefile
-                @initial_dir = Dir.pwd
+                @origdir = Dir.pwd
         end
                 
         def run_script(str, msg = Script::DEFAULT_MSG)
-                raise "Already read results!" if defined? @kdump
+                raise "Already read results!" if defined? @files
                 wrap = %w[ktrace -i -a -tcn -f] << @tracefile
                 Script.run_script_file(str, msg, wrap)
         end
         
-        def method_missing(sym, *args)
-                unless defined? @kdump
-                        @kdump = KDump.new(@tracefile, @initial_dir)
+        # 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                
+                
+                line_re = %r[\s(CALL|NAMI)\s*(.*)]
+                call_re = %r[(open|symlink)(.*)]
+                args_re = %r[,]
+                
+                files = {}
+                call = nil
+                dir = Pathname.new(@origdir)
+                
+                output = `kdump -d -n -f #{@tracefile.shellquote}`
+                output.scan(line_re) do |type, details|
+                        if (type == 'CALL')
+                                md = call_re.match(details) or next
+                                func, args = md.captures
+                                if func == 'open'
+                                        args = args[1, args.size - 2]
+                                        flags = args.split(args_re)[1]
+                                        next if (flags.to_i & 3).zero?
+                                end
+                                call = func
+                        elsif call # NAMI: applies to the previous call
+                                details = details[1, details.size - 2]
+                                path = (dir + details).cleanpath
+                                if call == 'chdir'
+                                        dir = path # make sure our paths are ok
+                                else
+                                        files[path] = true
+                                end
+                                call = nil
+                        end
                 end
-                @kdump.send(sym, *args)
-        end
-        
-        def respond_to?(sym)
-                super || (defined?(@kdump) && @kdump.respond_to?(sym))
+                
+                return @files = files.keys
         end
 end