Backed out changeset 091c5613b5cf (bug 1370644) for failing GTest XPCOMDeadlockDetectorTest.XPCOMSanity3DeathTest | Death test: Sanity3_Child(). r=backout
authorSebastian Hengst <archaeopteryx@coole-files.de>
Sat, 10 Jun 2017 10:34:03 +0200
changeset 413857 25b03b08f551411d7618232028584d66498d5bba
parent 413856 3955d49d5cd776dfb0849ce44fd7975e49fc34f8
child 413858 b7e57100a79cc71dba99280b3a2b4aba719d8565
push id1490
push usermtabara@mozilla.com
push dateMon, 31 Jul 2017 14:08:16 +0000
treeherdermozilla-release@70e32e6bf15e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1370644
milestone55.0a1
backs out091c5613b5cfe1e448bd2c93cd2bb4149701ba9f
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 changeset 091c5613b5cf (bug 1370644) for failing GTest XPCOMDeadlockDetectorTest.XPCOMSanity3DeathTest | Death test: Sanity3_Child(). r=backout
xpcom/threads/BlockingResourceBase.cpp
--- a/xpcom/threads/BlockingResourceBase.cpp
+++ b/xpcom/threads/BlockingResourceBase.cpp
@@ -296,22 +296,21 @@ BlockingResourceBase::CheckAcquire()
     fputs("\n###!!! Deadlock may happen NOW!\n\n", stderr);
     out.AppendLiteral("\n###!!! Deadlock may happen NOW!\n\n");
   } else {
     fputs("\nDeadlock may happen for some other execution\n\n",
           stderr);
     out.AppendLiteral("\nDeadlock may happen for some other execution\n\n");
   }
 
-  // Only error out if we think a deadlock is imminent.
-  if (maybeImminent) {
-    NS_ERROR(out.get());
-  } else {
-    NS_WARNING(out.get());
-  }
+  // XXX can customize behavior on whether we /think/ deadlock is
+  // XXX about to happen.  for example:
+  // XXX   if (maybeImminent)
+  //           NS_RUNTIMEABORT(out.get());
+  NS_ERROR(out.get());
 }
 
 
 void
 BlockingResourceBase::Acquire()
 {
   if (mType == eCondVar) {
     NS_NOTYETIMPLEMENTED(