security/manager/ssl/src/nsPSMBackgroundThread.cpp@141e0f1194b1 (annotated)
security/manager/ssl/src/nsPSMBackgroundThread.cpp
Wed, 31 Dec 2014 07:16:47 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Wed, 31 Dec 2014 07:16:47 +0100
- branch
- TOR_BUG_9701
- changeset 3
- 141e0f1194b1
- permissions
- -rw-r--r--
Revert simplistic fix pending revisit of Mozilla integration attempt.
| michael@0 | 1 | /* This Source Code Form is subject to the terms of the Mozilla Public |
| michael@0 | 2 | * License, v. 2.0. If a copy of the MPL was not distributed with this |
| michael@0 | 3 | * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
| michael@0 | 4 | |
| michael@0 | 5 | #include "nsPSMBackgroundThread.h" |
| michael@0 | 6 | #include "nsThreadUtils.h" |
| michael@0 | 7 | |
| michael@0 | 8 | using namespace mozilla; |
| michael@0 | 9 | |
| michael@0 | 10 | void nsPSMBackgroundThread::nsThreadRunner(void *arg) |
| michael@0 | 11 | { |
| michael@0 | 12 | nsPSMBackgroundThread *self = static_cast<nsPSMBackgroundThread *>(arg); |
| michael@0 | 13 | PR_SetCurrentThreadName(self->mName.BeginReading()); |
| michael@0 | 14 | self->Run(); |
| michael@0 | 15 | } |
| michael@0 | 16 | |
| michael@0 | 17 | nsPSMBackgroundThread::nsPSMBackgroundThread() |
| michael@0 | 18 | : mThreadHandle(nullptr), |
| michael@0 | 19 | mMutex("nsPSMBackgroundThread.mMutex"), |
| michael@0 | 20 | mCond(mMutex, "nsPSMBackgroundThread.mCond"), |
| michael@0 | 21 | mExitState(ePSMThreadRunning) |
| michael@0 | 22 | { |
| michael@0 | 23 | } |
| michael@0 | 24 | |
| michael@0 | 25 | nsresult nsPSMBackgroundThread::startThread(const nsCSubstring & name) |
| michael@0 | 26 | { |
| michael@0 | 27 | mName = name; |
| michael@0 | 28 | |
| michael@0 | 29 | mThreadHandle = PR_CreateThread(PR_USER_THREAD, nsThreadRunner, static_cast<void*>(this), |
| michael@0 | 30 | PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_JOINABLE_THREAD, 0); |
| michael@0 | 31 | |
| michael@0 | 32 | NS_ASSERTION(mThreadHandle, "Could not create nsPSMBackgroundThread\n"); |
| michael@0 | 33 | |
| michael@0 | 34 | if (!mThreadHandle) |
| michael@0 | 35 | return NS_ERROR_OUT_OF_MEMORY; |
| michael@0 | 36 | |
| michael@0 | 37 | return NS_OK; |
| michael@0 | 38 | } |
| michael@0 | 39 | |
| michael@0 | 40 | nsPSMBackgroundThread::~nsPSMBackgroundThread() |
| michael@0 | 41 | { |
| michael@0 | 42 | } |
| michael@0 | 43 | |
| michael@0 | 44 | bool |
| michael@0 | 45 | nsPSMBackgroundThread::exitRequested(const MutexAutoLock & /*proofOfLock*/) const |
| michael@0 | 46 | { |
| michael@0 | 47 | return exitRequestedNoLock(); |
| michael@0 | 48 | } |
| michael@0 | 49 | |
| michael@0 | 50 | nsresult |
| michael@0 | 51 | nsPSMBackgroundThread::postStoppedEventToMainThread( |
| michael@0 | 52 | MutexAutoLock const & /*proofOfLock*/) |
| michael@0 | 53 | { |
| michael@0 | 54 | NS_ASSERTION(PR_GetCurrentThread() == mThreadHandle, |
| michael@0 | 55 | "Background thread stopped from another thread"); |
| michael@0 | 56 | |
| michael@0 | 57 | mExitState = ePSMThreadStopped; |
| michael@0 | 58 | // requestExit is waiting for an event, so give it one. |
| michael@0 | 59 | return NS_DispatchToMainThread(new nsRunnable()); |
| michael@0 | 60 | } |
| michael@0 | 61 | |
| michael@0 | 62 | void nsPSMBackgroundThread::requestExit() |
| michael@0 | 63 | { |
| michael@0 | 64 | NS_ASSERTION(NS_IsMainThread(), |
| michael@0 | 65 | "nsPSMBackgroundThread::requestExit called off main thread."); |
| michael@0 | 66 | |
| michael@0 | 67 | if (!mThreadHandle) |
| michael@0 | 68 | return; |
| michael@0 | 69 | |
| michael@0 | 70 | { |
| michael@0 | 71 | MutexAutoLock threadLock(mMutex); |
| michael@0 | 72 | if (mExitState < ePSMThreadStopRequested) { |
| michael@0 | 73 | mExitState = ePSMThreadStopRequested; |
| michael@0 | 74 | mCond.NotifyAll(); |
| michael@0 | 75 | } |
| michael@0 | 76 | } |
| michael@0 | 77 | |
| michael@0 | 78 | nsCOMPtr<nsIThread> mainThread = do_GetCurrentThread(); |
| michael@0 | 79 | for (;;) { |
| michael@0 | 80 | { |
| michael@0 | 81 | MutexAutoLock threadLock(mMutex); |
| michael@0 | 82 | if (mExitState == ePSMThreadStopped) |
| michael@0 | 83 | break; |
| michael@0 | 84 | } |
| michael@0 | 85 | NS_ProcessPendingEvents(mainThread, PR_MillisecondsToInterval(50)); |
| michael@0 | 86 | } |
| michael@0 | 87 | |
| michael@0 | 88 | PR_JoinThread(mThreadHandle); |
| michael@0 | 89 | mThreadHandle = nullptr; |
| michael@0 | 90 | } |
