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

Comparing IO-AIO/AIO.pm (file contents):
Revision 1.131 by root, Tue Jul 15 10:42:26 2008 UTC vs.
Revision 1.148 by root, Sat Jun 6 17:25:13 2009 UTC

 use strict 'vars';
 use base 'Exporter';
 BEGIN {
-   our $VERSION = '3.06';
+   our $VERSION = '3.19';
    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_stat aio_lstat aio_unlink aio_rmdir aio_readdir aio_readdirx
                      aio_scandir aio_symlink aio_readlink aio_sync aio_fsync
-                     aio_fdatasync aio_pathsync aio_readahead
+                     aio_fdatasync aio_sync_file_range aio_pathsync aio_readahead
                      aio_rename aio_link aio_move aio_copy aio_group
                      aio_nop aio_mknod aio_load aio_rmtree aio_mkdir aio_chown
                      aio_chmod aio_utime aio_truncate);
    our @EXPORT = (@AIO_REQ, qw(aioreq_pri aioreq_nice));
    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);
+   push @AIO_REQ, qw(aio_busy); # not exported
    @IO::AIO::GRP::ISA = 'IO::AIO::REQ';
    require XSLoader;
    XSLoader::load ("IO::AIO", $VERSION);
 }
 All the C<aio_*> calls are more or less thin wrappers around the syscall
 with the same name (sans C<aio_>). The arguments are similar or identical,
 and they all accept an additional (and optional) C<$callback> argument
 which must be a code reference. This code reference will get called with
 the syscall return code (e.g. most syscalls return C<-1> on error, unlike
-perl, which usually delivers "false") as it's sole argument when the given
+perl, which usually delivers "false") as its sole argument after the given
 syscall has been executed asynchronously.
 All functions expecting a filehandle keep a copy of the filehandle
 internally until the request has finished.
 your pathnames to the locale (or other) encoding in effect in the user
 environment, d) use Glib::filename_from_unicode on unicode filenames or e)
 use something else to ensure your scalar has the correct contents.
 This works, btw. independent of the internal UTF-8 bit, which IO::AIO
-handles correctly wether it is set or not.
+handles correctly whether it is set or not.
 =over 4
 =item $prev_pri = aioreq_pri [$pri]
 =item aio_read  $fh,$offset,$length, $data,$dataoffset, $callback->($retval)
 =item aio_write $fh,$offset,$length, $data,$dataoffset, $callback->($retval)
-Reads or writes C<$length> bytes from the specified C<$fh> and C<$offset>
+Reads or writes C<$length> bytes from or to the specified C<$fh> and
-into the scalar given by C<$data> and offset C<$dataoffset> and calls the
+C<$offset> into the scalar given by C<$data> and offset C<$dataoffset>
-callback without the actual number of bytes read (or -1 on error, just
+and calls the callback without the actual number of bytes read (or -1 on
-like the syscall).
+error, just like the syscall).
+C<aio_read> will, like C<sysread>, shrink or grow the C<$data> scalar to
+offset plus the actual number of bytes read.
 If C<$offset> is undefined, then the current file descriptor offset will
 be used (and updated), otherwise the file descriptor offset will not be
 changed by these calls.
-If C<$length> is undefined in C<aio_write>, use the remaining length of C<$data>.
+If C<$length> is undefined in C<aio_write>, use the remaining length of
+C<$data>.
 If C<$dataoffset> is less than zero, it will be counted from the end of
 C<$data>.
 The C<$data> scalar I<MUST NOT> be modified in any way while the request
 Unlike the POSIX call of the same name, C<aio_readdir> reads an entire
 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
+The callback is passed a single argument which is either C<undef> or an
-with the filenames.
+array-ref with the filenames.
+=item aio_readdirx $pathname, $flags, $callback->($entries, $flags)
+Quite similar to C<aio_readdir>, but the C<$flags> argument allows to tune
+behaviour and output format. In case of an error, C<$entries> will be
+C<undef>.
+The flags are a combination of the following constants, ORed together (the
+flags will also be passed to the callback, possibly modified):
+=over 4
+=item AIO::READDIR_DENTS
+When this flag is off, then the callback gets an arrayref with of names
+only (as with C<aio_readdir>), otherwise it gets an arrayref with
+C<[$name, $inode, $type]> arrayrefs, each describing a single directory
+entry in more detail.
+C<$name> is the name of the entry.
+C<$inode> is the inode number (which might not be exact on systems with 64
+bit inode numbers and 32 bit perls). On systems that do not deliver the
+inode information, this will always be zero.
+C<$type> is one of the C<AIO::DT_xxx> constants:
+C<AIO::DT_UNKNOWN>, C<AIO::DT_FIFO>, C<AIO::DT_CHR>, C<AIO::DT_DIR>,
+C<AIO::DT_BLK>, C<AIO::DT_REG>, C<AIO::DT_LNK>, C<AIO::DT_SOCK>,
+C<AIO::DT_WHT>.
+C<AIO::DT_UNKNOWN> means just that: readdir does not know. If you need to
+know, you have to run stat yourself. Also, for speed reasons, the C<$type>
+scalars are read-only: you can not modify them.
+=item AIO::READDIR_DIRS_FIRST
+When this flag is set, then the names will be returned in an order where
+likely directories come first. This is useful when you need to quickly
+find directories, or you want to find all directories while avoiding to
+stat() each entry.
+=item AIO::READDIR_STAT_ORDER
+When this flag is set, then the names will be returned in an order
+suitable for stat()'ing each one. That is, when you plan to stat()
+all files in the given directory, then the returned order will likely
+be fastest.
+If both this flag and IO::READDIR_DIRS_FIRST are specified, then the
+likely dirs come first, resulting in a less optimal stat order.
+=item AIO::READDIR_FOUND_UNKNOWN
+This flag should not be set when calling C<aio_readdirx>. Instead, it
+is being set by C<aio_readdirx>, when any of the C<$type>'s found were
+C<AIO::DT_UNKNOWN>. The absense of this flag therefore indicates that all
+C<$type>'s are known, which can be used to speed up some algorithms.
+=back
 =item aio_load $path, $data, $callback->($status)
 This is a composite request that tries to fully load the given file into
 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
 the C<0> (error) or C<-1> ok.
-This is a composite request that it creates the destination file with
+This is a composite request that creates the destination file with
 mode 0200 and copies the contents of the source file into it using
 C<aio_sendfile>, followed by restoring atime, mtime, access mode and
 uid/gid, in that order.
 If an error occurs, the partial destination file will be unlinked, if
    my $grp = aio_group $cb;
    aioreq_pri $pri;
    add $grp aio_open $src, O_RDONLY, 0, sub {
       if (my $src_fh = $_[0]) {
-         my @stat = stat $src_fh;
+         my @stat = stat $src_fh; # hmm, might bock over nfs?
          aioreq_pri $pri;
          add $grp aio_open $dst, O_CREAT | O_WRONLY | O_TRUNC, 0200, sub {
             if (my $dst_fh = $_[0]) {
                aioreq_pri $pri;
                add $grp aio_sendfile $dst_fh, $src_fh, 0, $stat[7], sub {
                   if ($_[0] == $stat[7]) {
                      $grp->result (0);
                      close $src_fh;
-                     # those should not normally block. should. should.
+                     my $ch = sub {
-                     utime $stat[8], $stat[9], $dst;
+                        aioreq_pri $pri;
-                     chmod $stat[2] & 07777, $dst_fh;
+                        add $grp aio_chmod $dst_fh, $stat[2] & 07777, sub {
-                     chown $stat[4], $stat[5], $dst_fh;
+                           aioreq_pri $pri;
+                           add $grp aio_chown $dst_fh, $stat[4], $stat[5], sub {
+                              aioreq_pri $pri;
+                              add $grp aio_close $dst_fh;
+                           }
+                        };
+                     };
                      aioreq_pri $pri;
-                     add $grp aio_close $dst_fh;
+                     add $grp aio_utime $dst_fh, $stat[8], $stat[9], sub {
+                        if ($_[0] < 0 && $! == ENOSYS) {
+                           aioreq_pri $pri;
+                           add $grp aio_utime $dst, $stat[8], $stat[9], $ch;
+                        } else {
+                           $ch->();
+                        }
+                     };
                   } else {
                      $grp->result (-1);
                      close $src_fh;
                      close $dst_fh;
 Try to move the I<file> (directories not supported as either source or
 destination) from C<$srcpath> to C<$dstpath> and call the callback with
 the C<0> (error) or C<-1> ok.
-This is a composite request that tries to rename(2) the file first. If
+This is a composite request that tries to rename(2) the file first; if
-rename files with C<EXDEV>, it copies the file with C<aio_copy> and, if
+rename fails with C<EXDEV>, it copies the file with C<aio_copy> and, if
-that is successful, unlinking the C<$srcpath>.
+that is successful, unlinks the C<$srcpath>.
 =cut
 sub aio_move($$;$) {
    my ($src, $dst, $cb) = @_;
       my $now = time;
       my $hash1 = join ":", (stat _)[0,1,3,7,9];
       # read the directory entries
       aioreq_pri $pri;
-      add $grp aio_readdir $path, sub {
+      add $grp aio_readdirx $path, READDIR_DIRS_FIRST, sub {
          my $entries = shift
             or return $grp->result ();
          # stat the dir another time
          aioreq_pri $pri;
 callback with the fdatasync result code.
 If this call isn't available because your OS lacks it or it couldn't be
 detected, it will be emulated by calling C<fsync> instead.
+=item aio_sync_file_range $fh, $offset, $nbytes, $flags, $callback->($status)
+Sync the data portion of the file specified by C<$offset> and C<$length>
+to disk (but NOT the metadata), by calling the Linux-specific
+sync_file_range call. If sync_file_range is not available or it returns
+ENOSYS, then fdatasync or fsync is being substituted.
+C<$flags> can be a combination of C<IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE>,
+C<IO::AIO::SYNC_FILE_RANGE_WRITE> and
+C<IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER>: refer to the sync_file_range
+manpage for details.
 =item aio_pathsync $path, $callback->($status)
 This request tries to open, fsync and close the given path. This is a
-composite request intended tosync directories after directory operations
+composite request intended to sync directories after directory operations
 (E.g. rename). This might not work on all operating systems or have any
 specific effect, but usually it makes sure that directory changes get
 written to disc. It works for anything that can be opened for read-only,
 not just directories.
 Their lifetime, simplified, looks like this: when they are empty, they
 will finish very quickly. If they contain only requests that are in the
 C<done> state, they will also finish. Otherwise they will continue to
 exist.
-That means after creating a group you have some time to add requests. And
+That means after creating a group you have some time to add requests
-in the callbacks of those requests, you can add further requests to the
+(precisely before the callback has been invoked, which is only done within
-group. And only when all those requests have finished will the the group
+the C<poll_cb>). And in the callbacks of those requests, you can add
-itself finish.
+further requests to the group. And only when all those requests have
+finished will the the group itself finish.
 =over 4
 =item add $grp ...
 =item feed $grp $callback->($grp)
 Sets a feeder/generator on this group: every group can have an attached
 generator that generates requests if idle. The idea behind this is that,
 although you could just queue as many requests as you want in a group,
-this might starve other requests for a potentially long time.  For
+this might starve other requests for a potentially long time. For example,
-example, C<aio_scandir> might generate hundreds of thousands C<aio_stat>
+C<aio_scandir> might generate hundreds of thousands C<aio_stat> requests,
-requests, delaying any later requests for a long time.
+delaying any later requests for a long time.
 To avoid this, and allow incremental generation of requests, you can
 instead a group and set a feeder on it that generates those requests. The
 feed callback will be called whenever there are few enough (see C<limit>,
 below) requests active in the group itself and is expected to queue more
 not impose any limits).
 If the feed does not queue more requests when called, it will be
 automatically removed from the group.
-If the feed limit is C<0>, it will be set to C<2> automatically.
+If the feed limit is C<0> when this method is called, it will be set to
+C<2> automatically.
 Example:
    # stat all files in @files, but only ever use four aio requests concurrently:
 Sets the feeder limit for the group: The feeder will be called whenever
 the group contains less than this many requests.
 Setting the limit to C<0> will pause the feeding process.
+The default value for the limit is C<0>, but note that setting a feeder
+automatically bumps it up to C<2>.
 =back
 =head2 SUPPORT FUNCTIONS

Diff Legend

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

Comparing IO-AIO/AIO.pm (file contents): Revision 1.131 by root, Tue Jul 15 10:42:26 2008 UTC vs. Revision 1.148 by root, Sat Jun 6 17:25:13 2009 UTC

Diff Legend

Comparing IO-AIO/AIO.pm (file contents):
Revision 1.131 by root, Tue Jul 15 10:42:26 2008 UTC vs.
Revision 1.148 by root, Sat Jun 6 17:25:13 2009 UTC