Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(714)

Side by Side Diff: nss/mozilla/nsprpub/pr/src/pthreads/ptthread.c

Issue 3135002: Update to NSS 3.12.7 and NSPR 4.8.6.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/
Patch Set: Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ 1 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
2 /* ***** BEGIN LICENSE BLOCK ***** 2 /* ***** BEGIN LICENSE BLOCK *****
3 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 3 * Version: MPL 1.1/GPL 2.0/LGPL 2.1
4 * 4 *
5 * The contents of this file are subject to the Mozilla Public License Version 5 * The contents of this file are subject to the Mozilla Public License Version
6 * 1.1 (the "License"); you may not use this file except in compliance with 6 * 1.1 (the "License"); you may not use this file except in compliance with
7 * the License. You may obtain a copy of the License at 7 * the License. You may obtain a copy of the License at
8 * http://www.mozilla.org/MPL/ 8 * http://www.mozilla.org/MPL/
9 * 9 *
10 * Software distributed under the License is distributed on an "AS IS" basis, 10 * Software distributed under the License is distributed on an "AS IS" basis,
(...skipping 734 matching lines...) Expand 10 before | Expand all | Expand 10 after
745 PRCondVar *cv; 745 PRCondVar *cv;
746 PR_ASSERT(NULL != thred); 746 PR_ASSERT(NULL != thred);
747 if (NULL == thred) return PR_FAILURE; 747 if (NULL == thred) return PR_FAILURE;
748 748
749 thred->state |= PT_THREAD_ABORTED; 749 thred->state |= PT_THREAD_ABORTED;
750 750
751 cv = thred->waiting; 751 cv = thred->waiting;
752 if ((NULL != cv) && !thred->interrupt_blocked) 752 if ((NULL != cv) && !thred->interrupt_blocked)
753 { 753 {
754 PRIntn rv; 754 PRIntn rv;
755 (void)PR_AtomicIncrement(&cv->notify_pending); 755 (void)PR_ATOMIC_INCREMENT(&cv->notify_pending);
756 rv = pthread_cond_broadcast(&cv->cv); 756 rv = pthread_cond_broadcast(&cv->cv);
757 PR_ASSERT(0 == rv); 757 PR_ASSERT(0 == rv);
758 if (0 > PR_AtomicDecrement(&cv->notify_pending)) 758 if (0 > PR_ATOMIC_DECREMENT(&cv->notify_pending))
759 PR_DestroyCondVar(cv); 759 PR_DestroyCondVar(cv);
760 } 760 }
761 return PR_SUCCESS; 761 return PR_SUCCESS;
762 } /* PR_Interrupt */ 762 } /* PR_Interrupt */
763 763
764 PR_IMPLEMENT(void) PR_ClearInterrupt(void) 764 PR_IMPLEMENT(void) PR_ClearInterrupt(void)
765 { 765 {
766 PRThread *me = PR_GetCurrentThread(); 766 PRThread *me = PR_GetCurrentThread();
767 me->state &= ~PT_THREAD_ABORTED; 767 me->state &= ~PT_THREAD_ABORTED;
768 } /* PR_ClearInterrupt */ 768 } /* PR_ClearInterrupt */
(...skipping 892 matching lines...) Expand 10 before | Expand all | Expand 10 after
1661 top_sp = *(char**)(thread_tcb + 128); 1661 top_sp = *(char**)(thread_tcb + 128);
1662 PR_LOG(_pr_gc_lm, PR_LOG_ALWAYS, ("End PR_GetSP %p \n", top_sp)); 1662 PR_LOG(_pr_gc_lm, PR_LOG_ALWAYS, ("End PR_GetSP %p \n", top_sp));
1663 return top_sp; 1663 return top_sp;
1664 } /* PR_GetSP */ 1664 } /* PR_GetSP */
1665 1665
1666 #endif /* !defined(_PR_DCETHREADS) */ 1666 #endif /* !defined(_PR_DCETHREADS) */
1667 1667
1668 #endif /* defined(_PR_PTHREADS) || defined(_PR_DCETHREADS) */ 1668 #endif /* defined(_PR_PTHREADS) || defined(_PR_DCETHREADS) */
1669 1669
1670 /* ptthread.c */ 1670 /* ptthread.c */
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698