ruby-elf 1.0.3 → 1.0.4

data/manpages/cowstats.1

@@ -139,10 +139,7 @@ Recursively descend into directories to search for files to scan\&. This affects
 .PP
 \fB@\fR\fIpath\fR
 .RS 4
-Read the list of files to analyse from the given file (or standard input if
-\fIpath\fR
-is
-\-)\&. Useful to pass a long list of files\&. When used with stdin or named pipes, this also allows asynchronous analysis\&.
+Read the list of files to analyse from the given file; useful to pass a long list of files\&. The files are read before the processing start, so that the list of target files is available\&.
 .RE
 .SH "BUGS"
 .PP

data/manpages/elfgrep.1

@@ -1,7 +1,7 @@
 '\" t
 .\"     Title: elfgrep
 .\"    Author: 
-.\" Generator: DocBook XSL-NS Stylesheets v1.76.0 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL-NS Stylesheets v1.76.1 <http://docbook.sf.net/>
 .\"      Date: January 2011
 .\"    Manual: Reference
 .\"    Source: ruby-elf
@@ -31,7 +31,7 @@
 elfgrep \- Search for symbols matching an expression in ELF files
 .SH "SYNOPSIS"
 .HP \w'\fBelfgrep\fR\ 'u
-\fBelfgrep\fR [\fB\-\-fixed\-strings\fR] [\fB\-\-ignore\-case\fR] [\fB\-\-match\-version\fR] [\fB\-\-no\-match\-undefined\fR | \fB\-\-no\-match\-defined\fR] [\fB\-\-invert\-match\fR] [\fB\-\-count\fR] [\fB\-\-files\-without\-match\fR | \fB\-\-files\-with\-matches\fR] [\fB\-\-with\-filename\fR | \fB\-\-no\-filename\fR] [\fB\-\-null\fR] [\fB\-\-quiet\fR] [\fB\-\-recursive\fR] {\fB\-\-regexp\fR\ \fIPATTERN\fR... | \fIPATTERN\fR} [\fB@\fR\fIfile\fR | \fIfile\fR...]
+\fBelfgrep\fR [\fB\-\-fixed\-strings\fR] [\fB\-\-ignore\-case\fR] [\fB\-\-match\-version\fR] [\fB\-\-match\-undefined\fR | \fB\-\-match\-defined\fR] [\fB\-\-invert\-match\fR] [\fB\-\-count\fR] [\fB\-\-files\-without\-match\fR | \fB\-\-files\-with\-matches\fR] [\fB\-\-with\-filename\fR | \fB\-\-no\-filename\fR] [\fB\-\-null\fR] [\fB\-\-quiet\fR] [\fB\-\-recursive\fR] {\fB\-\-regexp\fR\ \fIPATTERN\fR... | \fIPATTERN\fR} [\fB@\fR\fIfile\fR | \fIfile\fR...]
 .SH "DESCRIPTION"
 .PP
 
@@ -68,14 +68,18 @@ and the symbols\*(Aq names\&.
 Append the ELF version information for the symbol, separated by an @ symbol, before testing the expression for match\&. This allows to match only symbols that are defined with a particular version\&.
 .RE
 .PP
-\fB\-U\fR, \fB\-\-no\-match\-undefined\fR
+\fB\-U\fR, \fB\-\-match\-undefined\fR
 .RS 4
-Do not report matches on undefined symbols; useful if you\*(Aqre looking for the objects defining the symbol, and not those using it\&.
+Report matches on undefined symbols\&. By default
+\fBelfgrep\fR
+will report matches on both defined and undefined symbols\&. This switch makes it ignore matches on defined symbols\&.
 .RE
 .PP
 \fB\-D\fR, \fB\-\-no\-match\-defined\fR
 .RS 4
-Do not report matches on defined symbols; useful if you\*(Aqre looking for the objects using the symbol, and not those defining it\&.
+Report matches on defined symbols\&. By default
+\fBelfgrep\fR
+will report matches on both defined and undefined symbols\&. This switch makes it ignore matches on undefined symbols\&.
 .RE
 .PP
 \fB\-v\fR, \fB\-\-invert\-match\fR
@@ -137,10 +141,7 @@ Recursively descend into directories to search for files to scan\&. This affects
 .PP
 \fB@\fR\fIpath\fR
 .RS 4
-Read the list of files to analyse from the given file (or standard input if
-\fIpath\fR
-is
-\-)\&. Useful to pass a long list of files\&. When used with stdin or named pipes, this also allows asynchronous analysis\&.
+Read the list of files to analyse from the given file; useful to pass a long list of files\&. The files are read before the processing start, so that the list of target files is available\&.
 .RE
 .SH "BUGS AND MISSING FEATURES"
 .PP

data/manpages/elfgrep.1.xml

@@ -60,11 +60,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
           <group choice="opt">
             <arg choice="plain">
-              <option>--no-match-undefined</option>
+              <option>--match-undefined</option>
             </arg>
 
             <arg choice="plain">
-              <option>--no-match-defined</option>
+              <option>--match-defined</option>
             </arg>
           </group>
 
@@ -190,11 +190,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
             <varlistentry>
               <term><option>-U</option></term>
-              <term><option>--no-match-undefined</option></term>
+              <term><option>--match-undefined</option></term>
               <listitem>
                 <para>
-                  Do not report matches on undefined symbols; useful if you're looking for the objects
-                  defining the symbol, and not those using it.
+                  Report matches on undefined symbols. By default <command>elfgrep</command> will
+                  report matches on both defined and undefined symbols. This switch makes it ignore
+                  matches on defined symbols.
                 </para>
               </listitem>
             </varlistentry>
@@ -204,8 +205,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
               <term><option>--no-match-defined</option></term>
               <listitem>
                 <para>
-                  Do not report matches on defined symbols; useful if you're looking for the objects
-                  using the symbol, and not those defining it.
+                  Report matches on defined symbols. By default <command>elfgrep</command> will
+                  report matches on both defined and undefined symbols. This switch makes it ignore
+                  matches on undefined symbols.
                 </para>
               </listitem>
             </varlistentry>

data/manpages/missingstatic.1

@@ -100,10 +100,7 @@ Recursively descend into directories to search for files to scan\&. This affects
 .PP
 \fB@\fR\fIpath\fR
 .RS 4
-Read the list of files to analyse from the given file (or standard input if
-\fIpath\fR
-is
-\-)\&. Useful to pass a long list of files\&. When used with stdin or named pipes, this also allows asynchronous analysis\&.
+Read the list of files to analyse from the given file; useful to pass a long list of files\&. The files are read before the processing start, so that the list of target files is available\&.
 .RE
 .SH "EXAMPLES"
 .SS "Generating the tags file"

data/manpages/rbelf-size.1

@@ -1,7 +1,7 @@
 '\" t
 .\"     Title: rbelf-size
 .\"    Author: 
-.\" Generator: DocBook XSL-NS Stylesheets v1.76.0 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL-NS Stylesheets v1.76.1 <http://docbook.sf.net/>
 .\"      Date: October 2008
 .\"    Manual: Reference
 .\"    Source: ruby-elf
@@ -31,7 +31,7 @@
 rbelf-size \- List section sizes of ELF files
 .SH "SYNOPSIS"
 .HP \w'\fBrbelf\-size\fR\ 'u
-\fBrbelf\-size\fR [\fB\-\-relocation\-stats\fR\ [\fB\-\-decibel\fR]] [\fB\-\-quiet\fR] [\fB\-\-recursive\fR] [\fB@\fR\fIfile\fR | \fIfile\fR...]
+\fBrbelf\-size\fR [\fB\-\-relocation\-stats\fR\ [\fB\-\-decibel\fR]] [\fB\-\-differential\fR] [\fB\-\-quiet\fR] [\fB\-\-recursive\fR] [\fB@\fR\fIfile\fR | \fIfile\fR...]
 .SH "DESCRIPTION"
 .PP
 
@@ -57,6 +57,11 @@ option, a ratio is displayed between the size of relocated and shared code areas
 Since that ratio can easily skyrocket into thousands if there is very little relocated data, and a lot of shared data, it might be easier to appreciate the results by using a logaritmic scale\&.
 .RE
 .PP
+\fB\-D\fR, \fB\-\-differential\fR
+.RS 4
+Provides sizes of multiple arguments as a comparison to the first\&. It is designed to allow comparing multiple versions of the same binary or multiple implementation of the same application to evaluate the overall trend in static memory allocation\&.
+.RE
+.PP
 \fB\-q\fR, \fB\-\-quiet\fR
 .RS 4
 Do not output warnings and errors to the standard error\&. Designed to increase the signal\-to\-noise ratio when analysing eterogeneous trees recursively, or when producing output to redirect to automated systems\&.
@@ -69,10 +74,7 @@ Recursively descend into directories to search for files to scan\&. This affects
 .PP
 \fB@\fR\fIpath\fR
 .RS 4
-Read the list of files to analyse from the given file (or standard input if
-\fIpath\fR
-is
-\-)\&. Useful to pass a long list of files\&. When used with stdin or named pipes, this also allows asynchronous analysis\&.
+Read the list of files to analyse from the given file; useful to pass a long list of files\&. The files are read before the processing start, so that the list of target files is available\&.
 .RE
 .SH "COMPATIBLE OUTPUT"
 .PP
@@ -115,9 +117,9 @@ overhead
 Total size of sections providing object\*(Aqs metadata for the link editor and dynamic loader\&. These include the symbol and string tables, the version tables and the hash table used during linking and execution\&. These values are usually tied to the amount of symbols exposed by an object, and can easily be reduced by hiding internal, non\-public symbols\&.
 .RE
 .PP
-total
+allocated
 .RS 4
-Counts in the sum of all the previous sections\&.
+Sum of the size of all the previously\-shown sections, which shows the actual allocated memory used by the object\&. It is important to note that sections are usually loaded on an alignment of the page size, which on Linux is 4KiB (4096 bytes), so the size of the actual memory reserved for the ELF structures in memory is going to be higher than this number\&.
 .RE
 .SH "RELOCATION STATISTICS"
 .PP
@@ -158,13 +160,9 @@ the value will be represented in deciBels, which should make it even easier to u
 .RE
 .SH "BUGS AND MISSING FEATURES"
 .PP
-The name
-\fItotal\fR
-for the sum of the colums is misleading since it\*(Aqs actually not the total size of the file, nor the total size of the allocated entries\&.
-.PP
-Right now, all the sections are counted in if their flags match, it might be better to limit to allocated sections all over the place\&.
-.PP
-The size of the columns is fixed to 8 digits, it might not be enough to fill in enough space for some big ELF files\&.
+When using the
+\fB\-\-differential\fR
+option, analysis of the arguments happens sequentially in a single thread rather than in parallel\&.
 .PP
 Parsing of files to provide further arguments (\fB@\fR\fIfile\fR) is not entirely comforming to other tools handling of the same syntax\&. No options are parsed from the file, and filenames are expected to be separated by newlines rather than whitespace\&.
 .PP

data/manpages/rbelf-size.1.xml

@@ -51,6 +51,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
             <arg choice="opt"><option>--decibel</option></arg>
           </arg>
 
+          <arg choice="opt">
+            <option>--differential</option>
+          </arg>
+
           <xi:include href="common.xmli"  xpointer="xpointer(id('filelist.synopsis')/*)" />
         </cmdsynopsis>
       </refsynopsisdiv>
@@ -102,6 +106,19 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
             </listitem>
           </varlistentry>
 
+          <varlistentry>
+            <term><option>-D</option></term>
+            <term><option>--differential</option></term>
+
+            <listitem>
+              <para>
+                Provides sizes of multiple arguments as a comparison to the first. It is designed to
+                allow comparing multiple versions of the same binary or multiple implementation of
+                the same application to evaluate the overall trend in static memory allocation.
+              </para>
+            </listitem>
+          </varlistentry>
+
           <xi:include href="common.xmli" xpointer="xpointer(id('filelist.option')/*)" />
         </variablelist>
       </refsect1>
@@ -179,10 +196,14 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
           </varlistentry>
 
           <varlistentry>
-            <term>total</term>
+            <term>allocated</term>
             <listitem>
               <para>
-                Counts in the sum of all the previous sections.
+                Sum of the size of all the previously-shown sections, which shows the actual
+                allocated memory used by the object. It is important to note that sections are
+                usually loaded on an alignment of the page size, which on Linux is 4KiB (4096
+                bytes), so the size of the actual memory reserved for the ELF structures in memory
+                is going to be higher than this number.
               </para>
             </listitem>
           </varlistentry>
@@ -276,18 +297,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
         <title>Bugs and Missing Features</title>
 
         <para>
-          The name <varname>total</varname> for the sum of the colums is misleading since it's
-          actually not the total size of the file, nor the total size of the allocated entries.
-        </para>
-
-        <para>
-          Right now, all the sections are counted in if their flags match, it might be better to
-          limit to allocated sections all over the place.
-        </para>
-
-        <para>
-          The size of the columns is fixed to 8 digits, it might not be enough to fill in enough
-          space for some big ELF files.
+          When using the <option>--differential</option> option, analysis of the arguments happens
+          sequentially in a single thread rather than in parallel.
         </para>
 
         <xi:include href="common.xmli" xpointer="xpointer(id('filelist.bugpara')/*)" />

data/manpages/verify-lfs.1

@@ -56,10 +56,7 @@ Recursively descend into directories to search for files to scan\&. This affects
 .PP
 \fB@\fR\fIpath\fR
 .RS 4
-Read the list of files to analyse from the given file (or standard input if
-\fIpath\fR
-is
-\-)\&. Useful to pass a long list of files\&. When used with stdin or named pipes, this also allows asynchronous analysis\&.
+Read the list of files to analyse from the given file; useful to pass a long list of files\&. The files are read before the processing start, so that the list of target files is available\&.
 .RE
 .SH "BUGS AND MISSING FEATURES"
 .PP

data/tools/link-collisions/harvest.rb

@@ -26,342 +26,307 @@ require 'pg'
 
 require 'elf'
 require 'elf/utils/loader'
-
-opts = GetoptLong.new(
-  ["--no-scan-ldpath",     "-L", GetoptLong::NO_ARGUMENT ],
-  ["--scan-path",          "-p", GetoptLong::NO_ARGUMENT ],
-  ["--suppressions",       "-s", GetoptLong::REQUIRED_ARGUMENT ],
-  ["--multiplementations", "-m", GetoptLong::REQUIRED_ARGUMENT ],
-  ["--scan-directory",     "-d", GetoptLong::REQUIRED_ARGUMENT ],
-  ["--recursive-scan",     "-r", GetoptLong::NO_ARGUMENT ],
-  ["--elf-machine",        "-M", GetoptLong::REQUIRED_ARGUMENT ],
-  ["--postgres-username",  "-U", GetoptLong::REQUIRED_ARGUMENT ],
-  ["--postgres-password",  "-P", GetoptLong::REQUIRED_ARGUMENT ],
-  ["--postgres-hostname",  "-H", GetoptLong::REQUIRED_ARGUMENT ],
-  ["--postgres-port",      "-T",  GetoptLong::REQUIRED_ARGUMENT ],
-  ["--postgres-database",  "-D", GetoptLong::REQUIRED_ARGUMENT ]
-)
-
-suppression_files = File.exist?('suppressions') ? [ 'suppressions' ] : []
-multimplementation_files = File.exist?('multimplementations') ? [ 'multimplementations' ] : []
-scan_path = false
-scan_ldpath = true
-recursive_scan = false
-scan_directories = []
-$machines = []
-
-pg_params = {}
-
-opts.each do |opt, arg|
-  case opt
-  when '--suppressions'
-    unless File.exist? arg
-      $stderr.puts "harvest.rb: no such file or directory - #{arg}"
-      exit -1
-    end
-    suppression_files << arg
-  when "--multiplementations"
-    unless File.exist? arg
-      $stderr.puts "harvest.rb: no such file or directory - #{arg}"
-      exit -1
+require 'elf/tools'
+
+module Elf::Tools
+  class CollisionsHarvester < Elf::Tool
+    def self.initialize
+      super
+      # this script doesn't support running multithreaded, since we
+      # need synchronous access to the database itself, so for now
+      # simply make sure that it never is executed with threads.
+      @execution_threads = nil
+
+      @options |= [
+                   ["--no-scan-ldpath",      "-L", GetoptLong::NO_ARGUMENT ],
+                   ["--scan-path",           "-p", GetoptLong::NO_ARGUMENT ],
+                   ["--suppressions",        "-s", GetoptLong::REQUIRED_ARGUMENT ],
+                   ["--multimplementations", "-m", GetoptLong::REQUIRED_ARGUMENT ],
+                   ["--elf-machine",         "-M", GetoptLong::REQUIRED_ARGUMENT ],
+                   ["--postgres-username",   "-U", GetoptLong::REQUIRED_ARGUMENT ],
+                   ["--postgres-password",   "-P", GetoptLong::REQUIRED_ARGUMENT ],
+                   ["--postgres-hostname",   "-H", GetoptLong::REQUIRED_ARGUMENT ],
+                   ["--postgres-port",       "-T", GetoptLong::REQUIRED_ARGUMENT ],
+                   ["--postgres-database",   "-D", GetoptLong::REQUIRED_ARGUMENT ],
+                   ["--output",              "-o", GetoptLong::REQUIRED_ARGUMENT ],
+                  ]
+
+      # we remove the -R option since we always want to be recursive in our search
+      @options.delete_if { |opt| opt[1] == "-R" }
+      @recursive = true
+
+      @suppression_files = File.exist?('suppressions') ? [ 'suppressions' ] : []
+      @multimplementation_files = File.exist?('multimplementations') ? [ 'multimplementations' ] : []
+
+      # Total suppressions are for directories to skip entirely
+      # Partial suppressions are the ones that apply only to a subset
+      # of symbols.
+      @total_suppressions = []
+      @partial_suppressions = []
+
+      @multimplementations = []
+
+      @output = "collisions.log"
     end
-    multimplementation_files << arg
-  when '--scan-path'
-    scan_path = true
-  when '--no-scan-ldpath'
-    scan_ldpath = false
-  when '--scan-directory'
-    scan_directories << arg
-  when '--recursive-scan'
-    recursive_scan = true
-  when "--elf-machine"
-    machine_str = arg.dup
-
-    # Remove the EM_ prefix if present
-    machine_str = machine_str[3..-1] if arg[0..2].upcase == "EM_"
-
-    # Remove underscores if present (we don't keep them in our
-    # constants)
-    machine_str.delete!("_")
-
-    machine_val = Elf::Machine.from_string(machine_str)
-
-    if machine_val.nil?
-      $stderr.puts "harvest.rb: unknown machine string - #{arg}"
-    else
-      $machines << machine_val unless machine_val.nil?
-    end
-  when '--postgres-username' then pg_params[:user] = arg
-  when '--postgres-password' then pg_params[:password] = arg
-  when '--postgres-hostname' then pg_params[:host] = arg
-  when '--postgres-port'     then pg_params[:port] = arg
-  when '--postgres-database' then pg_params[:dbname] = arg
-  end
-end
 
-$machines = nil if $machines.empty?
-
-db = PGconn.open(pg_params)
-
-db.exec("DROP TABLE IF EXISTS symbols, multimplementations, objects CASCADE")
-
-db.exec("CREATE TABLE objects ( id INTEGER PRIMARY KEY, name VARCHAR(4096), abi VARCHAR(255), exported BOOLEAN, UNIQUE(name, abi) )")
-db.exec("CREATE TABLE multimplementations ( id INTEGER REFERENCES objects(id) ON DELETE CASCADE, path VARCHAR(4096), UNIQUE(path) )")
-db.exec("CREATE TABLE symbols ( object INTEGER REFERENCES objects(id) ON DELETE CASCADE, symbol TEXT,
-         PRIMARY KEY(object, symbol) )")
-
-db.exec("CREATE VIEW symbol_count AS
-         SELECT symbol, abi, COUNT(*) AS occurrences, BOOL_OR(objects.exported) AS exported FROM symbols INNER JOIN objects ON symbols.object = objects.id GROUP BY symbol, abi")
-db.exec("CREATE VIEW duplicate_symbols AS
-         SELECT * FROM symbol_count WHERE occurrences > 1 AND exported = 't' ORDER BY occurrences DESC, symbol ASC")
-
-db.exec("PREPARE newmulti (int, text) AS
-         INSERT INTO multimplementations (id, path) VALUES($1, $2)")
-db.exec("PREPARE newobject (int, text, text, boolean) AS
-         INSERT INTO objects(id, name, abi, exported) VALUES($1, $2, $3, $4)")
-db.exec("PREPARE newsymbol (int, text) AS
-         INSERT INTO symbols VALUES($1, $2)")
-
-db.exec("PREPARE checkimplementation(text, text) AS
-         SELECT id FROM objects WHERE name = $1 AND abi = $2")
-db.exec("PREPARE checkdupsymbol (int, text) AS
-         SELECT 1 FROM symbols WHERE object = $1 AND symbol = $2")
-
-# Total suppressions are for directories to skip entirely
-# Partial suppressions are the ones that apply only to a subset
-# of symbols.
-$total_suppressions = []
-$partial_suppressions = []
-
-suppression_files.each do |suppression|
-  File.open(suppression) do |file|
-    file.each_line do |line|
-      path, symbols = line.
-        gsub(/#\s.*/, '').
-        strip.
-        split(/\s+/, 2)
-      
-      next unless path
-      
-      if not symbols or symbols == ""
-        $total_suppressions << Regexp.new(path)
-      else
-        $partial_suppressions << [Regexp.new(path), Regexp.new(symbols)]
+    def self.suppressions_cb(arg)
+      unless File.exist? arg
+        puterror("no such file or directory - #{arg}")
+        exit -1
       end
+      @suppression_files << arg
     end
-  end
-end
-
-multimplementations = []
-
-multimplementation_files.each do |multimplementation|
-  File.open(multimplementation) do |file|
-    file.each_line do |line|
-      implementation, paths = line.
-        gsub(/#\s.*/, '').
-        strip.
-        split(/\s+/, 2)
-
-      next unless implementation
-      next unless paths
-      
-      multimplementations << [ implementation, Regexp.new(paths) ]
-    end
-  end
-end
-
-so_files = Set.new
 
-# Extend Pathname with a so_files method
-class Pathname
-  def maybe_queue
-    return nil if symlink?
-
-    $total_suppressions.each do |supp|
-      return nil if to_s =~ supp
+    def self.multimplementations_cb(arg)
+      unless File.exist? arg
+        puterror("no such file or directory - #{arg}")
+        exit -1
+      end
+      @multimplementation_files << arg
     end
 
-    elf = nil
+    def self.elf_machine_cb(arg)
+      machine_str = (arg[0..2].upcase == "EM_" ? arg[3..-1] : arg).delete("_")
+      machine_val = Elf::Machine.from_string(machine_str)
 
-    begin
-      elf = Elf::File.open(self)
-
-      if ($machines.nil? or $machines.include?(elf.machine)) and
-          (elf.has_section?('.dynsym') and elf.has_section?('.dynstr') and
-           elf.has_section?('.dynamic')) and
-          (elf[".dynsym"].class == Elf::SymbolTable)
-        return to_s
+      if machine_val.nil?
+        puterror("unknown machine string - #{arg}")
       else
-        return nil
+        @machines ||= []
+        @machines << machine_val
       end
-    # Explicitly list this so that it won't pollute the output
-    rescue Elf::File::NotAnELF
-      return nil
-    rescue Exception => e
-      $stderr.puts "harvest.rb: #{e.message} - #{self.to_s}"
-    ensure
-      elf.close unless elf.nil?
     end
-  end
 
-  def so_files(recursive = true)
-    res = Set.new
-    children.each do |entry|
-      begin
-        case entry.ftype
-        when "directory"
-          res.merge entry.so_files if recursive
-        when "file"
-          res << entry.maybe_queue
+    def self.after_options
+      pg_params = {
+        :dbname   => @postgres_database,
+        :host     => @postgres_hostname,
+        :password => @postgres_password,
+        :port     => @postgres_port,
+        :user     => @postgres_username,
+      }
+
+      @suppression_files.each do |suppression|
+        File.open(suppression) do |file|
+          file.each_line do |line|
+            path, symbols = line.
+              gsub(/#\s.*/, '').
+              strip.
+              split(/\s+/, 2)
+
+            next unless path
+
+            if not symbols or symbols == ""
+              @total_suppressions << Regexp.new(path)
+            else
+              @partial_suppressions << [Regexp.new(path), Regexp.new(symbols)]
+            end
+          end
         end
-        # When using C-c to stop, well, stop.
-      rescue Interrupt
-        raise
-      rescue Exception => e
-        $stderr.puts "Ignoring #{entry} (#{e.message})"
-        next
       end
-    end
 
-    return res
-  end
-end
+      @total_suppressions = Regexp.union(@total_suppressions)
 
-if scan_ldpath
-  Elf::Utilities.system_library_path.each do |path|
-    begin
-      so_files.merge Pathname.new(path).so_files
-    rescue Errno::ENOENT
-      $stderr.puts "harvest.rb: No such file or directory - #{path}"
-      next
-    end
-  end
-end
+      @multimplementation_files.each do |multimplementation|
+        @multimplementations |= \
+        File.new(multimplementation).read.split(/\r?\n/).collect do |line|
+          implementation, paths = line.
+            gsub(/#\s.*/, '').
+            strip.
+            split(/\s+/, 2)
 
-if scan_path and ENV['PATH']
-  ENV['PATH'].split(":").each do |path|
-    begin
-      so_files.merge Pathname.new(path).so_files(false)
-    rescue Errno::ENOENT
-      $stderr.puts "harvest.rb: No such file or directory - #{path}"
-      next
-    end
-  end
-end
+          next if (implementation.nil? or paths.nil?)
 
-scan_directories.each do |path|
-  begin
-    so_files.merge Pathname.new(path).so_files(recursive_scan)
-  rescue Errno::ENOENT
-    $stderr.puts "harvest.rb: No such file or directory - #{path}"
-    next
-  end
-end
+          [ implementation, Regexp.new(paths) ]
+        end
+      end
+      @multimplementations.delete_if { |x| x.nil? }
+
+      @targets |=
+        ( !@no_scan_ldpath             ? Elf::Utilities.system_library_path : [] ) |
+        ( (@scan_path and ENV['PATH']) ? ENV['PATH'].split(":")             : [] )
+
+      @db = PGconn.open(pg_params)
+
+      @db.exec(<<EOF)
+BEGIN TRANSACTION;
+
+DROP TABLE IF EXISTS symbols, multimplementations, objects CASCADE;
+DROP LANGUAGE IF EXISTS plpgsql CASCADE;
+
+CREATE LANGUAGE plpgsql;
+CREATE TABLE objects (
+    id SERIAL PRIMARY KEY,
+    name VARCHAR(4096),
+    abi VARCHAR(255),
+    exported BOOLEAN,
+    UNIQUE(name, abi)
+);
+CREATE TABLE multimplementations (
+    id INTEGER REFERENCES objects(id) ON DELETE CASCADE,
+    path VARCHAR(4096),
+    UNIQUE(path)
+);
+CREATE TABLE symbols (
+    object INTEGER REFERENCES objects(id) ON DELETE CASCADE,
+    symbol TEXT,
+    PRIMARY KEY(object, symbol)
+);
+
+CREATE VIEW symbol_count AS
+   SELECT symbol, abi, COUNT(*) AS occurrences, BOOL_OR(objects.exported) AS exported
+     FROM symbols INNER JOIN objects ON symbols.object = objects.id GROUP BY symbol, abi;
+CREATE VIEW duplicate_symbols AS
+   SELECT * FROM symbol_count
+     WHERE occurrences > 1 AND exported = 't'
+     ORDER BY occurrences DESC, symbol ASC;
+
+PREPARE getinstances (text, text) AS
+   SELECT name FROM symbols INNER JOIN objects ON symbols.object = objects.id
+      WHERE symbol = $1 AND abi = $2 ORDER BY name;
+
+CREATE FUNCTION implementation (
+    p_implementation TEXT,
+    p_abi TEXT,
+    p_exported BOOLEAN,
+    OUT implementation_id INTEGER,
+    OUT created BOOLEAN
+) AS $$
+  BEGIN
+    SELECT INTO implementation_id id FROM objects
+      WHERE name = p_implementation AND abi = p_abi;
+
+    IF implementation_id IS NULL THEN
+      created := TRUE;
+
+      INSERT INTO objects(name, abi, exported)
+        VALUES(p_implementation, p_abi, p_exported);
+      SELECT INTO implementation_id
+        currval(pg_get_serial_sequence('objects', 'id'));
+    END IF;
+  END;
+$$ LANGUAGE 'plpgsql';
+
+CREATE FUNCTION multimplementation (
+  p_id INTEGER,
+  p_filepath TEXT
+) RETURNS BOOLEAN AS $$
+  BEGIN
+    INSERT INTO multimplementations (id, path) VALUES(p_id, p_filepath);
+    RETURN 't';
+  EXCEPTION
+    WHEN unique_violation THEN
+      RETURN 'f';
+  END;
+$$ LANGUAGE 'plpgsql';
+
+CREATE FUNCTION symbol (
+    p_object INTEGER,
+    p_symbol TEXT
+) RETURNS VOID AS '
+  BEGIN
+    INSERT INTO symbols VALUES(p_object, p_symbol);
+    RETURN;
+  EXCEPTION
+    WHEN unique_violation THEN
+      RETURN;
+  END;
+' LANGUAGE 'plpgsql';
+
+COMMIT;
+EOF
+    end
 
-# if there are explicit files listed in the standard input, scan those
-# right away.
-ARGV.each do |path|
-  so_files << Pathname.new(path).maybe_queue
-end
+    def self.db_exec(query)
+      @db.exec(query)
+    end
 
-# finally if none of the above matched, try checking for data on the
-# standard input
-if ARGV.size == 0 and not scan_path and scan_directories.size == 0
-  $stdin.each_line do |path|
-    so_files << Pathname.new(path.chomp("\n")).maybe_queue
-  end
-end
+    def self.analysis(filename)
+      return if filename =~ @total_suppressions
 
-so_files.delete(nil)
+      Elf::File.open(filename) do |elf|
+        unless ($machines.nil? or $machines.include?(elf.machine)) and
+            (elf.has_section?('.dynsym') and elf.has_section?('.dynstr') and
+             elf.has_section?('.dynamic')) and
+            (elf[".dynsym"].class == Elf::SymbolTable)
+          return
+        end
 
-db.exec("BEGIN TRANSACTION")
-val = 0
+        local_suppressions = Regexp.union((@partial_suppressions.dup.delete_if{ |s| filename.to_s !~ s[0] }).collect { |s| s[1] })
 
-begin
-  require 'progressbar'
+        name = filename
+        abi = "#{elf.elf_class} #{elf.abi} #{elf.machine}".gsub("'", "''")
 
-  pbar = ProgressBar.new("harvest", so_files.size)
-rescue LoadError, NameError
-end
+        @multimplementations.each do |implementation, paths|
+          # Get the full matchdata because we might need to get the matches.
+          match = paths.match(filename)
 
-so_files.each do |so|
-  local_suppressions = $partial_suppressions.dup.delete_if { |s| not so.to_s =~ s[0] }
+          next unless match
 
-  begin
-    Elf::File.open(so) do |elf|
-      name = so
-      abi = "#{elf.elf_class} #{elf.abi} #{elf.machine.to_s.gsub("'", "\\'" )}"
+          while implementation =~ /\$([0-9]+)/ do
+            match_idx = $1.to_i
+            replacement = match[match_idx]
+            replacement = "" if replacement.nil?
+            implementation = implementation.gsub("$#{match_idx}", replacement)
+          end
 
-      impid = nil
+          name = implementation
+          break
+        end
 
-      multimplementations.each do |implementation, paths|
-        # Get the full matchdata because we might need to get the matches.
-        match = paths.match(so)
+        shared = (filename != name) || (elf['.dynamic'].soname != nil)
 
-        next unless match
+        res = db_exec("SELECT * FROM implementation('#{name}', '#{abi}', '#{shared}')")
+        impid = res[0]["implementation_id"]
 
-        while implementation =~ /\$([0-9]+)/ do
-          match_idx = $1.to_i
-          replacement = match[match_idx]
-          replacement = "" if replacement.nil?
-          implementation = implementation.gsub("$#{match_idx}", replacement)
+        if filename != name
+          # If this is a collapsed multimplementation, add it to the list
+          res = db_exec("SELECT multimplementation(#{impid}, '#{filename}') AS created");
         end
 
-        name = implementation
-        db.exec("EXECUTE checkimplementation('#{implementation}', '#{abi}')").each do |row|
-          impid = row['id']
+        # skip over the file if we already visited it (either directly
+        # or as a multimplementation.
+        next if res[0]["created"] != "t"
+
+        query = ""
+        elf['.dynsym'].each do |sym|
+          begin
+            next if sym.idx == 0 or
+              sym.bind != Elf::Symbol::Binding::Global or
+              sym.section.nil? or
+              sym.value == 0 or
+              sym.section.is_a? Integer or
+              sym.section.name == '.init' or
+              sym.section.name == '.bss'
+
+            next if (sym.name =~ local_suppressions);
+
+            query << "SELECT symbol('#{impid}', '#{sym.name}@#{sym.version}');"
+          rescue Exception
+            $stderr.puts "Mangling symbol #{sym.name}"
+            raise
+          end
         end
-        break
-      end
-
-      shared = (so != name) || (elf['.dynamic'].soname != nil)
-
-      unless impid
-        val += 1
-        impid = val
-        
-        db.exec("EXECUTE newobject(#{impid}, '#{name}', '#{abi}', '#{shared}')")
+        db_exec("BEGIN TRANSACTION;" + query + "COMMIT;") unless query.empty?
       end
+    end
 
-      db.exec("EXECUTE newmulti(#{impid}, '#{so}')") if so != name
-        
-      elf['.dynsym'].each do |sym|
-        begin
-          next if sym.idx == 0 or
-            sym.bind != Elf::Symbol::Binding::Global or
-            sym.section.nil? or
-            sym.value == 0 or
-            sym.section.is_a? Integer or
-            sym.section.name == '.init' or
-            sym.section.name == '.bss'
-
-          skip = false
-          
-          local_suppressions.each do |supp|
-            if sym.name =~ supp[1]
-              skip = true
-              break
-            end
-          end
+    def self.results
+      db_exec(<<EOF)
+BEGIN TRANSACTION;
+CREATE INDEX objects_name ON objects(name);
+CREATE INDEX symbols_symbol ON symbols(symbol);
+COMMIT;
+EOF
 
-          next if skip or (db.exec("EXECUTE checkdupsymbol('#{impid}', '#{sym.name}@#{sym.version}')").num_tuples > 0)
+      outfile = File.new(@output, "w")
 
-          db.exec("EXECUTE newsymbol('#{impid}', '#{sym.name}@#{sym.version}')")
-          
-        rescue Exception
-          $stderr.puts "Mangling symbol #{sym.name}"
-          raise
+      db_exec("SELECT * FROM duplicate_symbols").each do |row|
+        outfile.puts "Symbol #{row['symbol']} (#{row['abi']}) present #{row['occurrences']} times"
+        db_exec( "EXECUTE getinstances ('#{row['symbol']}', '#{row['abi']}')" ).each do |path|
+          outfile.puts "  #{path['name']}"
         end
       end
     end
-  rescue Exception
-    $stderr.puts "Checking #{so}"
-    raise
   end
-
-  pbar.inc if pbar
 end
-
-db.exec("CREATE INDEX objects_name ON objects(name)")
-db.exec("CREATE INDEX symbols_symbol ON symbols(symbol)")
-db.exec("COMMIT")