X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=dupemerge;a=blobdiff_plain;f=faster-dupemerge;h=fe433f79283d5646cb5c3781aae75505f6710940;hp=ae9102c9e457ccc189bbca5baa9e19510d04e8c2;hb=2dbbadc3d2baeaf6ea7138ba88800499f0ce603a;hpb=8042def1c61ca50290975e6e22461179247251b4 diff --git a/faster-dupemerge b/faster-dupemerge index ae9102c..fe433f7 100755 --- a/faster-dupemerge +++ b/faster-dupemerge @@ -4,7 +4,7 @@ use Fcntl qw(:DEFAULT :flock); use File::Compare; use File::Temp; -# Copyright (C) 2003-2006 Zygo Blaxell +# Copyright (C) 2003-2010 Zygo Blaxell # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -87,6 +87,7 @@ my $collapse_timestamp = 0; my $collapse_zero = 0; my $skip_compares = 0; my $skip_hashes = 0; +my $progress = 0; my $verbose = 0; my $debug = 0; my $dry_run = 0; @@ -102,6 +103,7 @@ sub digest { if ($skip_hashes) { return "SKIPPING HASHES"; } else { + print STDERR 'H' if $progress; my $digest = &really_digest($filename); $hash_bytes += -s $filename; $hash_files++; @@ -132,24 +134,33 @@ hard links). --debug show all steps in duplication discovery process (implies --verbose) - --dry-run do not lock files or make changes to filesystem + --dry-run do not lock files or make changes to filesystem --find pass next options (up to --) to find command - --humane human-readable statistics (e.g. 1 048 576) + --humane human-readable statistics (e.g. 1 048 576) --lock FILE exit immediately (status 10) if unable to obtain a flock(LOCK_EX|LOCK_NB) on FILE - --lock-rm remove lock file at exit + --lock-rm remove lock file at exit + + --progress output single-character progress indicators: + C - compare + H - hash + L - link(2) + R - rename(2) + S, s - lstat(2) (see source for details) + U - unlink(2) + . - all inodes with similar attributes done --sort pass next options (up to --) to sort command --timestamps mtime may be different for identical files - --skip-compare skip byte-by-byte file comparisons + --skip-compare skip byte-by-byte file comparisons - --skip-hash skip calculation of hash function on files + --skip-hash skip calculation of hash function on files --trust old name for --skip-compare (trust the hash function) @@ -172,6 +183,8 @@ while ($#ARGV >= 0) { $skip_compares = 1; } elsif ($arg eq '--skip-hash') { $skip_hashes = 1; + } elsif ($arg eq '--progress') { + $progress = 1; } elsif ($arg eq '--verbose') { $verbose = 1; } elsif ($arg eq '--lock-rm') { @@ -238,7 +251,7 @@ my @find_command = ('find', @directories, @extra_find_opts, '-type', 'f'); my $printf_string = '%s ' . ($collapse_access ? '0 0 0 ' : '%U %G %m ') . ($collapse_timestamp ? '0 ' : '%T@ ') . - '%i %p\0'; + '%D %i %p\0'; push(@find_command, '!', '-empty') unless $collapse_zero; push(@find_command, '-printf', $printf_string); @@ -269,6 +282,7 @@ sub link_files { my $quoted_from = tick_quote($from); my $quoted_to = tick_quote($to); + print STDERR "\n" if $progress; print STDERR "ln -f $quoted_from $quoted_to\n"; return if $dry_run; @@ -279,15 +293,25 @@ sub link_files { $inode_base =~ s:^.*/::os; my $tmp_to = File::Temp::tempnam($inode_dir, ".$inode_base."); print STDERR "\tlink: $from -> $tmp_to\n" if $debug; + print STDERR 'L' if $progress; link($from, $tmp_to) or die "link: $from -> $tmp_to: $!"; print STDERR "\trename: $tmp_to -> $to\n" if $debug; + print STDERR 'R' if $progress; unless (rename($tmp_to, $to)) { my $saved_bang = $!; + print STDERR 'U' if $progress; unlink($tmp_to) or warn "unlink: $tmp_to: $!"; # Try, possibly in vain, to clean up die "rename: $tmp_to -> $from: $saved_bang"; } } +# Convert $dev,$ino into a single string where lexical and numeric orderings are equivalent +sub format_inode ($$) { + my ($dev, $ino) = @_; + # 64 bits ought to be enough for everybody! + return sprintf('%016x:%016x', $dev, $ino); +} + # Process all known files so far. sub merge_files { $merges_attempted++; @@ -305,21 +329,22 @@ sub merge_files { } print STDERR "Merging...\n" if $debug; - foreach my $candidate (@candidate_list) { + foreach my $candidate (sort @candidate_list) { print STDERR "\tDigesting candidate $candidate\n" if $debug; my $ok = 0; my $digest; hash_file: - foreach my $filename (keys(%{$inode_to_file_name{$candidate}})) { + foreach my $filename (sort keys(%{$inode_to_file_name{$candidate}})) { print STDERR "\t\tDigesting file $filename\n" if $debug; if ((-l $filename) || ! -f _) { warn "Bogon file " . tick_quote($filename); - $surprises++; + $input_bogons++; + delete $inode_to_file_name{$candidate}->{$filename}; next; } - eval { + eval { $digest = digest($filename); }; if ($@) { @@ -335,7 +360,7 @@ hash_file: my $incumbent_list = ($hash_to_inode{$digest} ||= []); my $incumbent_matched = 0; - for my $incumbent (@$incumbent_list) { + for my $incumbent (sort @$incumbent_list) { print STDERR "\t\tInodes $incumbent and $candidate have same hash\n" if $debug; my $finished = 0; @@ -343,14 +368,15 @@ hash_file: link_start: until ($finished) { - my @incumbent_names = keys(%{$inode_to_file_name{$incumbent}}); - my @candidate_names = keys(%{$inode_to_file_name{$candidate}}); + my @incumbent_names = sort keys(%{$inode_to_file_name{$incumbent}}); + my @candidate_names = sort keys(%{$inode_to_file_name{$candidate}}); print STDERR "\t\tLinks to $incumbent:", join("\n\t\t\t", '', @incumbent_names), "\n" if $debug; print STDERR "\t\tLinks to $candidate:", join("\n\t\t\t", '', @candidate_names), "\n" if $debug; incumbent_file: foreach my $incumbent_file (@incumbent_names) { + print STDERR 'S' if $progress; my ($incumbent_dev,$incumbent_ino,$incumbent_mode,$incumbent_nlink,$incumbent_uid,$incumbent_gid,$incumbent_rdev,$incumbent_size,$incumbent_atime,$incumbent_mtime,$incumbent_ctime,$incumbent_blksize,$incumbent_blocks) = lstat($incumbent_file); print STDERR "\t\tINCUMBENT dev=$incumbent_dev ino=$incumbent_ino mode=$incumbent_mode nlink=$incumbent_nlink uid=$incumbent_uid gid=$incumbent_gid rdev=$incumbent_rdev size=$incumbent_size atime=$incumbent_atime mtime=$incumbent_mtime ctime=$incumbent_ctime blksize=$incumbent_blksize blocks=$incumbent_blocks _=$incumbent_file\n" if $debug; @@ -360,8 +386,8 @@ incumbent_file: next incumbent_file; } - if ($incumbent_ino != $incumbent) { - warn "$incumbent_file: expected inode $incumbent, found $incumbent_ino"; + if (format_inode($incumbent_dev, $incumbent_ino) ne $incumbent) { + warn "$incumbent_file: expected inode $incumbent, found $incumbent_dev:$incumbent_ino"; $surprises++; next incumbent_file; } @@ -371,6 +397,7 @@ incumbent_file: candidate_file: foreach my $candidate_file (@candidate_names) { + print STDERR 's' if $progress; my ($candidate_dev,$candidate_ino,$candidate_mode,$candidate_nlink,$candidate_uid,$candidate_gid,$candidate_rdev,$candidate_size,$candidate_atime,$candidate_mtime,$candidate_ctime,$candidate_blksize,$candidate_blocks) = lstat($candidate_file); print STDERR "\t\t\tCANDIDATE dev=$candidate_dev ino=$candidate_ino mode=$candidate_mode nlink=$candidate_nlink uid=$candidate_uid gid=$candidate_gid rdev=$candidate_rdev size=$candidate_size atime=$candidate_atime mtime=$candidate_mtime ctime=$candidate_ctime blksize=$candidate_blksize blocks=$candidate_blocks _=$candidate_file\n" if $debug; @@ -380,8 +407,8 @@ candidate_file: next candidate_file; } - if ($candidate_ino != $candidate) { - warn "$candidate_file: expected inode $candidate, found $candidate_ino"; + if (format_inode($candidate_dev, $candidate_ino) ne $candidate) { + warn "$candidate_file: expected inode $candidate, found $candidate_dev:$candidate_ino"; $surprises++; next candidate_file; } @@ -402,6 +429,7 @@ candidate_file: my $quoted_incumbent_file = tick_quote($incumbent_file); my $quoted_candidate_file = tick_quote($candidate_file); print STDERR "cmp $quoted_incumbent_file $quoted_candidate_file\n" if $debug; + print STDERR 'C' if $progress; if (compare($incumbent_file, $candidate_file)) { $compare_differences++; $identical = 0; @@ -443,6 +471,12 @@ candidate_file: my $link_done = 0; my ($from_file, $to_file, $from_inode, $to_inode, $from_nlink, $to_nlink); + + # If the candidate has more links than incumbent, replace incumbent with candidate. + # If the incumbent has more links than candidate, replace candidate with incumbent. + # If the link counts are equal, we saw incumbent first, so keep the incumbent. + # "We saw incumbent first" is significant because we explicitly sort the inodes. + # Thank Johannes Niess for this idea. if ($candidate_nlink > $incumbent_nlink) { $from_file = $candidate_file; $to_file = $incumbent_file; @@ -529,6 +563,7 @@ candidate_file: delete $inode_to_file_name{$candidate}; } } + print STDERR '.' if $progress; end_merge: @@ -537,16 +572,12 @@ end_merge: } while () { - my ($weak_key, $inode, $name) = m/^(\d+ \d+ \d+ \d+ -?\d+) (\d+) (.+)\0$/so; + my ($weak_key, $dev, $ino, $name) = m/^(\d+ \d+ \d+ \d+ -?[\d.]+) (\d+) (\d+) (.+)\0$/so; die "read error: $!\nLast input line was '$_'" unless defined($name); - print STDERR "weak_key=$weak_key inode=$inode name=$name\n" if $debug; + my $inode = format_inode($dev, $ino); - unless (! (-l $name) && (-f _)) { - warn "Bogon file " . tick_quote($name); - $input_bogons++; - next; - } + print STDERR "weak_key=$weak_key inode=$inode name=$name\n" if $debug; $input_links++; merge_files if $weak_key ne $current_key; @@ -606,6 +637,7 @@ if ($humane) { $stats_blob =~ s/([^\n]*\n[^\n]*? )(\s+)( [^\n]*\n)/$1 . ('.' x length($2)) . $3/oemg; +print STDERR "\n" if $progress; print STDERR $stats_blob; exit(0);