Rev 428: another place we need to cope with the strange epoll fork semantics in http://samba.org/~tridge/ctdb

[tridge at samba.org]

------------------------------------------------------------
revno: 428
revision-id: tridge at samba.org-20070602000117-hyruu43epqiar7e2
parent: tridge at samba.org-20070601224649-wvwheltox404k3pe
committer: Andrew Tridgell <tridge at samba.org>
branch nick: tridge
timestamp: Sat 2007-06-02 10:01:17 +1000
message:
  another place we need to cope with the strange epoll fork semantics
modified:
  lib/events/events_aio.c        events_aio.c-20070501213746-4fxluwiq4rcxib8p-1
  lib/events/events_epoll.c      events_epoll.c-20070501213746-4fxluwiq4rcxib8p-2
  lib/events/events_standard.c   events_standard.c-20061117234101-o3qt14umlg9en8z0-30
=== modified file 'lib/events/events_aio.c'
--- a/lib/events/events_aio.c	2007-05-17 22:33:10 +0000
+++ b/lib/events/events_aio.c	2007-06-02 00:01:17 +0000
@@ -393,6 +393,8 @@
 	struct aio_event_context *aio_ev = talloc_get_type(ev->additional_data,
 							   struct aio_event_context);
 
+	epoll_check_reopen(aio_ev);
+
 	aio_ev->num_fd_events--;
 	aio_ev->destruction_count++;
 

=== modified file 'lib/events/events_epoll.c'
--- a/lib/events/events_epoll.c	2007-05-17 22:33:10 +0000
+++ b/lib/events/events_epoll.c	2007-06-02 00:01:17 +0000
@@ -342,6 +342,8 @@
 	struct epoll_event_context *epoll_ev = talloc_get_type(ev->additional_data,
 							   struct epoll_event_context);
 
+	epoll_check_reopen(epoll_ev);
+
 	epoll_ev->num_fd_events--;
 	epoll_ev->destruction_count++;
 

=== modified file 'lib/events/events_standard.c'
--- a/lib/events/events_standard.c	2007-05-18 01:24:45 +0000
+++ b/lib/events/events_standard.c	2007-06-02 00:01:17 +0000
@@ -379,6 +379,8 @@
 	struct std_event_context *std_ev = talloc_get_type(ev->additional_data,
 							   struct std_event_context);
 
+	epoll_check_reopen(std_ev);
+
 	if (std_ev->maxfd == fde->fd) {
 		std_ev->maxfd = EVENT_INVALID_MAXFD;
 	}