--- IO-AIO/AIO.pm	2010/01/10 20:37:33	1.175
+++ IO-AIO/AIO.pm	2010/05/04 21:14:01	1.181
@@ -6,7 +6,7 @@
 
  use IO::AIO;
 
- aio_open "/etc/passwd", O_RDONLY, 0, sub {
+ aio_open "/etc/passwd", IO::AIO::O_RDONLY, 0, sub {
     my $fh = shift
        or die "/etc/passwd: $!";
     ...
@@ -78,7 +78,7 @@
    my $aio_w = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb;
 
    # queue the request to open /etc/passwd
-   aio_open "/etc/passwd", O_RDONLY, 0, sub {
+   aio_open "/etc/passwd", IO::AIO::O_RDONLY, 0, sub {
       my $fh = shift
          or die "error while opening: $!";
 
@@ -170,7 +170,7 @@
 use base 'Exporter';
 
 BEGIN {
-   our $VERSION = '3.5';
+   our $VERSION = '3.65';
 
    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_readdirx
@@ -354,7 +354,7 @@
 
 Example:
 
-   aio_open "/etc/passwd", O_RDONLY, 0, sub {
+   aio_open "/etc/passwd", IO::AIO::O_RDONLY, 0, sub {
       if ($_[0]) {
          print "open successful, fh is $_[0]\n";
          ...
@@ -426,7 +426,7 @@
 
 This call tries to make use of a native C<sendfile> syscall to provide
 zero-copy operation. For this to work, C<$out_fh> should refer to a
-socket, and C<$in_fh> should refer to mmap'able file.
+socket, and C<$in_fh> should refer to an mmap'able file.
 
 If a native sendfile cannot be found or it fails with C<ENOSYS>,
 C<ENOTSUP>, C<EOPNOTSUPP>, C<EAFNOSUPPORT>, C<EPROTOTYPE> or C<ENOTSOCK>,
@@ -1086,9 +1086,10 @@
 =item aio_msync $scalar, $offset = 0, $length = undef, flags = 0, $callback->($status)
 
 This is a rather advanced IO::AIO call, which only works on mmap(2)ed
-scalars (see the L<Sys::Mmap> or L<Mmap> modules for details on this, note
-that the scalar must only be modified in-place while an aio operation is
-pending on it).
+scalars (see the C<IO::AIO::mmap> function, although it also works on data
+scalars managed by the L<Sys::Mmap> or L<Mmap> modules, note that the
+scalar must only be modified in-place while an aio operation is pending on
+it).
 
 It calls the C<msync> function of your OS, if available, with the memory
 area starting at C<$offset> in the string and ending C<$length> bytes
@@ -1547,6 +1548,60 @@
 On systems that do not implement C<posix_fadvise>, this function returns
 ENOSYS, otherwise the return value of C<posix_fadvise>.
 
+=item IO::AIO::mmap $scalar, $length, $prot, $flags, $fh[, $offset]
+
+Memory-maps a file (or anonymous memory range) and attaches it to the
+given C<$scalar>, which will act like a string scalar.
+
+The only operations allowed on the scalar are C<substr>/C<vec> that don't
+change the string length, and most read-only operations such as copying it
+or searching it with regexes and so on.
+
+Anything else is unsafe and will, at best, result in memory leaks.
+
+The memory map associated with the C<$scalar> is automatically removed
+when the C<$scalar> is destroyed, or when the C<IO::AIO::mmap> or
+C<IO::AIO::munmap> functions are called.
+
+This calls the C<mmap>(2) function internally. See your system's manual
+page for details on the C<$length>, C<$prot> and C<$flags> parameters.
+
+The C<$length> must be larger than zero and smaller than the actual
+filesize.
+
+C<$prot> is a combination of C<IO::AIO::PROT_NONE>, C<IO::AIO::PROT_EXEC>,
+C<IO::AIO::PROT_READ> and/or C<IO::AIO::PROT_WRITE>,
+
+C<$flags> can be a combination of C<IO::AIO::MAP_SHARED> or
+C<IO::AIO::MAP_PRIVATE>, or a number of system-specific flags (when
+not available, the are defined as 0): C<IO::AIO::MAP_ANONYMOUS>
+(which is set to C<MAP_ANON> if your system only provides this
+constant), C<IO::AIO::MAP_HUGETLB>, C<IO::AIO::MAP_LOCKED>,
+C<IO::AIO::MAP_NORESERVE>, C<IO::AIO::MAP_POPULATE> or
+C<IO::AIO::MAP_NONBLOCK>
+
+If C<$fh> is C<undef>, then a file descriptor of C<-1> is passed.
+
+C<$offset> is the offset from the start of the file - it generally must be
+a multiple of C<IO::AIO::PAGESIZE> and defaults to C<0>.
+
+Example:
+
+   use Digest::MD5;
+   use IO::AIO;
+
+   open my $fh, "<verybigfile"
+      or die "$!";
+
+   IO::AIO::mmap my $data, -s $fh, IO::AIO::PROT_READ, IO::AIO::MAP_SHARED, $fh
+      or die "verybigfile: $!";
+
+   my $fast_md5 = md5 $data;
+
+=item IO::AIO::munmap $scalar
+
+Removes a previous mmap and undefines the C<$scalar>.
+
 =item IO::AIO::mlockall $flags
 
 Calls the C<mlockall> function with the given C<$flags> (a combination of