r20624: added AIO read to pvfs backend

diff --git a/source/ntvfs/posix/config.m4 b/source/ntvfs/posix/config.m4
index c2cdf0ecaf546b2deeff324776329cb10dd2863a..fe1997b4371dc2b4083ad680df60909091d43c2e 100644 (file)
--- a/source/ntvfs/posix/config.m4
+++ b/source/ntvfs/posix/config.m4
@@ -29,3 +29,9 @@ if test x"$ac_cv_func_ext_blkid_get_cache" = x"yes"; then
        AC_DEFINE(HAVE_LIBBLKID,1,[Whether we have blkid support (e2fsprogs)])
        SMB_ENABLE(BLKID,YES)
 fi
+
+AC_CHECK_HEADERS(libaio.h)
+SMB_ENABLE(pvfs_aio,NO)
+if test x"$ac_cv_header_libaio_h" = x"yes"; then
+       SMB_ENABLE(pvfs_aio,YES)
+fi

diff --git a/source/ntvfs/posix/config.mk b/source/ntvfs/posix/config.mk
index 7845b21662bfd67884ace09b3ea07e2aa5533d2e..91dc7bd9e568ed6f2881a9fae5fa23ffef3c0e2e 100644 (file)
--- a/source/ntvfs/posix/config.mk
+++ b/source/ntvfs/posix/config.mk
@@ -20,6 +20,13 @@ PRIVATE_DEPENDENCIES = NDR_NFS4ACL SAMDB ntvfs_posix
 # End MODULE pvfs_acl_nfs4
 ################################################
 
+################################################
+[MODULE::pvfs_aio]
+SUBSYSTEM = ntvfs
+OBJ_FILES = pvfs_aio.o
+PRIVATE_DEPENDENCIES = LIBAIO_LINUX
+################################################
+
 ################################################
 # Start MODULE ntvfs_posix
 [MODULE::ntvfs_posix]
@@ -56,6 +63,6 @@ OBJ_FILES = \
                xattr_system.o \
                xattr_tdb.o
 #PRIVATE_DEPENDENCIES = pvfs_acl_xattr pvfs_acl_nfs4
-PUBLIC_DEPENDENCIES = NDR_XATTR WRAP_XATTR BLKID ntvfs_common MESSAGING
+PUBLIC_DEPENDENCIES = NDR_XATTR WRAP_XATTR BLKID ntvfs_common MESSAGING pvfs_aio
 # End MODULE ntvfs_posix
 ################################################

diff --git a/source/ntvfs/posix/pvfs_aio.c b/source/ntvfs/posix/pvfs_aio.c
new file mode 100644 (file)
index 0000000..262b856
--- /dev/null
+++ b/source/ntvfs/posix/pvfs_aio.c
@@ -0,0 +1,96 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   POSIX NTVFS backend - Linux AIO calls
+
+   Copyright (C) Andrew Tridgell 2006
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "includes.h"
+#include "vfs_posix.h"
+#include "lib/events/events.h"
+#include "system/aio.h"
+
+struct pvfs_aio_read_state {
+       struct ntvfs_request *req;
+       union smb_read *rd;
+       struct pvfs_file *f;
+       struct aio_event *ae;
+};
+
+/*
+  called when an aio read has finished
+*/
+static void pvfs_aio_handler(struct event_context *ev, struct aio_event *ae, 
+                            int ret, void *private)
+{
+       struct pvfs_aio_read_state *state = talloc_get_type(private, 
+                                                           struct pvfs_aio_read_state);
+       struct pvfs_file *f = state->f;
+       union smb_read *rd = state->rd;
+
+       if (ret < 0) {
+               /* errno is -ret on error */
+               state->req->async_states->status = pvfs_map_errno(f->pvfs, -ret);
+               state->req->async_states->send_fn(state->req);
+               return;
+       }
+
+       f->handle->position = f->handle->seek_offset = rd->readx.in.offset + ret;
+
+       rd->readx.out.nread = ret;
+       rd->readx.out.remaining = 0xFFFF;
+       rd->readx.out.compaction_mode = 0; 
+
+       talloc_steal(ev, state->ae);
+
+       state->req->async_states->status = NT_STATUS_OK;
+       state->req->async_states->send_fn(state->req);
+}
+
+
+/*
+  read from a file
+*/
+NTSTATUS pvfs_aio_pread(struct ntvfs_request *req, union smb_read *rd,
+                       struct pvfs_file *f, uint32_t maxcnt)
+{
+       struct iocb iocb;
+       struct pvfs_aio_read_state *state;
+
+       state = talloc(req, struct pvfs_aio_read_state);
+       NT_STATUS_HAVE_NO_MEMORY(state);
+
+        io_prep_pread(&iocb, f->handle->fd, rd->readx.out.data,
+                     maxcnt, rd->readx.in.offset);
+       state->ae = event_add_aio(req->ctx->event_ctx, req->ctx->event_ctx, &iocb, 
+                                 pvfs_aio_handler, state);
+       if (state->ae == NULL) {
+               DEBUG(0,("Failed event_add_aio\n"));
+               talloc_free(state);
+               return NT_STATUS_NOT_IMPLEMENTED;
+       }
+
+       state->req  = req;
+       state->rd   = rd;
+       state->f    = f;
+
+       req->async_states->state |= NTVFS_ASYNC_STATE_ASYNC;
+
+       return NT_STATUS_OK;
+}
+

diff --git a/source/ntvfs/posix/pvfs_read.c b/source/ntvfs/posix/pvfs_read.c
index c36d8ca2a32727ac7f9ef9d7b98c59864cce90e0..91945dbb0f1a206e58e2a4c407739345568b6165 100644 (file)
--- a/source/ntvfs/posix/pvfs_read.c
+++ b/source/ntvfs/posix/pvfs_read.c
@@ -22,7 +22,7 @@
 
 #include "includes.h"
 #include "vfs_posix.h"
-#include "librpc/gen_ndr/security.h"
+#include "lib/events/events.h"
 
 /*
   read from a file
@@ -75,6 +75,16 @@ NTSTATUS pvfs_read(struct ntvfs_module_context *ntvfs,
                ret = pvfs_stream_read(pvfs, f->handle, 
                                       rd->readx.out.data, maxcnt, rd->readx.in.offset);
        } else {
+#if HAVE_LINUX_AIO
+               /* possibly try an aio read */
+               if ((req->async_states->state & NTVFS_ASYNC_STATE_MAY_ASYNC) &&
+                   (pvfs->flags & PVFS_FLAG_LINUX_AIO)) {
+                       status = pvfs_aio_pread(req, rd, f, maxcnt);
+                       if (NT_STATUS_IS_OK(status)) {
+                               return NT_STATUS_OK;
+                       }
+               }
+#endif
                ret = pread(f->handle->fd, 
                            rd->readx.out.data, 
                            maxcnt,

diff --git a/source/ntvfs/posix/vfs_posix.c b/source/ntvfs/posix/vfs_posix.c
index ad47908b6e8e5640cd7a2872ce1b5544e3d1cd5d..c8d85b557c00634812368925d1c03a82cae55e5c 100644 (file)
--- a/source/ntvfs/posix/vfs_posix.c
+++ b/source/ntvfs/posix/vfs_posix.c
@@ -55,9 +55,10 @@ static void pvfs_setup_options(struct pvfs_state *pvfs)
                pvfs->flags |= PVFS_FLAG_STRICT_LOCKING;
        if (share_bool_option(scfg, SHARE_CI_FILESYSTEM, SHARE_CI_FILESYSTEM_DEFAULT))
                pvfs->flags |= PVFS_FLAG_CI_FILESYSTEM;
-       if (share_bool_option(scfg, PVFS_FAKE_OPLOCKS, PVFS_FAKE_OPLOCKS_DEFAULT)) {
+       if (share_bool_option(scfg, PVFS_FAKE_OPLOCKS, PVFS_FAKE_OPLOCKS_DEFAULT))
                pvfs->flags |= PVFS_FLAG_FAKE_OPLOCKS;
-       }
+       if (share_bool_option(scfg, PVFS_AIO, False))
+               pvfs->flags |= PVFS_FLAG_LINUX_AIO;
 
        /* this must be a power of 2 */
        pvfs->alloc_size_rounding = share_int_option(scfg,

diff --git a/source/ntvfs/posix/vfs_posix.h b/source/ntvfs/posix/vfs_posix.h
index 4a81088d1ca08b09b9be1704bc2a8b9b88150f04..4fd4cb82d8307b6a4f2c5cb229598dd40c99170f 100644 (file)
--- a/source/ntvfs/posix/vfs_posix.h
+++ b/source/ntvfs/posix/vfs_posix.h
@@ -210,6 +210,7 @@ struct pvfs_search_state {
 #define PVFS_FLAG_STRICT_LOCKING (1<<6)
 #define PVFS_FLAG_XATTR_ENABLE   (1<<7)
 #define PVFS_FLAG_FAKE_OPLOCKS   (1<<8)
+#define PVFS_FLAG_LINUX_AIO      (1<<9)
 
 /* forward declare some anonymous structures */
 struct pvfs_dir;
@@ -224,6 +225,7 @@ enum pvfs_wait_notice {PVFS_WAIT_EVENT, PVFS_WAIT_TIMEOUT, PVFS_WAIT_CANCEL};
 #define PVFS_ALLOCATION_ROUNDING       "posix:allocationrounding"
 #define PVFS_SEARCH_INACTIVITY         "posix:searchinactivity"
 #define PVFS_ACL                       "posix:acl"
+#define PVFS_AIO                       "posix:aio"
 
 #define PVFS_XATTR_DEFAULT                     True
 #define PVFS_FAKE_OPLOCKS_DEFAULT              False
@@ -240,4 +242,7 @@ struct pvfs_acl_ops {
 
 #include "ntvfs/posix/vfs_posix_proto.h"
 
+NTSTATUS pvfs_aio_pread(struct ntvfs_request *req, union smb_read *rd,
+                       struct pvfs_file *f, uint32_t maxcnt);
+
 #endif /* _VFS_POSIX_H_ */