Backed out 2 changesets (bug 1516325) for xpcshell failures in netwerk/test/unit/test_udpsocket.js. CLOSED TREE
authorDorel Luca <dluca@mozilla.com>
Wed, 06 Mar 2019 20:51:39 +0200
changeset 520550 007f59cfee3b8ab36730b7ee50d658fa714b663c
parent 520549 19d2e4ea75cfc67ad9a43fb704d91a7a485ea3bb
child 520551 32412e6eb5511f3f551aad5be3e38ec1acbb2f3f
push id10862
push userffxbld-merge
push dateMon, 11 Mar 2019 13:01:11 +0000
treeherdermozilla-beta@a2e7f5c935da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1516325
milestone67.0a1
backs out7f9508dc59e1de519714e91cbc105be5eae4f402
28eb88277ffc9e46be47920ceed45bde884b5854
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out 2 changesets (bug 1516325) for xpcshell failures in netwerk/test/unit/test_udpsocket.js. CLOSED TREE Backed out changeset 7f9508dc59e1 (bug 1516325) Backed out changeset 28eb88277ffc (bug 1516325)
config/external/nspr/pr/moz.build
netwerk/base/PollableEvent.cpp
netwerk/base/PollableEvent.h
netwerk/base/nsSocketTransportService2.cpp
--- a/config/external/nspr/pr/moz.build
+++ b/config/external/nspr/pr/moz.build
@@ -48,17 +48,16 @@ elif CONFIG['OS_TARGET'] == 'Darwin':
         DEFINES.update(
             HAS_CONNECTX=True,
         )
     DEFINES.update(
         DARWIN=True,
         HAVE_BSD_FLOCK=True,
         HAVE_SOCKLEN_T=True,
         HAVE_POINTER_LOCALTIME_R=True,
-        _PR_POLL_AVAILABLE=True,
     )
     SOURCES += [
         '/nsprpub/pr/src/md/unix/darwin.c',
         '/nsprpub/pr/src/md/unix/os_Darwin.s',
     ]
     if not CONFIG['MOZ_IOS']:
         DEFINES['HAVE_CRT_EXTERNS_H'] = True
 elif CONFIG['OS_TARGET'] == 'SunOS':
--- a/netwerk/base/PollableEvent.cpp
+++ b/netwerk/base/PollableEvent.cpp
@@ -392,17 +392,10 @@ bool PollableEvent::IsSignallingAlive(Ti
 
   TimeDuration delay = (TimeStamp::NowLoRes() - mFirstSignalAfterClear);
   bool timedOut = delay > timeout;
 
   return !timedOut;
 #endif  // DEBUG
 }
 
-#ifdef USEPIPE
-/* static */ const PRInt16 PollableEvent::sPollFlags = PR_POLL_READ;
-#else
-/* static */ const PRInt16 PollableEvent::sPollFlags =
-    PR_POLL_READ | PR_POLL_EXCEPT;
-#endif
-
 }  // namespace net
 }  // namespace mozilla
--- a/netwerk/base/PollableEvent.h
+++ b/netwerk/base/PollableEvent.h
@@ -4,17 +4,16 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef PollableEvent_h__
 #define PollableEvent_h__
 
 #include "mozilla/Mutex.h"
 #include "mozilla/TimeStamp.h"
-#include "prio.h"
 
 namespace mozilla {
 namespace net {
 
 // class must be called locked
 class PollableEvent {
  public:
   PollableEvent();
@@ -39,18 +38,16 @@ class PollableEvent {
   // This returns false on following conditions:
   // - PR_Write has failed
   // - no out_flags were signalled on the socket pair for too long after
   //   the earliest Signal()
   bool IsSignallingAlive(TimeDuration const &timeout);
 
   PRFileDesc *PollableFD() { return mReadFD; }
 
-  static const PRInt16 sPollFlags;
-
  private:
   PRFileDesc *mWriteFD;
   PRFileDesc *mReadFD;
   bool mSignaled;
   // true when PR_Write to the socket pair has failed (status < 1)
   bool mWriteFailed;
   // Set true after AdjustFirstSignalTimestamp() was called
   // Set false after Clear() was called
--- a/netwerk/base/nsSocketTransportService2.cpp
+++ b/netwerk/base/nsSocketTransportService2.cpp
@@ -915,17 +915,17 @@ nsSocketTransportService::Run() {
     //
     if (!mPollableEvent->Valid()) {
       mPollableEvent = nullptr;
       NS_WARNING("running socket transport thread without a pollable event");
       SOCKET_LOG(("running socket transport thread without a pollable event"));
     }
 
     mPollList[0].fd = mPollableEvent ? mPollableEvent->PollableFD() : nullptr;
-    mPollList[0].in_flags = PollableEvent::sPollFlags;
+    mPollList[0].in_flags = PR_POLL_READ | PR_POLL_EXCEPT;
     mPollList[0].out_flags = 0;
   }
 
   mRawThread = NS_GetCurrentThread();
 
   // hook ourselves up to observe event processing for this thread
   nsCOMPtr<nsIThreadInternal> threadInt = do_QueryInterface(mRawThread);
   threadInt->SetObserver(this);
@@ -1696,14 +1696,14 @@ void nsSocketTransportService::TryRepair
   if (!mPollableEvent->Valid()) {
     mPollableEvent = nullptr;
   }
   SOCKET_LOG(
       ("running socket transport thread without "
        "a pollable event now valid=%d",
        !!mPollableEvent));
   mPollList[0].fd = mPollableEvent ? mPollableEvent->PollableFD() : nullptr;
-  mPollList[0].in_flags = PollableEvent::sPollFlags;
+  mPollList[0].in_flags = PR_POLL_READ | PR_POLL_EXCEPT;
   mPollList[0].out_flags = 0;
 }
 
 }  // namespace net
 }  // namespace mozilla