ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/IO-AIO/bin/treescan
(Generate patch)

Comparing IO-AIO/bin/treescan (file contents):
Revision 1.4 by root, Mon Aug 23 19:19:13 2010 UTC vs.
Revision 1.12 by root, Tue Oct 4 18:25:02 2011 UTC

… …
3# inspired by treescan by Jamie Lokier <jamie@imbolc.ucc.ie> 3# inspired by treescan by Jamie Lokier <jamie@imbolc.ucc.ie>
4# about 40% faster than the original version (on my fs and raid :) 4# about 40% faster than the original version (on my fs and raid :)
5 5
6use strict; 6use strict;
7use Getopt::Long; 7use Getopt::Long;
8use Time::HiRes ();
8use IO::AIO; 9use IO::AIO;
9 10
10our $VERSION = $IO::AIO::VERSION; 11our $VERSION = $IO::AIO::VERSION;
11 12
12Getopt::Long::Configure ("bundling", "no_ignore_case", "require_order", "auto_help", "auto_version"); 13Getopt::Long::Configure ("bundling", "no_ignore_case", "require_order", "auto_help", "auto_version");
13 14
14my ($opt_silent, $opt_print0, $opt_stat, $opt_nodirs, $opt_nofiles); 15my ($opt_silent, $opt_print0, $opt_stat, $opt_nodirs,
16 $opt_nofiles, $opt_grep, $opt_progress);
15 17
16GetOptions 18GetOptions
17 "quiet|q" => \$opt_silent, 19 "quiet|q" => \$opt_silent,
18 "print0|0" => \$opt_print0, 20 "print0|0" => \$opt_print0,
19 "stat|s" => \$opt_stat, 21 "stat|s" => \$opt_stat,
20 "dirs|d" => \$opt_nofiles, 22 "dirs|d" => \$opt_nofiles,
21 "files|f" => \$opt_nodirs, 23 "files|f" => \$opt_nodirs,
24 "grep|g=s" => \$opt_grep,
25 "progress|p" => \$opt_progress,
22 or die "Usage: try $0 --help"; 26 or die "Usage: try $0 --help";
23 27
24@ARGV = "." unless @ARGV; 28@ARGV = "." unless @ARGV;
25 29
30$opt_grep &&= qr{$opt_grep}s;
31
32my ($n_dirs, $n_files, $n_stats) = (0, 0, 0);
33my $n_last;
34my $n_start = Time::HiRes::time;
35
26sub printfn { 36sub printfn {
27 my ($prefix, $files, $suffix) = @_; 37 my ($prefix, $files, $suffix) = @_;
28 38
39 if ($opt_grep) {
40 @$files = grep "$prefix$_" =~ $opt_grep, @$files;
41 }
42
29 if ($opt_print0) { 43 if ($opt_print0) {
30 print map "$prefix$_$suffix\0", @$files; 44 print map "$prefix$_$suffix\0", @$files;
31 } elsif (!$opt_silent) { 45 } elsif (!$opt_silent) {
32 print map "$prefix$_$suffix\n", @$files; 46 print map "$prefix$_$suffix\n", @$files;
33 } 47 }
… …
36sub scan { 50sub scan {
37 my ($path) = @_; 51 my ($path) = @_;
38 52
39 $path .= "/"; 53 $path .= "/";
40 54
55 IO::AIO::poll_cb;
56
57 if ($opt_progress and $n_last + 1 < Time::HiRes::time) {
58 $n_last = Time::HiRes::time;
59 printf STDERR "\r%d dirs %d files %d stats %g stats/s ", $n_dirs, $n_files, $n_stats, $n_stats / ($n_last - $n_start)
60 if $opt_progress;
61 }
62
41 aioreq_pri -1; 63 aioreq_pri -1;
64 ++$n_dirs;
42 aio_scandir $path, 8, sub { 65 aio_scandir $path, 8, sub {
43 my ($dirs, $files) = @_; 66 my ($dirs, $files) = @_
67 or warn "$path: $!\n";
44 68
45 printfn "", [$path] unless $opt_nodirs; 69 printfn "", [$path] unless $opt_nodirs;
46 printfn $path, $files unless $opt_nofiles; 70 printfn $path, $files unless $opt_nofiles;
47 71
72 $n_files += @$files;
73
48 if ($opt_stat) { 74 if ($opt_stat) {
75 aio_wd $path, sub {
76 my $wd = shift;
77
49 aio_lstat "$path$_" for @$files; 78 aio_lstat [$wd, $_] for @$files;
79 $n_stats += @$files;
80 };
50 } 81 }
51 82
52 &scan ("$path$_") for @$dirs; 83 &scan ("$path$_") for @$dirs;
53 }; 84 };
54} 85}
55 86
56IO::AIO::max_outstanding 64; 87IO::AIO::max_outstanding 100; # two fds per directory, so limit accordingly
57IO::AIO::min_parallel 32; 88IO::AIO::min_parallel 20;
58 89
59for my $seed (@ARGV) { 90for my $seed (@ARGV) {
60 $seed =~ s/\/+$//; 91 $seed =~ s/\/+$//;
92 ++$n_stats;
61 aio_lstat "$seed/.", sub { 93 aio_lstat "$seed/.", sub {
62 if ($_[0]) { 94 if ($_[0]) {
63 print STDERR "$seed: $!\n"; 95 print STDERR "$seed: $!\n";
64 } elsif (-d _) { 96 } elsif (-d _) {
65 scan $seed; 97 scan $seed;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines