[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  010f2b8 Add docs for aio_linux vfs module.
      from  538893d s3fs: Use xattr_tdb format for xattr storage

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 010f2b89e20e13f4687700fd731fedfafb7c62eb
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Apr 17 20:20:28 2012 -0700

    Add docs for aio_linux vfs module.
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Wed Apr 18 07:20:19 CEST 2012 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 .../{vfs_aio_pthread.8.xml => vfs_aio_linux.8.xml} |   41 +++++++++-----------
 1 files changed, 18 insertions(+), 23 deletions(-)
 copy docs-xml/manpages-3/{vfs_aio_pthread.8.xml => vfs_aio_linux.8.xml} (66%)


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages-3/vfs_aio_pthread.8.xml b/docs-xml/manpages-3/vfs_aio_linux.8.xml
similarity index 66%
copy from docs-xml/manpages-3/vfs_aio_pthread.8.xml
copy to docs-xml/manpages-3/vfs_aio_linux.8.xml
index 3e41ee9..dac94a5 100644
--- a/docs-xml/manpages-3/vfs_aio_pthread.8.xml
+++ b/docs-xml/manpages-3/vfs_aio_linux.8.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
-<refentry id="vfs_aio_pthread.8">
+<refentry id="vfs_aio_linux.8">
 
 <refmeta>
-	<refentrytitle>vfs_aio_pthread</refentrytitle>
+	<refentrytitle>vfs_aio_linux</refentrytitle>
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
@@ -12,13 +12,13 @@
 
 
 <refnamediv>
-	<refname>vfs_aio_pthread</refname>
-	<refpurpose>implement async I/O in Samba vfs using a pthread pool</refpurpose>
+	<refname>vfs_aio_linux</refname>
+	<refpurpose>implement async I/O in Samba vfs using Linux kernel aio calls</refpurpose>
 </refnamediv>
 
 <refsynopsisdiv>
 	<cmdsynopsis>
-		<command>vfs objects = aio_pthread</command>
+		<command>vfs objects = aio_linux</command>
 	</cmdsynopsis>
 </refsynopsisdiv>
 
@@ -29,8 +29,8 @@
 	<citerefentry><refentrytitle>samba</refentrytitle>
 	<manvolnum>7</manvolnum></citerefentry> suite.</para>
 
-	<para>The <command>aio_pthread</command> VFS module enables asynchronous
-	I/O for Samba on platforms which have the pthreads API available,
+	<para>The <command>aio_linux</command> VFS module enables asynchronous
+	I/O for Samba on Linux kernels that have the kernel AIO calls available
 	without using the Posix AIO interface. Posix AIO can suffer from severe
 	limitations.  For example, on some Linux versions the
 	real-time signals that it uses are broken under heavy load.
@@ -41,17 +41,12 @@
 	descriptor which essentially makes Posix AIO useless on systems
 	using the glibc implementation.</para>
 
-	<para>To work around all these limitations, the aio_pthread module
-	was written. It uses a pthread pool instead of the
+	<para>To work around all these limitations, the aio_linux module
+	was written. It uses the Linux kernel AIO interface instead of the
 	internal Posix AIO interface to allow read and write calls
-	to be process asynchronously. A pthread pool is created
-	which expands dynamically by creating new threads as work is
-	given to it to a maximum of 100 threads per smbd process.
-	To change this limit see the "aio num threads" parameter
-	below. New threads are not created if idle threads are
-	available when a new read or write request is received,
-	the new work is given to an existing idle thread. Threads
-	terminate themselves if idle for one second.
+	to be processed asynchronously. A queue size of 128 events
+	is used by default. To change this limit set the "aio num events"
+	parameter below.
 	</para>
 
 	<para>
@@ -78,7 +73,7 @@
 	<smbconfoption name="path">/data/ice</smbconfoption>
 	<smbconfoption name="aio read size">1024</smbconfoption>
 	<smbconfoption name="aio write size">1024</smbconfoption>
-	<smbconfoption name="vfs objects">aio_pthread</smbconfoption>
+	<smbconfoption name="vfs objects">aio_linux</smbconfoption>
 </programlisting>
 
 </refsect1>
@@ -89,12 +84,12 @@
 	<variablelist>
 
 		<varlistentry>
-		<term>aio_pthread:aio num threads = INTEGER</term>
+		<term>aio_linux:aio num events = INTEGER</term>
 		<listitem>
-		<para>Limit the maximum number of threads per smbd that
-		will be created in the thread pool to service IO requests.
+		<para>Set the maximum size of the event queue
+		that is used to limit outstanding IO requests.
 		</para>
-		<para>By default this is set to 100.</para>
+		<para>By default this is set to 128.</para>
 		</listitem>
 		</varlistentry>
 
@@ -103,7 +98,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 3.6.3 of the Samba suite.
+	<para>This man page is correct for version 3.6.6 of the Samba suite.
 	</para>
 </refsect1>
 


-- 
Samba Shared Repository