Ongoing xfs_repair/libxfs scaling work - incorporate lio_listio detection into the...

Merge of master-melb:xfs-cmds:26199a by kenmcd.

diff --git a/aclocal.m4 b/aclocal.m4
index 3fc6603d91fcf9685664913ace94508c39f30c5a..4ea73f5b74624494c42d01555ff58c4b974adde2 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.8.3 -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005  Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+# Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -73,6 +73,44 @@ AC_DEFUN([AC_MULTILIB],
   AC_SUBST(libdirsuffix)
 ])
 
+#
+# Check if we have a libaio.h installed
+#
+AC_DEFUN([AC_PACKAGE_WANT_AIO],
+  [ AC_CHECK_HEADERS(libaio.h, [ have_aio=true ], [ have_aio=false ])
+    AC_SUBST(have_aio)
+  ])
+
+#
+# Check if we have an aio.h installed
+#
+AC_DEFUN([AC_PACKAGE_NEED_AIO_H],
+  [ AC_CHECK_HEADERS(aio.h)
+    if test $ac_cv_header_aio_h = no; then
+       echo
+       echo 'FATAL ERROR: could not find a valid <aio.h> header.'
+       exit 1
+    fi
+  ])
+
+#
+# Check if we have the lio_listio routine in either libc/librt
+#
+AC_DEFUN([AC_PACKAGE_NEED_LIO_LISTIO],
+  [ AC_CHECK_FUNCS(lio_listio)
+    if test $ac_cv_func_lio_listio = yes; then
+       librt=""
+    else
+       AC_CHECK_LIB(rt, lio_listio,, [
+           echo
+           echo 'FATAL ERROR: could not find a library with lio_listio.'
+           exit 1])
+       librt="-lrt"
+    fi
+    AC_SUBST(librt)
+  ])
+
+
 # 
 # Generic macro, sets up all of the global packaging variables.
 # The following environment variables may be set to override defaults:

diff --git a/configure.in b/configure.in
index eddeef4ccd8fcd583ec13fea9138f8d7573ff5e8..809046e79ba8b383a575d4e9366afbb74c48b17b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -39,6 +39,9 @@ AC_PACKAGE_GLOBALS(xfsprogs)
 AC_PACKAGE_UTILITIES(xfsprogs)
 AC_MULTILIB($enable_lib64)
 
+AC_PACKAGE_NEED_AIO_H
+AC_PACKAGE_NEED_LIO_LISTIO
+
 AC_PACKAGE_NEED_UUID_H
 AC_PACKAGE_NEED_UUIDCOMPARE
 

diff --git a/doc/CHANGES b/doc/CHANGES
index fe8725395661b5d9b148502548320a8ea9d9a005..1655cc7f6006d26d52a77e28f7ee37d801965831 100644 (file)
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,3 +1,7 @@
+[cvs]
+       - More updates to repair/libxfs for improving performance
+       - Incorporate librt into the build process for lio_listio
+
 xfsprogs-2.8.1 (29 May 2006)
        - Fix endianness issues on FreeBSD.
 

diff --git a/include/builddefs.in b/include/builddefs.in
index 50f7b652b75c5c09a6343d9225b3d08967d3884c..59533eb1df2dbee59b47f76a2042d95475293fed 100644 (file)
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -25,6 +25,7 @@ OPTIMIZER = @opt_build@
 MALLOCLIB = @malloc_lib@
 LOADERFLAGS = @LDFLAGS@
 
+LIBRT = @librt@
 LIBUUID = @libuuid@
 LIBPTHREAD = @libpthread@
 LIBTERMCAP = @libtermcap@

diff --git a/m4/Makefile b/m4/Makefile
index ce7b445d9715eac43243036b68cd59fbbd8ebd3c..ab0ed48343bb5ab483c44baeb057b17e8afd4a12 100644 (file)
--- a/m4/Makefile
+++ b/m4/Makefile
@@ -7,6 +7,7 @@ include $(TOPDIR)/include/builddefs
 
 LSRCFILES = \
        manual_format.m4 \
+       package_aiodev.m4 \
        package_globals.m4 \
        package_libcdev.m4 \
        package_pthread.m4 \
@@ -15,7 +16,7 @@ LSRCFILES = \
        package_uuiddev.m4 \
        multilib.m4
 
-default: 
+default:
 
 include $(BUILDRULES)
 

diff --git a/m4/package_aiodev.m4 b/m4/package_aiodev.m4
new file mode 100644 (file)
index 0000000..5620a04
--- /dev/null
+++ b/m4/package_aiodev.m4
@@ -0,0 +1,37 @@
+#
+# Check if we have a libaio.h installed
+#
+AC_DEFUN([AC_PACKAGE_WANT_AIO],
+  [ AC_CHECK_HEADERS(libaio.h, [ have_aio=true ], [ have_aio=false ])
+    AC_SUBST(have_aio)
+  ])
+
+#
+# Check if we have an aio.h installed
+#
+AC_DEFUN([AC_PACKAGE_NEED_AIO_H],
+  [ AC_CHECK_HEADERS(aio.h)
+    if test $ac_cv_header_aio_h = no; then
+       echo
+       echo 'FATAL ERROR: could not find a valid <aio.h> header.'
+       exit 1
+    fi
+  ])
+
+#
+# Check if we have the lio_listio routine in either libc/librt
+#
+AC_DEFUN([AC_PACKAGE_NEED_LIO_LISTIO],
+  [ AC_CHECK_FUNCS(lio_listio)
+    if test $ac_cv_func_lio_listio = yes; then
+       librt=""
+    else
+       AC_CHECK_LIB(rt, lio_listio,, [
+           echo
+           echo 'FATAL ERROR: could not find a library with lio_listio.'
+           exit 1])
+       librt="-lrt"
+    fi
+    AC_SUBST(librt)
+  ])
+