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

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

Issue 650104: Update to NSS_3_12_6_RC1 and NSPR_4_8_4_RTM. (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/
Patch Set: Created 10 years, 10 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
« no previous file with comments | « nss/mozilla/nsprpub/pr/src/misc/prinit.c ('k') | nss/mozilla/security/nss/lib/nss/nss.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1028 matching lines...) Expand 10 before | Expand all | Expand 10 after
1039 { 1039 {
1040 PR_Lock(pt_book.ml); 1040 PR_Lock(pt_book.ml);
1041 while (pt_book.user > pt_book.this_many) 1041 while (pt_book.user > pt_book.this_many)
1042 PR_WaitCondVar(pt_book.cv, PR_INTERVAL_NO_TIMEOUT); 1042 PR_WaitCondVar(pt_book.cv, PR_INTERVAL_NO_TIMEOUT);
1043 if (me->state & PT_THREAD_SYSTEM) 1043 if (me->state & PT_THREAD_SYSTEM)
1044 pt_book.system -= 1; 1044 pt_book.system -= 1;
1045 else 1045 else
1046 pt_book.user -= 1; 1046 pt_book.user -= 1;
1047 PR_Unlock(pt_book.ml); 1047 PR_Unlock(pt_book.ml);
1048 1048
1049 _PR_MD_EARLY_CLEANUP();
1050
1049 _PR_CleanupMW(); 1051 _PR_CleanupMW();
1050 _PR_CleanupTime(); 1052 _PR_CleanupTime();
1051 _PR_CleanupDtoa(); 1053 _PR_CleanupDtoa();
1052 _PR_CleanupCallOnce(); 1054 _PR_CleanupCallOnce();
1053 _PR_ShutdownLinker(); 1055 _PR_ShutdownLinker();
1054 _PR_LogCleanup(); 1056 _PR_LogCleanup();
1055 _PR_CleanupNet(); 1057 _PR_CleanupNet();
1056 /* Close all the fd's before calling _PR_CleanupIO */ 1058 /* Close all the fd's before calling _PR_CleanupIO */
1057 _PR_CleanupIO(); 1059 _PR_CleanupIO();
1058 _PR_CleanupCMon(); 1060 _PR_CleanupCMon();
(...skipping 600 matching lines...) Expand 10 before | Expand all | Expand 10 after
1659 top_sp = *(char**)(thread_tcb + 128); 1661 top_sp = *(char**)(thread_tcb + 128);
1660 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));
1661 return top_sp; 1663 return top_sp;
1662 } /* PR_GetSP */ 1664 } /* PR_GetSP */
1663 1665
1664 #endif /* !defined(_PR_DCETHREADS) */ 1666 #endif /* !defined(_PR_DCETHREADS) */
1665 1667
1666 #endif /* defined(_PR_PTHREADS) || defined(_PR_DCETHREADS) */ 1668 #endif /* defined(_PR_PTHREADS) || defined(_PR_DCETHREADS) */
1667 1669
1668 /* ptthread.c */ 1670 /* ptthread.c */
OLDNEW
« no previous file with comments | « nss/mozilla/nsprpub/pr/src/misc/prinit.c ('k') | nss/mozilla/security/nss/lib/nss/nss.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698