From f86cd2d8b1fcc71f4019a5af317dd6ebb4a7aba8 Mon Sep 17 00:00:00 2001 From: Randell Jesup Date: Tue, 11 Dec 2012 12:54:24 -0500 Subject: [PATCH] Bug 752657: backout sigslot multithreaded due to deadlocks rs=jesup --- media/mtransport/build/Makefile.in | 2 -- media/mtransport/sigslot.h | 3 +++ media/webrtc/signaling/signaling.gyp | 1 - netwerk/sctp/datachannel/Makefile.in | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/media/mtransport/build/Makefile.in b/media/mtransport/build/Makefile.in index 32eb2377f13a..7eb850b58943 100644 --- a/media/mtransport/build/Makefile.in +++ b/media/mtransport/build/Makefile.in @@ -24,8 +24,6 @@ SRCS_IN_OBJDIR = 1 EXPORTS_NAMESPACES = mtransport -DEFINES += -DSIGSLOT_USE_POSIX_THREADS=1 - EXPORTS_mtransport = \ ../dtlsidentity.h \ ../nricectx.h \ diff --git a/media/mtransport/sigslot.h b/media/mtransport/sigslot.h index ccef223c2ba6..125299e13cd6 100644 --- a/media/mtransport/sigslot.h +++ b/media/mtransport/sigslot.h @@ -91,6 +91,9 @@ #include #include +// On our copy of sigslot.h, we set single threading as default. +#define SIGSLOT_DEFAULT_MT_POLICY single_threaded + #if defined(SIGSLOT_PURE_ISO) || (!defined(WIN32) && !defined(__GNUG__) && !defined(SIGSLOT_USE_POSIX_THREADS)) # define _SIGSLOT_SINGLE_THREADED #elif defined(WIN32) diff --git a/media/webrtc/signaling/signaling.gyp b/media/webrtc/signaling/signaling.gyp index 7879d18add82..34c335a1bd67 100644 --- a/media/webrtc/signaling/signaling.gyp +++ b/media/webrtc/signaling/signaling.gyp @@ -162,7 +162,6 @@ 'HAVE_UINT16_T=1', 'HAVE_UINT32_T=1', 'HAVE_UINT64_T=1', - 'SIGSLOT_USE_POSIX_THREADS=1', ], 'cflags_mozilla': [ diff --git a/netwerk/sctp/datachannel/Makefile.in b/netwerk/sctp/datachannel/Makefile.in index f29dbb4df92c..c642194386f8 100644 --- a/netwerk/sctp/datachannel/Makefile.in +++ b/netwerk/sctp/datachannel/Makefile.in @@ -40,7 +40,6 @@ DEFINES = \ -DINET=1 \ -DINET6=1 \ -DSCTP_DEBUG=1 \ - -DSIGSLOT_USE_POSIX_THREADS=1 \ $(NULL) ifeq ($(OS_TARGET),WINNT)