Backed out 2 debugging changesets (bug 916757) to avoid uplifting, now the failures have been identified; CLOSED TREE FIREFOX_AURORA_26_BASE
authorEhsan Akhgari <ehsan@mozilla.com>
Tue, 17 Sep 2013 07:42:40 -0400
changeset 147372 2520866d58740851d862c7c59246a4e3f8b4a176
parent 147371 1d27c4c9871f357612afd79c452ffcde5cbeee69
child 147373 08b109ed1183b76b469f0630e540b258a15a7c18
push idunknown
push userunknown
push dateunknown
bugs916757
milestone26.0a1
Backed out 2 debugging changesets (bug 916757) to avoid uplifting, now the failures have been identified; CLOSED TREE Backed out changeset 1713de744990 (bug 916757) Backed out changeset 861e1c86d759 (bug 916757)
nsprpub/pr/src/md/windows/w95cv.c
nsprpub/pr/src/md/windows/w95thred.c
--- a/nsprpub/pr/src/md/windows/w95cv.c
+++ b/nsprpub/pr/src/md/windows/w95cv.c
@@ -13,18 +13,16 @@
  *  We use a deferred condition notify algorithm.  When PR_NotifyCondVar
  *  or PR_NotifyAllCondVar is called, the condition notifies are simply
  *  recorded in the _MDLock structure.  We defer the condition notifies
  *  until right after we unlock the lock.  This way the awakened threads
  *  have a better chance to reaquire the lock.
  */
  
 #include "primpl.h"
-#include <stdio.h>
-#include <windows.h>
 
 /*
  * AddThreadToCVWaitQueueInternal --
  *
  * Add the thread to the end of the condition variable's wait queue.
  * The CV's lock must be locked when this function is called.
  */
 
@@ -147,20 +145,16 @@ md_UnlockAndPostNotifies(
             thred = notified->cv[index].notifyHead;
             while (thred != NULL) {
                 BOOL rv;
 
                 next = thred->md.next;
                 thred->md.prev = thred->md.next = NULL;
 
                 rv = ReleaseSemaphore(thred->md.blocked_sema, 1, NULL);
-                if (!rv) {
-                    fprintf(stderr, "ReleaseSemaphore failed, handle: %x, last error: %x\n",
-                            (void*)thred->md.blocked_sema, GetLastError());
-                }
                 PR_ASSERT(rv != 0);
                 thred = next;
             }
         }
         prev = notified;
         notified = notified->link;
         if (&post != prev) PR_DELETE(prev);
     } while (NULL != notified);
@@ -247,20 +241,16 @@ void _PR_MD_WAIT_CV(_MDCVar *cv, _MDLock
         md_UnlockAndPostNotifies(lock, thred, cv);
     } else {
         AddThreadToCVWaitQueueInternal(thred, cv);
         LeaveCriticalSection(&lock->mutex);
     }
 
     /* Wait for notification or timeout; don't really care which */
     rv = WaitForSingleObject(thred->md.blocked_sema, msecs);
-    if (rv == WAIT_FAILED) {
-        fprintf(stderr, "WaitForSingleObject failed, handle: %x, last error: %x\n",
-                (void*)thred->md.blocked_sema, GetLastError());
-    }
 
     EnterCriticalSection(&(lock->mutex));
 
     PR_ASSERT(rv != WAIT_ABANDONED);
     PR_ASSERT(rv != WAIT_FAILED);
     PR_ASSERT(rv != WAIT_OBJECT_0 || thred->md.inCVWaitQueue == PR_FALSE);
 
     if (rv == WAIT_TIMEOUT) {
--- a/nsprpub/pr/src/md/windows/w95thred.c
+++ b/nsprpub/pr/src/md/windows/w95thred.c
@@ -1,17 +1,15 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 #include "primpl.h"
 #include <process.h>  /* for _beginthreadex() */
-#include <stdio.h>
-#include <windows.h>
 
 #if defined(_MSC_VER) && _MSC_VER <= 1200
 /*
  * VC++ 6.0 doesn't have DWORD_PTR.
  */
 
 typedef DWORD DWORD_PTR;
 #endif /* _MSC_VER <= 1200 */
@@ -214,20 +212,16 @@ void
     if (thread->md.blocked_sema) {
         rv = CloseHandle(thread->md.blocked_sema);
         PR_ASSERT(rv);
         thread->md.blocked_sema = 0;
     }
 
     if (thread->md.handle) {
         rv = CloseHandle(thread->md.handle);
-        if (!rv) {
-          fprintf(stderr, "CloseHandle failed, handle: %x, last error: %x\n",
-                  (void*)thread->md.handle, GetLastError());
-        }
         PR_ASSERT(rv);
         thread->md.handle = 0;
     }
 }
 
 void
 _PR_MD_EXIT_THREAD(PRThread *thread)
 {