see http://junkcode.samba.org/ftp/unpacked/junkcode/epoll_fork.c for an
demonstration of why this is needed
*/
-static void epoll_reopen(struct aio_event_context *aio_ev)
+static void epoll_check_reopen(struct aio_event_context *aio_ev)
{
struct fd_event *fde;
+ if (aio_ev->pid == getpid()) {
+ return;
+ }
+
close(aio_ev->epoll_fd);
aio_ev->epoll_fd = epoll_create(MAX_AIO_QUEUE_DEPTH);
if (aio_ev->epoll_fd == -1) {
struct epoll_event event;
if (aio_ev->epoll_fd == -1) return;
- /* during an add event we need to check if our pid has changed
- and re-open the epoll socket. Note that we don't need to do this
- for other epoll changes */
- if (aio_ev->pid != getpid()) {
- epoll_reopen(aio_ev);
- /* the current event gets added in epoll_reopen(), so
- we can return here */
- return;
- }
-
fde->additional_flags &= ~EPOLL_ADDITIONAL_FD_FLAG_REPORT_ERROR;
/* if we don't want events yet, don't add an aio_event */
struct aio_event_context);
struct fd_event *fde;
+ epoll_check_reopen(aio_ev);
+
fde = talloc(mem_ctx?mem_ctx:ev, struct fd_event);
if (!fde) return NULL;
fde->flags = flags;
+ epoll_check_reopen(aio_ev);
+
epoll_change_event(aio_ev, fde);
}
return 0;
}
+ epoll_check_reopen(aio_ev);
+
return aio_event_loop(aio_ev, &tval);
}
see http://junkcode.samba.org/ftp/unpacked/junkcode/epoll_fork.c for an
demonstration of why this is needed
*/
-static void epoll_reopen(struct epoll_event_context *epoll_ev)
+static void epoll_check_reopen(struct epoll_event_context *epoll_ev)
{
struct fd_event *fde;
+ if (epoll_ev->pid == getpid()) {
+ return;
+ }
+
close(epoll_ev->epoll_fd);
epoll_ev->epoll_fd = epoll_create(64);
if (epoll_ev->epoll_fd == -1) {
if (epoll_ev->epoll_fd == -1) return;
- /* during an add event we need to check if our pid has changed
- and re-open the epoll socket. Note that we don't need to do this
- for other epoll changes */
- if (epoll_ev->pid != getpid()) {
- epoll_reopen(epoll_ev);
- /* the current event gets added in epoll_reopen(), so
- we can return here */
- return;
- }
-
fde->additional_flags &= ~EPOLL_ADDITIONAL_FD_FLAG_REPORT_ERROR;
/* if we don't want events yet, don't add an epoll_event */
struct epoll_event_context);
struct fd_event *fde;
+ epoll_check_reopen(epoll_ev);
+
fde = talloc(mem_ctx?mem_ctx:ev, struct fd_event);
if (!fde) return NULL;
fde->flags = flags;
+ epoll_check_reopen(epoll_ev);
+
epoll_change_event(epoll_ev, fde);
}
return 0;
}
+ epoll_check_reopen(epoll_ev);
+
return epoll_event_loop(epoll_ev, &tval);
}
see http://junkcode.samba.org/ftp/unpacked/junkcode/epoll_fork.c for an
demonstration of why this is needed
*/
-static void epoll_reopen(struct std_event_context *std_ev)
+static void epoll_check_reopen(struct std_event_context *std_ev)
{
struct fd_event *fde;
+ if (std_ev->pid == getpid()) {
+ return;
+ }
+
close(std_ev->epoll_fd);
std_ev->epoll_fd = epoll_create(64);
if (std_ev->epoll_fd == -1) {
struct epoll_event event;
if (std_ev->epoll_fd == -1) return;
- /* during an add event we need to check if our pid has changed
- and re-open the epoll socket. Note that we don't need to do this
- for other epoll changes */
- if (std_ev->pid != getpid()) {
- epoll_reopen(std_ev);
- /* the current event gets added in epoll_reopen(), so
- we can return here */
- return;
- }
-
fde->additional_flags &= ~EPOLL_ADDITIONAL_FD_FLAG_REPORT_ERROR;
/* if we don't want events yet, don't add an epoll_event */
struct std_event_context);
struct fd_event *fde;
+ epoll_check_reopen(std_ev);
+
fde = talloc(mem_ctx?mem_ctx:ev, struct fd_event);
if (!fde) return NULL;
fde->flags = flags;
+ epoll_check_reopen(std_ev);
+
epoll_change_event(std_ev, fde);
}
return 0;
}
+ epoll_check_reopen(std_ev);
+
if (epoll_event_loop(std_ev, &tval) == 0) {
return 0;
}