Changeset 2002

Timestamp:

10/26/2007 10:20:08 PM (10 months ago)

Author:

jan

Message:

disabled linux-aio and posix-aio for now as experimental

Location:

trunk

Files:

• NEWS (modified) (1 diff)
• configure.in (modified) (3 diffs)
• src/settings.h (modified) (1 diff)

trunk/NEWS

@@ -6 +6 @@
 - 1.5.0 - 
   * fixed decoding of common headers in AJP13 (#1399)
+  * disable experimental linux-aio and posix-aio support, use gthread-aio instead
 
 - 1.5.0-r19.. - 

trunk/configure.in

@@ -445 +445 @@
 ])
 
+if false; then
+        dnl async-io doesn't work for all file-systems 
+        dnl we disable it here in the configure checks 
+        dnl and in settings.h
+
 dnl Check for libaio
 AC_MSG_CHECKING(for libaio)
-AC_ARG_WITH(linux-aio, AC_HELP_STRING([--with-linux-aio],[Async IO support for Linux via libaio]),
-[WITH_LINUXLIBAIO=$withval],[WITH_LINUXLIBAIO=no])
+AC_ARG_WITH(linux-aio, AC_HELP_STRING([--with-linux-aio],[Async IO support for Linux via libaio]), [WITH_LINUXLIBAIO=$withval],[WITH_LINUXLIBAIO=no])
 AC_MSG_RESULT([$WITH_LINUXLIBAIO])
 if test "$WITH_LINUXLIBAIO" != "no"; then
@@ -460 +464 @@
  AC_SUBST(AIO_LIB)
 fi
- 
+
  AC_SEARCH_LIBS(aio_suspend, rt, [
          AC_CHECK_HEADERS([aio.h],[
@@ -477 +481 @@
  ])
  AC_SUBST(POSIX_AIO_LIB)
+fi
 
 save_LIBS=$LIBS

trunk/src/settings.h

@@ -51 +51 @@
 #if defined(USE_GTHREAD)
 # if defined(USE_LINUX_SENDFILE)
-#  if defined(HAVE_LIBAIO_H)
+#  if 0 && defined(HAVE_LIBAIO_H)
+     /** disabled for now as not all FSs are async-io capable */
 #    define USE_LINUX_AIO_SENDFILE
 #  endif