mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-06 17:16:12 +00:00
01583602a9
The bulk of this commit was generated with a script, executed at the top
level of a typical source code checkout. The only non-machine-generated
part was modifying MFBT's moz.build to reflect the new naming.
CLOSED TREE makes big refactorings like this a piece of cake.
# The main substitution.
find . -name '*.cpp' -o -name '*.cc' -o -name '*.h' -o -name '*.mm' -o -name '*.idl'| \
xargs perl -p -i -e '
s/nsRefPtr\.h/RefPtr\.h/g; # handle includes
s/nsRefPtr ?</RefPtr</g; # handle declarations and variables
'
# Handle a special friend declaration in gfx/layers/AtomicRefCountedWithFinalize.h.
perl -p -i -e 's/::nsRefPtr;/::RefPtr;/' gfx/layers/AtomicRefCountedWithFinalize.h
# Handle nsRefPtr.h itself, a couple places that define constructors
# from nsRefPtr, and code generators specially. We do this here, rather
# than indiscriminantly s/nsRefPtr/RefPtr/, because that would rename
# things like nsRefPtrHashtable.
perl -p -i -e 's/nsRefPtr/RefPtr/g' \
mfbt/nsRefPtr.h \
xpcom/glue/nsCOMPtr.h \
xpcom/base/OwningNonNull.h \
ipc/ipdl/ipdl/lower.py \
ipc/ipdl/ipdl/builtin.py \
dom/bindings/Codegen.py \
python/lldbutils/lldbutils/utils.py
# In our indiscriminate substitution above, we renamed
# nsRefPtrGetterAddRefs, the class behind getter_AddRefs. Fix that up.
find . -name '*.cpp' -o -name '*.h' -o -name '*.idl' | \
xargs perl -p -i -e 's/nsRefPtrGetterAddRefs/RefPtrGetterAddRefs/g'
if [ -d .git ]; then
git mv mfbt/nsRefPtr.h mfbt/RefPtr.h
else
hg mv mfbt/nsRefPtr.h mfbt/RefPtr.h
fi
--HG--
rename : mfbt/nsRefPtr.h => mfbt/RefPtr.h
147 lines
3.5 KiB
C++
147 lines
3.5 KiB
C++
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "pk11func.h"
|
|
#include "mozilla/DebugOnly.h"
|
|
#include "mozilla/RefPtr.h"
|
|
#include "nsCOMPtr.h"
|
|
#include "PSMRunnable.h"
|
|
#include "nsString.h"
|
|
#include "nsReadableUtils.h"
|
|
#include "nsPKCS11Slot.h"
|
|
#include "nsProtectedAuthThread.h"
|
|
|
|
using namespace mozilla;
|
|
using namespace mozilla::psm;
|
|
|
|
NS_IMPL_ISUPPORTS(nsProtectedAuthThread, nsIProtectedAuthThread)
|
|
|
|
static void nsProtectedAuthThreadRunner(void *arg)
|
|
{
|
|
PR_SetCurrentThreadName("Protected Auth");
|
|
|
|
nsProtectedAuthThread *self = static_cast<nsProtectedAuthThread *>(arg);
|
|
self->Run();
|
|
}
|
|
|
|
nsProtectedAuthThread::nsProtectedAuthThread()
|
|
: mMutex("nsProtectedAuthThread.mMutex")
|
|
, mIAmRunning(false)
|
|
, mLoginReady(false)
|
|
, mThreadHandle(nullptr)
|
|
, mSlot(0)
|
|
, mLoginResult(SECFailure)
|
|
{
|
|
}
|
|
|
|
nsProtectedAuthThread::~nsProtectedAuthThread()
|
|
{
|
|
}
|
|
|
|
NS_IMETHODIMP nsProtectedAuthThread::Login(nsIObserver *aObserver)
|
|
{
|
|
NS_ENSURE_ARG(aObserver);
|
|
|
|
if (!mSlot)
|
|
// We need pointer to the slot
|
|
return NS_ERROR_FAILURE;
|
|
|
|
MutexAutoLock lock(mMutex);
|
|
|
|
if (mIAmRunning || mLoginReady) {
|
|
return NS_OK;
|
|
}
|
|
|
|
if (aObserver) {
|
|
// We must AddRef aObserver here on the main thread, because it probably
|
|
// does not implement a thread-safe AddRef.
|
|
mNotifyObserver = new NotifyObserverRunnable(aObserver,
|
|
"operation-completed");
|
|
}
|
|
|
|
mIAmRunning = true;
|
|
|
|
mThreadHandle = PR_CreateThread(PR_USER_THREAD, nsProtectedAuthThreadRunner, static_cast<void*>(this),
|
|
PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_JOINABLE_THREAD, 0);
|
|
|
|
// bool thread_started_ok = (threadHandle != nullptr);
|
|
// we might want to return "thread started ok" to caller in the future
|
|
NS_ASSERTION(mThreadHandle, "Could not create nsProtectedAuthThreadRunner thread\n");
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP nsProtectedAuthThread::GetTokenName(nsAString &_retval)
|
|
{
|
|
MutexAutoLock lock(mMutex);
|
|
|
|
// Get token name
|
|
CopyUTF8toUTF16(nsDependentCString(PK11_GetTokenName(mSlot)), _retval);
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP nsProtectedAuthThread::GetSlot(nsIPKCS11Slot **_retval)
|
|
{
|
|
RefPtr<nsPKCS11Slot> slot;
|
|
{
|
|
MutexAutoLock lock(mMutex);
|
|
slot = new nsPKCS11Slot(mSlot);
|
|
}
|
|
|
|
slot.forget(_retval);
|
|
return NS_OK;
|
|
}
|
|
|
|
void nsProtectedAuthThread::SetParams(PK11SlotInfo* aSlot)
|
|
{
|
|
MutexAutoLock lock(mMutex);
|
|
|
|
mSlot = (aSlot) ? PK11_ReferenceSlot(aSlot) : 0;
|
|
}
|
|
|
|
SECStatus nsProtectedAuthThread::GetResult()
|
|
{
|
|
return mLoginResult;
|
|
}
|
|
|
|
void nsProtectedAuthThread::Run(void)
|
|
{
|
|
// Login with null password. This call will also do C_Logout() but
|
|
// it is harmless here
|
|
mLoginResult = PK11_CheckUserPassword(mSlot, 0);
|
|
|
|
nsCOMPtr<nsIRunnable> notifyObserver;
|
|
{
|
|
MutexAutoLock lock(mMutex);
|
|
|
|
mLoginReady = true;
|
|
mIAmRunning = false;
|
|
|
|
// Forget the slot
|
|
if (mSlot)
|
|
{
|
|
PK11_FreeSlot(mSlot);
|
|
mSlot = 0;
|
|
}
|
|
|
|
notifyObserver.swap(mNotifyObserver);
|
|
}
|
|
|
|
if (notifyObserver) {
|
|
DebugOnly<nsresult> rv = NS_DispatchToMainThread(notifyObserver);
|
|
NS_ASSERTION(NS_SUCCEEDED(rv),
|
|
"failed to dispatch protected auth observer to main thread");
|
|
}
|
|
}
|
|
|
|
void nsProtectedAuthThread::Join()
|
|
{
|
|
if (!mThreadHandle)
|
|
return;
|
|
|
|
PR_JoinThread(mThreadHandle);
|
|
mThreadHandle = nullptr;
|
|
}
|