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.6 by root, Tue Sep 27 01:43:03 2011 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, $opt_grep); 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,
22 "grep|g=s" => \$opt_grep, 24 "grep|g=s" => \$opt_grep,
25 "progress|p" => \$opt_progress,
23 or die "Usage: try $0 --help"; 26 or die "Usage: try $0 --help";
24 27
25@ARGV = "." unless @ARGV; 28@ARGV = "." unless @ARGV;
26 29
27$opt_grep &&= qr{$opt_grep}s; 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;
28 35
29sub printfn { 36sub printfn {
30 my ($prefix, $files, $suffix) = @_; 37 my ($prefix, $files, $suffix) = @_;
31 38
32 if ($opt_grep) { 39 if ($opt_grep) {
… …
43sub scan { 50sub scan {
44 my ($path) = @_; 51 my ($path) = @_;
45 52
46 $path .= "/"; 53 $path .= "/";
47 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
48 aioreq_pri -1; 63 aioreq_pri -1;
64 ++$n_dirs;
49 aio_scandir $path, 8, sub { 65 aio_scandir $path, 8, sub {
50 my ($dirs, $files) = @_; 66 my ($dirs, $files) = @_
67 or warn "$path: $!\n";
51 68
52 printfn "", [$path] unless $opt_nodirs; 69 printfn "", [$path] unless $opt_nodirs;
53 printfn $path, $files unless $opt_nofiles; 70 printfn $path, $files unless $opt_nofiles;
71
72 $n_files += @$files;
54 73
55 if ($opt_stat) { 74 if ($opt_stat) {
56 aio_wd $path, sub { 75 aio_wd $path, sub {
57 my $wd = shift; 76 my $wd = shift;
58 77
59 aio_lstat [$wd, $_] for @$files; 78 aio_lstat [$wd, $_] for @$files;
79 $n_stats += @$files;
60 }; 80 };
61 } 81 }
62 82
63 &scan ("$path$_") for @$dirs; 83 &scan ("$path$_") for @$dirs;
64 }; 84 };
65} 85}
66 86
67IO::AIO::max_outstanding 64; 87IO::AIO::max_outstanding 100; # two fds per directory, so limit accordingly
68IO::AIO::min_parallel 32; 88IO::AIO::min_parallel 20;
69 89
70for my $seed (@ARGV) { 90for my $seed (@ARGV) {
71 $seed =~ s/\/+$//; 91 $seed =~ s/\/+$//;
92 ++$n_stats;
72 aio_lstat "$seed/.", sub { 93 aio_lstat "$seed/.", sub {
73 if ($_[0]) { 94 if ($_[0]) {
74 print STDERR "$seed: $!\n"; 95 print STDERR "$seed: $!\n";
75 } elsif (-d _) { 96 } elsif (-d _) {
76 scan $seed; 97 scan $seed;

Diff Legend

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