svn commit: samba r22964 - in branches/SAMBA_4_0/source/lib/events: .

tridge at samba.org tridge at samba.org
Thu May 17 02:42:14 GMT 2007


Author: tridge
Date: 2007-05-17 02:42:14 +0000 (Thu, 17 May 2007)
New Revision: 22964

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

Log:

log an error on epoll_create failing on reopen

Modified:
   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/events/events_standard.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/events/events_aio.c
===================================================================
--- branches/SAMBA_4_0/source/lib/events/events_aio.c	2007-05-17 02:38:07 UTC (rev 22963)
+++ branches/SAMBA_4_0/source/lib/events/events_aio.c	2007-05-17 02:42:14 UTC (rev 22964)
@@ -108,8 +108,9 @@
 	struct fd_event *fde;
 
 	close(aio_ev->epoll_fd);
-	aio_ev->epoll_fd = epoll_create(64);
+	aio_ev->epoll_fd = epoll_create(MAX_AIO_QUEUE_DEPTH);
 	if (aio_ev->epoll_fd == -1) {
+		DEBUG(0,("Failed to recreate epoll handle after fork\n"));
 		return;
 	}
 	aio_ev->pid = getpid();

Modified: branches/SAMBA_4_0/source/lib/events/events_epoll.c
===================================================================
--- branches/SAMBA_4_0/source/lib/events/events_epoll.c	2007-05-17 02:38:07 UTC (rev 22963)
+++ branches/SAMBA_4_0/source/lib/events/events_epoll.c	2007-05-17 02:42:14 UTC (rev 22964)
@@ -109,6 +109,7 @@
 	close(epoll_ev->epoll_fd);
 	epoll_ev->epoll_fd = epoll_create(64);
 	if (epoll_ev->epoll_fd == -1) {
+		DEBUG(0,("Failed to recreate epoll handle after fork\n"));
 		return;
 	}
 	epoll_ev->pid = getpid();

Modified: branches/SAMBA_4_0/source/lib/events/events_standard.c
===================================================================
--- branches/SAMBA_4_0/source/lib/events/events_standard.c	2007-05-17 02:38:07 UTC (rev 22963)
+++ branches/SAMBA_4_0/source/lib/events/events_standard.c	2007-05-17 02:42:14 UTC (rev 22964)
@@ -126,6 +126,7 @@
 	close(std_ev->epoll_fd);
 	std_ev->epoll_fd = epoll_create(64);
 	if (std_ev->epoll_fd == -1) {
+		DEBUG(0,("Failed to recreate epoll handle after fork\n"));
 		return;
 	}
 	std_ev->pid = getpid();



More information about the samba-cvs mailing list