From cb7d64170d62c9cda11ced7e5047070af678338b Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 11 Sep 2012 15:53:17 +0200 Subject: Centralise handling & ignoring of SIGPIPE in qcore_unix_p.h We had two instances of this function in the Qt source code, one clearly a copy of the other, so both had the same thread-safety issue. Instead, let's have one copy and have both write_nosignal() and sendto() call them. Q_NO_POSIX_SIGNALS is also gone. It was only used with Symbian. Change-Id: I0f1354a8e9df8e6b10a02f86a940e3c6d1222087 Reviewed-by: Peter Hartmann Reviewed-by: Shane Kearns --- src/corelib/kernel/qcore_unix_p.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'src/corelib/kernel/qcore_unix_p.h') diff --git a/src/corelib/kernel/qcore_unix_p.h b/src/corelib/kernel/qcore_unix_p.h index dc946a88e9..fa84710247 100644 --- a/src/corelib/kernel/qcore_unix_p.h +++ b/src/corelib/kernel/qcore_unix_p.h @@ -54,11 +54,13 @@ // #include "qplatformdefs.h" +#include "qatomic.h" #ifndef Q_OS_UNIX # error "qcore_unix_p.h included on a non-Unix system" #endif +#include #include #include #include @@ -143,6 +145,22 @@ inline timeval operator*(const timeval &t1, int mul) return normalizedTimeval(tmp); } +inline void qt_ignore_sigpipe() +{ + // Set to ignore SIGPIPE once only. + static QBasicAtomicInt atom = Q_BASIC_ATOMIC_INITIALIZER(0); + if (!atom.load()) { + // More than one thread could turn off SIGPIPE at the same time + // But that's acceptable because they all would be doing the same + // action + struct sigaction noaction; + memset(&noaction, 0, sizeof(noaction)); + noaction.sa_handler = SIG_IGN; + ::sigaction(SIGPIPE, &noaction, 0); + atom.store(1); + } +} + // don't call QT_OPEN or ::open // call qt_safe_open static inline int qt_safe_open(const char *pathname, int flags, mode_t mode = 0777) @@ -265,6 +283,12 @@ static inline qint64 qt_safe_write(int fd, const void *data, qint64 len) #undef QT_WRITE #define QT_WRITE qt_safe_write +static inline qint64 qt_safe_write_nosignal(int fd, const void *data, qint64 len) +{ + qt_ignore_sigpipe(); + return qt_safe_write(fd, data, len); +} + static inline int qt_safe_close(int fd) { register int ret; -- cgit v1.2.3