Bug 752657: backout sigslot multithreaded due to deadlocks rs=jesup

2024-10-09 19:35:51 +00:00 · 2012-12-11 12:54:24 -05:00 · 2012-12-11 12:54:24 -05:00 · f86cd2d8b1
commit f86cd2d8b1
parent c9d74f3233
4 changed files with 3 additions and 4 deletions
--- 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 \
--- a/media/mtransport/sigslot.h
+++ b/media/mtransport/sigslot.h
@ -91,6 +91,9 @@
 #include <set>
 #include <stdlib.h>

+// 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)
--- 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': [
--- 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)