svn commit: samba r20788 - in branches/SAMBA_4_0/source/lib: events replace replace/system

[metze at samba.org]

Author: metze
Date: 2007-01-15 07:15:47 +0000 (Mon, 15 Jan 2007)
New Revision: 20788

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20788

Log:
- remove epoll configure checks from libreplace
- fix epoll configure checks for the epoll and aio
  events backends
- we should only activate the epoll backend if sys/epoll.h
  and epoll_create() are found
- we should only activate the aio backend if sys/epoll.h, epoll_create(),
  libaio.h and io_getevents() are found

hopefully fix the build on 'bnhtest' in the build farm...

metze
Modified:
   branches/SAMBA_4_0/source/lib/events/config.m4
   branches/SAMBA_4_0/source/lib/events/events_aio.c
   branches/SAMBA_4_0/source/lib/events/events_epoll.c
   branches/SAMBA_4_0/source/lib/replace/libreplace.m4
   branches/SAMBA_4_0/source/lib/replace/system/select.h


Changeset:
Modified: branches/SAMBA_4_0/source/lib/events/config.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/events/config.m4	2007-01-15 07:07:35 UTC (rev 20787)
+++ branches/SAMBA_4_0/source/lib/events/config.m4	2007-01-15 07:15:47 UTC (rev 20788)
@@ -1,19 +1,17 @@
-AC_CHECK_HEADERS(sys/epoll.h)
-
-# check for native Linux AIO interface
-SMB_ENABLE(EVENTS_AIO, NO)
-AC_CHECK_HEADERS(libaio.h)
-AC_CHECK_LIB_EXT(aio, AIO_LIBS, io_getevents)
-if test x"$ac_cv_header_libaio_h" = x"yes" -a x"$ac_cv_lib_ext_aio_io_getevents" = x"yes";then
-	SMB_ENABLE(EVENTS_AIO,YES)
-	AC_DEFINE(HAVE_LINUX_AIO, 1, [Whether Linux AIO is available])
-fi
-SMB_EXT_LIB(LIBAIO_LINUX, $AIO_LIBS)
-
-# check for native Linux AIO interface
+# check for EPOLL and native Linux AIO interface
 SMB_ENABLE(EVENTS_EPOLL, NO)
+SMB_ENABLE(EVENTS_AIO, NO)
 AC_CHECK_HEADERS(sys/epoll.h)
-if test x"$ac_cv_header_sys_epoll_h" = x"yes";then
+AC_CHECK_FUNCS(epoll_create)
+if test x"$ac_cv_header_sys_epoll_h" = x"yes" -a x"$ac_cv_func_epoll_create" = x"yes";then
 	SMB_ENABLE(EVENTS_EPOLL,YES)
-fi
 
+	# check for native Linux AIO interface
+	AC_CHECK_HEADERS(libaio.h)
+	AC_CHECK_LIB_EXT(aio, AIO_LIBS, io_getevents)
+	if test x"$ac_cv_header_libaio_h" = x"yes" -a x"$ac_cv_lib_ext_aio_io_getevents" = x"yes";then
+		SMB_ENABLE(EVENTS_AIO,YES)
+		AC_DEFINE(HAVE_LINUX_AIO, 1, [Whether Linux AIO is available])
+	fi
+	SMB_EXT_LIB(LIBAIO_LINUX, $AIO_LIBS)
+fi

Modified: branches/SAMBA_4_0/source/lib/events/events_aio.c
===================================================================
--- branches/SAMBA_4_0/source/lib/events/events_aio.c	2007-01-15 07:07:35 UTC (rev 20787)
+++ branches/SAMBA_4_0/source/lib/events/events_aio.c	2007-01-15 07:15:47 UTC (rev 20788)
@@ -33,10 +33,10 @@
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "system/select.h" /* needed for WITH_EPOLL */
 #include "lib/util/dlinklist.h"
 #include "lib/events/events.h"
 #include "lib/events/events_internal.h"
+#include <sys/epoll.h>
 #include <libaio.h>
 
 #define MAX_AIO_QUEUE_DEPTH	100

Modified: branches/SAMBA_4_0/source/lib/events/events_epoll.c
===================================================================
--- branches/SAMBA_4_0/source/lib/events/events_epoll.c	2007-01-15 07:07:35 UTC (rev 20787)
+++ branches/SAMBA_4_0/source/lib/events/events_epoll.c	2007-01-15 07:15:47 UTC (rev 20788)
@@ -23,10 +23,10 @@
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "system/select.h" /* needed for WITH_EPOLL */
 #include "lib/util/dlinklist.h"
 #include "lib/events/events.h"
 #include "lib/events/events_internal.h"
+#include <sys/epoll.h>
 
 struct epoll_event_context {
 	/* a pointer back to the generic event_context */

Modified: branches/SAMBA_4_0/source/lib/replace/libreplace.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/libreplace.m4	2007-01-15 07:07:35 UTC (rev 20787)
+++ branches/SAMBA_4_0/source/lib/replace/libreplace.m4	2007-01-15 07:15:47 UTC (rev 20788)
@@ -63,9 +63,6 @@
 
 AC_CHECK_HEADERS(stdbool.h sys/select.h)
 
-AC_CHECK_HEADERS(sys/epoll.h)
-AC_CHECK_FUNCS(epoll_create)
-
 AC_CHECK_TYPE(bool, 
 [AC_DEFINE(HAVE_BOOL, 1, [Whether the bool type is available])],,
 [

Modified: branches/SAMBA_4_0/source/lib/replace/system/select.h
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/system/select.h	2007-01-15 07:07:35 UTC (rev 20787)
+++ branches/SAMBA_4_0/source/lib/replace/system/select.h	2007-01-15 07:15:47 UTC (rev 20788)
@@ -30,13 +30,4 @@
 #define SELECT_CAST
 #endif
 
-/* use epoll if it is available */
-#if defined(HAVE_EPOLL_CREATE) && defined(HAVE_SYS_EPOLL_H)
-#define WITH_EPOLL 1
 #endif
-
-#if WITH_EPOLL
-#include <sys/epoll.h>
-#endif
-
-#endif