mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 22:53:04 +00:00
ae2cd1d073
- Bug 1165982 - part 1 - provide fallible initialization of nsDOMIterator from an nsRange; r=ehsan (e8f817ee7) - Bug 1165982 - part 2 - validate an nsRange::SelectNode call in nsHTMLTMLEditRules::Init; r=ehsan (182e07bf6) - Bug 1180118 - Part 1: Add a method to match a single nsCSSSelector (without pseudo-elements) against an Element. r=bzbarsky (26f9fe8c3) - Partial port of Bug 1151829 - Unbreak build on non-SPS platforms after bug 1093934 (a9414f6b3) - Bug 1180118 - Part 2: Add eRestyle_SomeDescendants restyle hint and pass associated restyle hint data into restyle methods. r=bzbarsky (7a6fc4bd2) - Bug 1180118 - Part 3: Convert eRestyle_SomeDescendants into eRestyle_Self for elements that match selectors. r=bzbarsky (d4581f146) - Bug 1180118 - Part 4: Store pointer to the rightmost selector for class, ID and attribute selectors in the rule cascade. r=bzbarsky (aca8878f8) - Bug 1164366 - Need to fix an issue on unified build in dom/base. r=ehsan (8fcfb182f) - Bug 1121760 (part 2) - Remove PL_DHashTableAdd(). r=poiru. (e9d140a4b) - Bug 1121760 (part 3) - Remove PL_DHashTableRemove(). r=poiru. (588aeeaae) - Bug 1181445 (part 1) - Implement iterators for nsTHashtable and nsBaseHashtable. r=froydnj. (55a19598d) - Bug 1154053 - Limit concurrency of e10s memory reporting. r=erahm (88530ebb2) - Bug 1181445 (part 2) - Use nsTHashTable::Iterator in nsMemoryReporterManager. r=froydnj. (70df14b26) - Bug 1150916 - Be sure we aren't iterating over a hashtable while it is modified in nsObserverService::UnmarkGrayStrongObservers(). r=froydnj (572b31ed2) - Bug 1153373 - Move AppendStrongObservers() function definition behind #ifndef MOZILLA_XPCOMRT_API. r=froydnj (cebafb6b7) - Bug 1181445 (part 3) - Use nsTHashTable::Iterator in nsObserverService. r=froydnj. (1018c3526) - Bug 1181445 (part 4) - Use nsTHashTable::Iterator in nsCategoryManager. r=froydnj. (a04fcf96b) - Bug 1181445 (part 5) - Use nsTHashTable::Iterator in nsTHashtable.h. r=mccr8. (51bf669a0) - Bug 1181445 (part 6) - Use nsBaseHashTable::Iterator in xpcom/components/. r=froydnj. (e2e75de6c) - Bug 1167378 - Mark ArrayAndPrefix as MOZ_STACK_CLASS and array member as MOZ_NON_OWNING_REF. r=froydnj (e2d727c94) - Bug 1181445 (part 7) - Use nsBaseHashTable::Iterator in xpcom/reflect/. r=froydnj. (f6b9290a0) - Bug 1181445 (part 8) - Use nsBaseHashTable::Iterator in SystemMemoryReporter. r=froydnj. (69b81c209) - Bug 1181445 (part 9) - Use nsBaseHashTable::Iterator in nsConsoleService. r=froydnj. (ce4183330) - Bug 1154403 - Reduce incremental finalize slice time to 5ms. r=smaug (edbfd02e0) - Bug 1181445 (part 10) - Use nsBaseHashTable::Iterator in CycleCollectedJSRuntime. r=mccr8. (35d9be72e) - Bug 1181445 (part 11) - Use nsBaseHashTable::Iterator in xpcom/glue/. r=froydnj. (a08b703fe) - Backout change 39e167bbd14c, a80140872ea5, adae9be2294d and b71ccef9c674 (bug 970307). (9ce474689) - Bug 1158320 - rename nsThread::mRunningEvent to mNestedEventLoopDepth; r=bsmedberg (06d59a7e2) - Bug 1181445 (part 12) - Use nsBaseHashTable::Iterator in xpcom/threads/. r=froydnj. (48edb8226) - Bug 1181445 (part 13) - Use nsBaseHashTable::Iterator in xpcom/ds/. r=froydnj. (6d16d7670) - Bug 1173634 - Report pending async shutdowns in shutdown hangs. r=cpearce (c806e4b3f) - Bug 1183433 - Implement centralized crash report annotations, so that all async-shutdown hangs use only one key, and keeping track of all states each plugin has been through. r=cpearce (1d0284c70) - Bug 1184432 - Use nsClassHashtable::ConstIter in GeckoMediaPluginServiceParent::AsyncShutdownPluginStates. r=cpearce (7c92e3363) - Bug 1182318 - Part 1: Remove Closure::mCb. r=smaug (f28311ccd) - Bug 1182318 - Part 2: Remove Closure from CycleCollectedJSRuntime. r=smaug (454f3b85b) - Bug 1185470: Remove 'Get' prefixes from hashtable iterator methods. r (8ce896a26)
332 lines
8.8 KiB
C++
332 lines
8.8 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* 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 "nsThreadManager.h"
|
|
#include "nsThread.h"
|
|
#include "nsThreadUtils.h"
|
|
#include "nsIClassInfoImpl.h"
|
|
#include "nsTArray.h"
|
|
#include "nsAutoPtr.h"
|
|
#include "mozilla/ThreadLocal.h"
|
|
#ifdef MOZ_CANARY
|
|
#include <fcntl.h>
|
|
#include <unistd.h>
|
|
#endif
|
|
|
|
using namespace mozilla;
|
|
|
|
static mozilla::ThreadLocal<bool> sTLSIsMainThread;
|
|
|
|
bool
|
|
NS_IsMainThread()
|
|
{
|
|
return sTLSIsMainThread.get();
|
|
}
|
|
|
|
void
|
|
NS_SetMainThread()
|
|
{
|
|
if (!sTLSIsMainThread.initialized()) {
|
|
if (!sTLSIsMainThread.init()) {
|
|
MOZ_CRASH();
|
|
}
|
|
sTLSIsMainThread.set(true);
|
|
}
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
}
|
|
|
|
typedef nsTArray<nsRefPtr<nsThread>> nsThreadArray;
|
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
static void
|
|
ReleaseObject(void* aData)
|
|
{
|
|
static_cast<nsISupports*>(aData)->Release();
|
|
}
|
|
|
|
// statically allocated instance
|
|
NS_IMETHODIMP_(MozExternalRefCountType)
|
|
nsThreadManager::AddRef()
|
|
{
|
|
return 2;
|
|
}
|
|
NS_IMETHODIMP_(MozExternalRefCountType)
|
|
nsThreadManager::Release()
|
|
{
|
|
return 1;
|
|
}
|
|
NS_IMPL_CLASSINFO(nsThreadManager, nullptr,
|
|
nsIClassInfo::THREADSAFE | nsIClassInfo::SINGLETON,
|
|
NS_THREADMANAGER_CID)
|
|
NS_IMPL_QUERY_INTERFACE_CI(nsThreadManager, nsIThreadManager)
|
|
NS_IMPL_CI_INTERFACE_GETTER(nsThreadManager, nsIThreadManager)
|
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
nsresult
|
|
nsThreadManager::Init()
|
|
{
|
|
// Child processes need to initialize the thread manager before they
|
|
// initialize XPCOM in order to set up the crash reporter. This leads to
|
|
// situations where we get initialized twice.
|
|
if (mInitialized) {
|
|
return NS_OK;
|
|
}
|
|
|
|
if (PR_NewThreadPrivateIndex(&mCurThreadIndex, ReleaseObject) == PR_FAILURE) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
|
|
#ifdef MOZ_CANARY
|
|
const int flags = O_WRONLY | O_APPEND | O_CREAT | O_NONBLOCK;
|
|
const mode_t mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH;
|
|
char* env_var_flag = getenv("MOZ_KILL_CANARIES");
|
|
sCanaryOutputFD =
|
|
env_var_flag ? (env_var_flag[0] ? open(env_var_flag, flags, mode) :
|
|
STDERR_FILENO) :
|
|
0;
|
|
#endif
|
|
|
|
// Setup "main" thread
|
|
mMainThread = new nsThread(nsThread::MAIN_THREAD, 0);
|
|
|
|
nsresult rv = mMainThread->InitCurrentThread();
|
|
if (NS_FAILED(rv)) {
|
|
mMainThread = nullptr;
|
|
return rv;
|
|
}
|
|
|
|
// We need to keep a pointer to the current thread, so we can satisfy
|
|
// GetIsMainThread calls that occur post-Shutdown.
|
|
mMainThread->GetPRThread(&mMainPRThread);
|
|
|
|
mInitialized = true;
|
|
return NS_OK;
|
|
}
|
|
|
|
void
|
|
nsThreadManager::Shutdown()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread(), "shutdown not called from main thread");
|
|
|
|
// Prevent further access to the thread manager (no more new threads!)
|
|
//
|
|
// What happens if shutdown happens before NewThread completes?
|
|
// We Shutdown() the new thread, and return error if we've started Shutdown
|
|
// between when NewThread started, and when the thread finished initializing
|
|
// and registering with ThreadManager.
|
|
//
|
|
mInitialized = false;
|
|
|
|
// Empty the main thread event queue before we begin shutting down threads.
|
|
NS_ProcessPendingEvents(mMainThread);
|
|
|
|
// We gather the threads from the hashtable into a list, so that we avoid
|
|
// holding the hashtable lock while calling nsIThread::Shutdown.
|
|
nsThreadArray threads;
|
|
{
|
|
OffTheBooksMutexAutoLock lock(mLock);
|
|
for (auto iter = mThreadsByPRThread.Iter(); !iter.Done(); iter.Next()) {
|
|
nsRefPtr<nsThread>& thread = iter.Data();
|
|
threads.AppendElement(thread);
|
|
iter.Remove();
|
|
}
|
|
}
|
|
|
|
// It's tempting to walk the list of threads here and tell them each to stop
|
|
// accepting new events, but that could lead to badness if one of those
|
|
// threads is stuck waiting for a response from another thread. To do it
|
|
// right, we'd need some way to interrupt the threads.
|
|
//
|
|
// Instead, we process events on the current thread while waiting for threads
|
|
// to shutdown. This means that we have to preserve a mostly functioning
|
|
// world until such time as the threads exit.
|
|
|
|
// Shutdown all threads that require it (join with threads that we created).
|
|
for (uint32_t i = 0; i < threads.Length(); ++i) {
|
|
nsThread* thread = threads[i];
|
|
if (thread->ShutdownRequired()) {
|
|
thread->Shutdown();
|
|
}
|
|
}
|
|
|
|
// In case there are any more events somehow...
|
|
NS_ProcessPendingEvents(mMainThread);
|
|
|
|
// There are no more background threads at this point.
|
|
|
|
// Clear the table of threads.
|
|
{
|
|
OffTheBooksMutexAutoLock lock(mLock);
|
|
mThreadsByPRThread.Clear();
|
|
}
|
|
|
|
// Normally thread shutdown clears the observer for the thread, but since the
|
|
// main thread is special we do it manually here after we're sure all events
|
|
// have been processed.
|
|
mMainThread->SetObserver(nullptr);
|
|
mMainThread->ClearObservers();
|
|
|
|
// Release main thread object.
|
|
mMainThread = nullptr;
|
|
|
|
// Remove the TLS entry for the main thread.
|
|
PR_SetThreadPrivate(mCurThreadIndex, nullptr);
|
|
}
|
|
|
|
void
|
|
nsThreadManager::RegisterCurrentThread(nsThread* aThread)
|
|
{
|
|
MOZ_ASSERT(aThread->GetPRThread() == PR_GetCurrentThread(), "bad aThread");
|
|
|
|
OffTheBooksMutexAutoLock lock(mLock);
|
|
|
|
++mCurrentNumberOfThreads;
|
|
if (mCurrentNumberOfThreads > mHighestNumberOfThreads) {
|
|
mHighestNumberOfThreads = mCurrentNumberOfThreads;
|
|
}
|
|
|
|
mThreadsByPRThread.Put(aThread->GetPRThread(), aThread); // XXX check OOM?
|
|
|
|
NS_ADDREF(aThread); // for TLS entry
|
|
PR_SetThreadPrivate(mCurThreadIndex, aThread);
|
|
}
|
|
|
|
void
|
|
nsThreadManager::UnregisterCurrentThread(nsThread* aThread)
|
|
{
|
|
MOZ_ASSERT(aThread->GetPRThread() == PR_GetCurrentThread(), "bad aThread");
|
|
|
|
OffTheBooksMutexAutoLock lock(mLock);
|
|
|
|
--mCurrentNumberOfThreads;
|
|
mThreadsByPRThread.Remove(aThread->GetPRThread());
|
|
|
|
PR_SetThreadPrivate(mCurThreadIndex, nullptr);
|
|
// Ref-count balanced via ReleaseObject
|
|
}
|
|
|
|
nsThread*
|
|
nsThreadManager::GetCurrentThread()
|
|
{
|
|
// read thread local storage
|
|
void* data = PR_GetThreadPrivate(mCurThreadIndex);
|
|
if (data) {
|
|
return static_cast<nsThread*>(data);
|
|
}
|
|
|
|
if (!mInitialized) {
|
|
return nullptr;
|
|
}
|
|
|
|
// OK, that's fine. We'll dynamically create one :-)
|
|
nsRefPtr<nsThread> thread = new nsThread(nsThread::NOT_MAIN_THREAD, 0);
|
|
if (!thread || NS_FAILED(thread->InitCurrentThread())) {
|
|
return nullptr;
|
|
}
|
|
|
|
return thread.get(); // reference held in TLS
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsThreadManager::NewThread(uint32_t aCreationFlags,
|
|
uint32_t aStackSize,
|
|
nsIThread** aResult)
|
|
{
|
|
// Note: can be called from arbitrary threads
|
|
|
|
// No new threads during Shutdown
|
|
if (NS_WARN_IF(!mInitialized)) {
|
|
return NS_ERROR_NOT_INITIALIZED;
|
|
}
|
|
|
|
nsRefPtr<nsThread> thr = new nsThread(nsThread::NOT_MAIN_THREAD, aStackSize);
|
|
nsresult rv = thr->Init(); // Note: blocks until the new thread has been set up
|
|
if (NS_FAILED(rv)) {
|
|
return rv;
|
|
}
|
|
|
|
// At this point, we expect that the thread has been registered in mThreadByPRThread;
|
|
// however, it is possible that it could have also been replaced by now, so
|
|
// we cannot really assert that it was added. Instead, kill it if we entered
|
|
// Shutdown() during/before Init()
|
|
|
|
if (NS_WARN_IF(!mInitialized)) {
|
|
if (thr->ShutdownRequired()) {
|
|
thr->Shutdown(); // ok if it happens multiple times
|
|
}
|
|
return NS_ERROR_NOT_INITIALIZED;
|
|
}
|
|
|
|
thr.forget(aResult);
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsThreadManager::GetThreadFromPRThread(PRThread* aThread, nsIThread** aResult)
|
|
{
|
|
// Keep this functioning during Shutdown
|
|
if (NS_WARN_IF(!mMainThread)) {
|
|
return NS_ERROR_NOT_INITIALIZED;
|
|
}
|
|
if (NS_WARN_IF(!aThread)) {
|
|
return NS_ERROR_INVALID_ARG;
|
|
}
|
|
|
|
nsRefPtr<nsThread> temp;
|
|
{
|
|
OffTheBooksMutexAutoLock lock(mLock);
|
|
mThreadsByPRThread.Get(aThread, getter_AddRefs(temp));
|
|
}
|
|
|
|
NS_IF_ADDREF(*aResult = temp);
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsThreadManager::GetMainThread(nsIThread** aResult)
|
|
{
|
|
// Keep this functioning during Shutdown
|
|
if (NS_WARN_IF(!mMainThread)) {
|
|
return NS_ERROR_NOT_INITIALIZED;
|
|
}
|
|
NS_ADDREF(*aResult = mMainThread);
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsThreadManager::GetCurrentThread(nsIThread** aResult)
|
|
{
|
|
// Keep this functioning during Shutdown
|
|
if (NS_WARN_IF(!mMainThread)) {
|
|
return NS_ERROR_NOT_INITIALIZED;
|
|
}
|
|
*aResult = GetCurrentThread();
|
|
if (!*aResult) {
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
}
|
|
NS_ADDREF(*aResult);
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsThreadManager::GetIsMainThread(bool* aResult)
|
|
{
|
|
// This method may be called post-Shutdown
|
|
|
|
*aResult = (PR_GetCurrentThread() == mMainPRThread);
|
|
return NS_OK;
|
|
}
|
|
|
|
uint32_t
|
|
nsThreadManager::GetHighestNumberOfThreads()
|
|
{
|
|
OffTheBooksMutexAutoLock lock(mLock);
|
|
return mHighestNumberOfThreads;
|
|
}
|