Backed out changeset e38313bed466 (bug 1746488) for causing mochitest failures on Mutex_posix.cpp CLOSED TREE

xpcom/io/NonBlockingAsyncInputStream.cpp

@@ -185,7 +185,6 @@ NonBlockingAsyncInputStream::Available(uint64_t* aLength) {
 
   // Nothing more to read. Let's close the stream now.
   if (*aLength == 0) {
-    MutexAutoLock lock(mLock);
     mInputStream->Close();
     mClosed = true;
     return NS_BASE_STREAM_CLOSED;

xpcom/io/nsMultiplexInputStream.cpp

@@ -132,9 +132,9 @@ class nsMultiplexInputStream final : public nsIMultiplexInputStream,
                             const char* aFromRawSegment, uint32_t aToOffset,
                             uint32_t aCount, uint32_t* aWriteCount);
 
-  bool IsSeekable();
-  bool IsIPCSerializable();
-  bool IsCloneable();
+  bool IsSeekable() const;
+  bool IsIPCSerializable() const;
+  bool IsCloneable() const;
   bool IsAsyncInputStream() const;
   bool IsInputStreamLength() const;
   bool IsAsyncInputStreamLength() const;
@@ -158,9 +158,9 @@ class nsMultiplexInputStream final : public nsIMultiplexInputStream,
   uint32_t mSeekableStreams;
   uint32_t mIPCSerializableStreams;
   uint32_t mCloneableStreams;
-  Atomic<uint32_t, Relaxed> mAsyncInputStreams;
-  Atomic<uint32_t, Relaxed> mInputStreamLengths;
-  Atomic<uint32_t, Relaxed> mAsyncInputStreamLengths;
+  uint32_t mAsyncInputStreams;
+  uint32_t mInputStreamLengths;
+  uint32_t mAsyncInputStreamLengths;
 };
 
 NS_IMPL_ADDREF(nsMultiplexInputStream)
@@ -866,10 +866,10 @@ nsresult nsMultiplexInputStream::AsyncWaitInternal() {
     asyncWaitFlags = mAsyncWaitFlags;
     asyncWaitRequestedCount = mAsyncWaitRequestedCount;
     asyncWaitEventTarget = mAsyncWaitEventTarget;
-
-    MOZ_ASSERT_IF(stream, NS_SUCCEEDED(mStatus));
   }
 
+  MOZ_ASSERT_IF(stream, NS_SUCCEEDED(mStatus));
+
   // If we are here it's because we are already closed, or if the current stream
   // is not async. In both case we have to execute the callback.
   if (!stream) {
@@ -1035,7 +1035,6 @@ bool nsMultiplexInputStream::Deserialize(
     }
   }
 
-  MutexAutoLock lock(mLock);
   mCurrentStream = params.currentStream();
   mStatus = params.status();
   mStartedReadingCurrent = params.startedReadingCurrent();
@@ -1421,18 +1420,15 @@ void nsMultiplexInputStream::UpdateQIMap(StreamData& aStream) {
 
 #undef MAYBE_UPDATE_VALUE
 
-bool nsMultiplexInputStream::IsSeekable() {
-  MutexAutoLock lock(mLock);
+bool nsMultiplexInputStream::IsSeekable() const {
   return mStreams.Length() == mSeekableStreams;
 }
 
-bool nsMultiplexInputStream::IsIPCSerializable() {
-  MutexAutoLock lock(mLock);
+bool nsMultiplexInputStream::IsIPCSerializable() const {
   return mStreams.Length() == mIPCSerializableStreams;
 }
 
-bool nsMultiplexInputStream::IsCloneable() {
-  MutexAutoLock lock(mLock);
+bool nsMultiplexInputStream::IsCloneable() const {
   return mStreams.Length() == mCloneableStreams;
 }