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

Comparing IO-AIO/AIO.pm (file contents):
Revision 1.111 by root, Mon Aug 13 12:08:13 2007 UTC vs.
Revision 1.120 by root, Sun Dec 2 21:51:36 2007 UTC

  $req->cancel; # cancel request if still in queue
  my $grp = aio_group sub { print "all stats done\n" };
  add $grp aio_stat "..." for ...;
- # AnyEvent integration
+ # AnyEvent integration (EV, Event, Glib, Tk, urxvt, pureperl...)
  open my $fh, "<&=" . IO::AIO::poll_fileno or die "$!";
  my $w = AnyEvent->io (fh => $fh, poll => 'r', cb => sub { IO::AIO::poll_cb });
+ # EV integration
+ my $w = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb;
  # Event integration
  Event->io (fd => IO::AIO::poll_fileno,
             poll => 'r',
             cb => \&IO::AIO::poll_cb);
 =cut
 package IO::AIO;
+use Carp ();
 no warnings;
 use strict 'vars';
 use base 'Exporter';
 BEGIN {
-   our $VERSION = '2.4';
+   our $VERSION = '2.6';
-   our @AIO_REQ = qw(aio_sendfile aio_read aio_write aio_open aio_close aio_stat
+   our @AIO_REQ = qw(aio_sendfile aio_read aio_write aio_open aio_close
-                     aio_lstat aio_unlink aio_rmdir aio_readdir aio_scandir aio_symlink
+                     aio_stat aio_lstat aio_unlink aio_rmdir aio_readdir
-                     aio_readlink aio_fsync aio_fdatasync aio_readahead aio_rename aio_link
+                     aio_scandir aio_symlink aio_readlink aio_sync aio_fsync
+                     aio_fdatasync aio_pathsync aio_readahead
+                     aio_rename aio_link aio_move aio_copy aio_group
-                     aio_move aio_copy aio_group aio_nop aio_mknod aio_load aio_rmtree aio_mkdir
+                     aio_nop aio_mknod aio_load aio_rmtree aio_mkdir aio_chown
-                     aio_chown aio_chmod aio_utime aio_truncate);
+                     aio_chmod aio_utime aio_truncate);
    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);
 =item aio_close $fh, $callback->($status)
 Asynchronously close a file and call the callback with the result
-code. I<WARNING:> although accepted, you should not pass in a perl
+code.
-filehandle here, as perl will likely close the file descriptor another
-time when the filehandle is destroyed. Normally, you can safely call perls
-C<close> or just let filehandles go out of scope.
-This is supposed to be a bug in the API, so that might change. It's
+Unfortunately, you can't do this to perl. Perl I<insists> very strongly on
-therefore best to avoid this function.
+closing the file descriptor associated with the filehandle itself. Here is
+what aio_close will try:
+   1. dup()licate the fd
+   2. asynchronously close() the duplicated fd
+   3. dup()licate the fd once more
+   4. let perl close() the filehandle
+   5. asynchronously close the duplicated fd
+The idea is that the first close() flushes stuff to disk that closing an
+fd will flush, so when perl closes the fd, nothing much will need to be
+flushed.  The second async. close() will then flush stuff to disk that
+closing the last fd to the file will flush.
+Just FYI, SuSv3 has this to say on close:
+   All outstanding record locks owned by the process on the file
+   associated with the file descriptor shall be removed.
+   If fildes refers to a socket, close() shall cause the socket to be
+   destroyed. ... close() shall block for up to the current linger
+   interval until all data is transmitted.
+   [this actually sounds like a specification bug, but who knows]
+And at least Linux additionally actually flushes stuff on every close,
+even when the file itself is still open.
+Sounds enourmously inefficient and complicated? Yes... please show me how
+to nuke perl's fd out of existence...
+=cut
+sub aio_close($;$) {
+   aio_block {
+      my ($fh, $cb) = @_;
+      my $pri = aioreq_pri;
+      my $grp = aio_group $cb;
+      my $fd = fileno $fh;
+      defined $fd or Carp::croak "aio_close called with fd-less filehandle";
+      # if the dups fail we will simply get EBADF
+      my $fd2 = _dup $fd;
+      aioreq_pri $pri;
+      add $grp _aio_close $fd2, sub {
+         my $fd2 = _dup $fd;
+         close $fh;
+         aioreq_pri $pri;
+         add $grp _aio_close $fd2, sub {
+            $grp->result ($_[0]);
+         };
+      };
+      $grp
+   }
+}
 =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>
 into the scalar given by C<$data> and offset C<$dataoffset> and calls the
 callback without the actual number of bytes read (or -1 on error, just
 like the syscall).
-If C<$offset> is undefined, then the current file offset will be used (and
+If C<$offset> is undefined, then the current file descriptor offset will
-updated), otherwise the file offset will not be changed by these calls.
+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
                         # those should not normally block. should. should.
                         utime $stat[8], $stat[9], $dst;
                         chmod $stat[2] & 07777, $dst_fh;
                         chown $stat[4], $stat[5], $dst_fh;
+                        aioreq_pri $pri;
-                        close $dst_fh;
+                        add $grp aio_close $dst_fh;
                      } else {
                         $grp->result (-1);
                         close $src_fh;
                         close $dst_fh;
       $grp
    }
 }
+=item aio_sync $callback->($status)
+Asynchronously call sync and call the callback when finished.
 =item aio_fsync $fh, $callback->($status)
 Asynchronously call fsync on the given filehandle and call the callback
 with the fsync result code.
 Asynchronously call fdatasync on the given filehandle and call the
 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_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
+(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.
+Passes C<0> when everything went ok, and C<-1> on error.
+=cut
+sub aio_pathsync($;$) {
+   aio_block {
+      my ($path, $cb) = @_;
+      my $pri = aioreq_pri;
+      my $grp = aio_group $cb;
+      aioreq_pri $pri;
+      add $grp aio_open $path, O_RDONLY, 0, sub {
+         my ($fh) = @_;
+         if ($fh) {
+            aioreq_pri $pri;
+            add $grp aio_fsync $fh, sub {
+               $grp->result ($_[0]);
+               aioreq_pri $pri;
+               add $grp aio_close $fh;
+            };
+         } else {
+            $grp->result (-1);
+         }
+      };
+      $grp
+   }
+}
 =item aio_group $callback->(...)
 This is a very special aio request: Instead of doing something, it is a
 container for other aio requests, which is useful if you want to bundle
 itself. Useful when you queued a lot of events but got a result early.
 =item $grp->result (...)
 Set the result value(s) that will be passed to the group callback when all
-subrequests have finished and set thre groups errno to the current value
+subrequests have finished and set the groups errno to the current value
 of errno (just like calling C<errno> without an error number). By default,
 no argument will be passed and errno is zero.
 =item $grp->errno ([$errno])
 This is a very bad function to use in interactive programs because it
 blocks, and a bad way to reduce concurrency because it is inexact: Better
 use an C<aio_group> together with a feed callback.
 Sets the maximum number of outstanding requests to C<$nreqs>. If you
-to queue up more than this number of requests, the next call to the
+do queue up more than this number of requests, the next call to the
 C<poll_cb> (and C<poll_some> and other functions calling C<poll_cb>)
 function will block until the limit is no longer exceeded.
 The default value is very large, so there is no practical limit on the
 number of outstanding requests.
 but not yet processed by poll_cb).
 =back
 =cut
-# support function to convert a fd into a perl filehandle
-sub _fd2fh {
-   return undef if $_[0] < 0;
-   # try to generate nice filehandles
-   my $sym = "IO::AIO::fd#$_[0]";
-   local *$sym;
-   open *$sym, "+<&=$_[0]"      # usually works under any unix
-      or open *$sym, "<&=$_[0]" # cygwin needs this
-      or open *$sym, ">&=$_[0]" # or this
-      or return undef;
-   *$sym
-}
 min_parallel 8;
 END { flush }

Diff Legend

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

Comparing IO-AIO/AIO.pm (file contents): Revision 1.111 by root, Mon Aug 13 12:08:13 2007 UTC vs. Revision 1.120 by root, Sun Dec 2 21:51:36 2007 UTC

Diff Legend

Comparing IO-AIO/AIO.pm (file contents):
Revision 1.111 by root, Mon Aug 13 12:08:13 2007 UTC vs.
Revision 1.120 by root, Sun Dec 2 21:51:36 2007 UTC