luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 03:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use pipe2 when available

Browse Source 
This avoids a small window for races between pipe and fdset.
Reported in bug 579933 by Thiago Macieira.
This commit is contained in:
Matthias Clasen 2009-06-19 23:44:29 -04:00
parent 854a43a3cd
commit 440bf5bee5
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure.in
View File

@ -559,15 +559,8 @@ AC_HEADER_STDC
# Checks for library functions. # Checks for library functions.
AC_FUNC_VPRINTF AC_FUNC_VPRINTF
AC_FUNC_ALLOCA AC_FUNC_ALLOCA
AC_CHECK_FUNCS(mmap) AC_CHECK_FUNCS(mmap posix_memalign memalign valloc fsync pipe2)
AC_CHECK_FUNCS(posix_memalign) AC_CHECK_FUNCS(atexit on_exit timegm gmtime_r)
AC_CHECK_FUNCS(memalign)
AC_CHECK_FUNCS(valloc)
AC_CHECK_FUNCS(fsync)
AC_CHECK_FUNCS(atexit on_exit)
AC_CHECK_FUNCS(timegm gmtime_r)
AC_CHECK_SIZEOF(char) AC_CHECK_SIZEOF(char)
AC_CHECK_SIZEOF(short) AC_CHECK_SIZEOF(short)

10
glib/gmain.c
View File

@ -46,6 +46,8 @@
#define G_MAIN_POLL_DEBUG #define G_MAIN_POLL_DEBUG
#endif #endif
#define _GNU_SOURCE /* for pipe2 */
#include "glib.h" #include "glib.h"
#include "gthreadprivate.h" #include "gthreadprivate.h"
#include <signal.h> #include <signal.h>
@ -402,12 +404,20 @@ g_main_context_init_pipe (GMainContext *context)
# ifndef G_OS_WIN32 # ifndef G_OS_WIN32
if (context->wake_up_pipe[0] != -1) if (context->wake_up_pipe[0] != -1)
return; return;
#ifdef HAVE_PIPE2
/* if this fails, we fall through and try pipe */
pipe2 (context->wake_up_pipe, O_CLOEXEC);
#endif
if (context->wake_up_pipe[0] == -1)
{
if (pipe (context->wake_up_pipe) < 0) if (pipe (context->wake_up_pipe) < 0)
g_error ("Cannot create pipe main loop wake-up: %s\n", g_error ("Cannot create pipe main loop wake-up: %s\n",
g_strerror (errno)); g_strerror (errno));
fcntl (context->wake_up_pipe[0], F_SETFD, FD_CLOEXEC); fcntl (context->wake_up_pipe[0], F_SETFD, FD_CLOEXEC);
fcntl (context->wake_up_pipe[1], F_SETFD, FD_CLOEXEC); fcntl (context->wake_up_pipe[1], F_SETFD, FD_CLOEXEC);
}
context->wake_up_rec.fd = context->wake_up_pipe[0]; context->wake_up_rec.fd = context->wake_up_pipe[0];
context->wake_up_rec.events = G_IO_IN; context->wake_up_rec.events = G_IO_IN;