security/manager/ssl/src/PSMRunnable.cpp@141e0f1194b1 (annotated)
security/manager/ssl/src/PSMRunnable.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 "PSMRunnable.h" |
| michael@0 | 6 | |
| michael@0 | 7 | namespace mozilla { namespace psm { |
| michael@0 | 8 | |
| michael@0 | 9 | SyncRunnableBase::SyncRunnableBase() |
| michael@0 | 10 | : monitor("SyncRunnableBase::monitor") |
| michael@0 | 11 | { |
| michael@0 | 12 | } |
| michael@0 | 13 | |
| michael@0 | 14 | nsresult |
| michael@0 | 15 | SyncRunnableBase::DispatchToMainThreadAndWait() |
| michael@0 | 16 | { |
| michael@0 | 17 | nsresult rv; |
| michael@0 | 18 | if (NS_IsMainThread()) { |
| michael@0 | 19 | RunOnTargetThread(); |
| michael@0 | 20 | rv = NS_OK; |
| michael@0 | 21 | } else { |
| michael@0 | 22 | mozilla::MonitorAutoLock lock(monitor); |
| michael@0 | 23 | rv = NS_DispatchToMainThread(this); |
| michael@0 | 24 | if (NS_SUCCEEDED(rv)) { |
| michael@0 | 25 | lock.Wait(); |
| michael@0 | 26 | } |
| michael@0 | 27 | } |
| michael@0 | 28 | |
| michael@0 | 29 | return rv; |
| michael@0 | 30 | } |
| michael@0 | 31 | |
| michael@0 | 32 | NS_IMETHODIMP |
| michael@0 | 33 | SyncRunnableBase::Run() |
| michael@0 | 34 | { |
| michael@0 | 35 | RunOnTargetThread(); |
| michael@0 | 36 | mozilla::MonitorAutoLock(monitor).Notify(); |
| michael@0 | 37 | return NS_OK; |
| michael@0 | 38 | } |
| michael@0 | 39 | |
| michael@0 | 40 | nsresult |
| michael@0 | 41 | NotifyObserverRunnable::Run() |
| michael@0 | 42 | { |
| michael@0 | 43 | mObserver->Observe(nullptr, mTopic, nullptr); |
| michael@0 | 44 | return NS_OK; |
| michael@0 | 45 | } |
| michael@0 | 46 | |
| michael@0 | 47 | } } // namespace mozilla::psm |
