[ViewVC] Diff of: cvs/IO-AIO/AIO.pm

Comparing IO-AIO/AIO.pm (file contents):
Revision 1.96 by root, Fri Dec 22 04:05:50 2006 UTC vs.
Revision 1.105 by root, Sun Mar 25 00:20:27 2007 UTC

 use strict 'vars';
 use base 'Exporter';
 BEGIN {
-   our $VERSION = '2.21';
+   our $VERSION = '2.33';
    our @AIO_REQ = qw(aio_sendfile aio_read aio_write aio_open aio_close aio_stat
                      aio_lstat aio_unlink aio_rmdir aio_readdir aio_scandir aio_symlink
                      aio_readlink aio_fsync aio_fdatasync aio_readahead aio_rename aio_link
-                     aio_move aio_copy aio_group aio_nop aio_mknod);
+                     aio_move aio_copy aio_group aio_nop aio_mknod aio_load aio_rmtree aio_mkdir);
    our @EXPORT = (@AIO_REQ, qw(aioreq_pri aioreq_nice aio_block));
    our @EXPORT_OK = qw(poll_fileno poll_cb poll_wait flush
                        min_parallel max_parallel max_idle
                        nreqs nready npending nthreads
                        max_poll_time max_poll_reqs);
 list. They are the same as used by C<sysopen>.
 Likewise, C<$mode> specifies the mode of the newly created file, if it
 didn't exist and C<O_CREAT> has been given, just like perl's C<sysopen>,
 except that it is mandatory (i.e. use C<0> if you don't create new files,
-and C<0666> or C<0777> if you do).
+and C<0666> or C<0777> if you do). Note that the C<$mode> will be modified
+by the umask in effect then the request is being executed, so better never
+change the umask.
 Example:
    aio_open "/etc/passwd", O_RDONLY, 0, sub {
       if ($_[0]) {
 =item aio_rename $srcpath, $dstpath, $callback->($status)
 Asynchronously rename the object at C<$srcpath> to C<$dstpath>, just as
 rename(2) and call the callback with the result code.
+=item aio_mkdir $pathname, $mode, $callback->($status)
+Asynchronously mkdir (create) a directory and call the callback with
+the result code. C<$mode> will be modified by the umask at the time the
+request is executed, so do not change your umask.
 =item aio_rmdir $pathname, $callback->($status)
 Asynchronously rmdir (delete) a directory and call the callback with the
 result code.
 directory (i.e. opendir + readdir + closedir). The entries will not be
 sorted, and will B<NOT> include the C<.> and C<..> entries.
 The callback a single argument which is either C<undef> or an array-ref
 with the filenames.
+=item aio_load $path, $data, $callback->($status)
+This is a composite request that tries to fully load the given file into
+memory. Status is the same as with aio_read.
+=cut
+sub aio_load($$;$) {
+   aio_block {
+      my ($path, undef, $cb) = @_;
+      my $data = \$_[1];
+      my $pri = aioreq_pri;
+      my $grp = aio_group $cb;
+      aioreq_pri $pri;
+      add $grp aio_open $path, O_RDONLY, 0, sub {
+         my $fh = shift
+            or return $grp->result (-1);
+         aioreq_pri $pri;
+         add $grp aio_read $fh, 0, (-s $fh), $$data, 0, sub {
+            $grp->result ($_[0]);
+         };
+      };
+      $grp
+   }
+}
 =item aio_copy $srcpath, $dstpath, $callback->($status)
 Try to copy the I<file> (directories not supported as either source or
 destination) from C<$srcpath> to C<$dstpath> and call the callback with
 as those tend to return 0 or 1 as link counts, which disables the
 directory counting heuristic.
 =cut
-sub aio_scandir($$$) {
+sub aio_scandir($$;$) {
    aio_block {
       my ($path, $maxreq, $cb) = @_;
       my $pri = aioreq_pri;
       $grp
    }
 }
+=item aio_rmtree $path, $callback->($status)
+Delete a directory tree starting (and including) C<$path>, return the
+status of the final C<rmdir> only.  This is a composite request that
+uses C<aio_scandir> to recurse into and rmdir directories, and unlink
+everything else.
+=cut
+sub aio_rmtree;
+sub aio_rmtree($;$) {
+   aio_block {
+      my ($path, $cb) = @_;
+      my $pri = aioreq_pri;
+      my $grp = aio_group $cb;
+      aioreq_pri $pri;
+      add $grp aio_scandir $path, 0, sub {
+         my ($dirs, $nondirs) = @_;
+         my $dirgrp = aio_group sub {
+            add $grp aio_rmdir $path, sub {
+               $grp->result ($_[0]);
+            };
+         };
+         (aioreq_pri $pri), add $dirgrp aio_rmtree "$path/$_" for @$dirs;
+         (aioreq_pri $pri), add $dirgrp aio_unlink "$path/$_" for @$nondirs;
+         add $grp $dirgrp;
+      };
+      $grp
+   }
+}
 =item aio_fsync $fh, $callback->($status)
 Asynchronously call fsync on the given filehandle and call the callback
 with the fsync result code.
 Strictly equivalent to:
    IO::AIO::poll_wait, IO::AIO::poll_cb
       while IO::AIO::nreqs;
+=back
 =head3 CONTROLLING THE NUMBER OF THREADS
+=over
 =item IO::AIO::min_parallel $nthreads
 Set the minimum number of AIO threads to C<$nthreads>. The current
 default is C<8>, which means eight asynchronous operations can execute
 You can still queue as many requests as you want. Therefore,
 C<max_oustsanding> is mainly useful in simple scripts (with low values) or
 as a stop gap to shield against fatal memory overflow (with large values).
+=back
 =head3 STATISTICAL INFORMATION
+=over
 =item IO::AIO::nreqs
 Returns the number of requests currently in the ready, execute or pending
 states (i.e. for which their callback has not been invoked yet).

Diff Legend

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

Comparing IO-AIO/AIO.pm (file contents): Revision 1.96 by root, Fri Dec 22 04:05:50 2006 UTC vs. Revision 1.105 by root, Sun Mar 25 00:20:27 2007 UTC

Diff Legend

Comparing IO-AIO/AIO.pm (file contents):
Revision 1.96 by root, Fri Dec 22 04:05:50 2006 UTC vs.
Revision 1.105 by root, Sun Mar 25 00:20:27 2007 UTC