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.

     1 /* This Source Code Form is subject to the terms of the Mozilla Public
     2 * License, v. 2.0. If a copy of the MPL was not distributed with this
     3 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
     5 #include "PSMRunnable.h"
     7 namespace mozilla { namespace psm {
     9 SyncRunnableBase::SyncRunnableBase()
    10   : monitor("SyncRunnableBase::monitor")
    11 {
    12 }
    14 nsresult
    15 SyncRunnableBase::DispatchToMainThreadAndWait()
    16 {
    17   nsresult rv;
    18   if (NS_IsMainThread()) {
    19     RunOnTargetThread();
    20     rv = NS_OK;
    21   } else {
    22     mozilla::MonitorAutoLock lock(monitor);
    23     rv = NS_DispatchToMainThread(this);
    24     if (NS_SUCCEEDED(rv)) {
    25       lock.Wait();
    26     }
    27   }
    29   return rv;
    30 }
    32 NS_IMETHODIMP
    33 SyncRunnableBase::Run()
    34 {
    35   RunOnTargetThread();
    36   mozilla::MonitorAutoLock(monitor).Notify();
    37   return NS_OK;
    38 }
    40 nsresult
    41 NotifyObserverRunnable::Run()
    42 {
    43   mObserver->Observe(nullptr, mTopic, nullptr);
    44   return NS_OK;
    45 }
    47 } } // namespace mozilla::psm

mercurial