1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

forkfd: Add support for eventfd(2) in FreeBSD

Browse Source 
Drive-by make the code slightly nicer.

Change-Id: Idd5e1bb52be047d7b4fffffd174db9162cf697a4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Thiago Macieira 2023-03-18 21:54:59 -07:00
parent 4e2f8bad0a
commit 533a0d5e54
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/3rdparty/forkfd/forkfd.c vendored
View File

@ -72,6 +72,10 @@
# undef HAVE_WAITID # undef HAVE_WAITID
#endif #endif
#if (defined(__FreeBSD__) && defined(__FreeBSD_version) && __FreeBSD_version >= 1300000)
# include <sys/eventfd.h>
# define HAVE_EVENTFD 1
#endif
#if (defined(__FreeBSD__) && defined(__FreeBSD_version) && __FreeBSD_version >= 1000032) || \ #if (defined(__FreeBSD__) && defined(__FreeBSD_version) && __FreeBSD_version >= 1000032) || \
(defined(__OpenBSD__) && OpenBSD >= 201505) || \ (defined(__OpenBSD__) && OpenBSD >= 201505) || \
(defined(__NetBSD__) && __NetBSD_Version__ >= 600000000) (defined(__NetBSD__) && __NetBSD_Version__ >= 600000000)
@ -605,9 +609,7 @@ static int forkfd_fork_fallback(int flags, pid_t *ppid)
int death_pipe[2]; int death_pipe[2];
int sync_pipe[2]; int sync_pipe[2];
int ret; int ret;
#ifdef __linux__ int efd = -1;
int efd;
#endif
(void) pthread_once(&forkfd_initialization, forkfd_initialize); (void) pthread_once(&forkfd_initialization, forkfd_initialize);
@ -624,9 +626,8 @@ static int forkfd_fork_fallback(int flags, pid_t *ppid)
#ifdef HAVE_EVENTFD #ifdef HAVE_EVENTFD
/* try using an eventfd, which consumes less resources */ /* try using an eventfd, which consumes less resources */
efd = eventfd(0, EFD_CLOEXEC); efd = eventfd(0, EFD_CLOEXEC);
if (efd == -1)
#endif #endif
{ if (efd == -1) {
/* try a pipe */ /* try a pipe */
if (create_pipe(sync_pipe, FFD_CLOEXEC) == -1) { if (create_pipe(sync_pipe, FFD_CLOEXEC) == -1) {
/* failed both at eventfd and pipe; fail and pass errno */ /* failed both at eventfd and pipe; fail and pass errno */
@ -653,14 +654,13 @@ static int forkfd_fork_fallback(int flags, pid_t *ppid)
if (pid == 0) { if (pid == 0) {
/* this is the child process */ /* this is the child process */
/* first, wait for the all clear */ /* first, wait for the all clear */
#ifdef HAVE_EVENTFD
if (efd != -1) { if (efd != -1) {
#ifdef HAVE_EVENTFD
eventfd_t val64; eventfd_t val64;
EINTR_LOOP(ret, eventfd_read(efd, &val64)); EINTR_LOOP(ret, eventfd_read(efd, &val64));
EINTR_LOOP(ret, close(efd)); EINTR_LOOP(ret, close(efd));
} else
#endif #endif
{ } else {
char c; char c;
EINTR_LOOP(ret, close(sync_pipe[1])); EINTR_LOOP(ret, close(sync_pipe[1]));
EINTR_LOOP(ret, read(sync_pipe[0], &c, sizeof c)); EINTR_LOOP(ret, read(sync_pipe[0], &c, sizeof c));