mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
5a3b3d60eb
- Bug 1173260 - stub out tests that fail when 'cursive' is looked up via fontconfig. r=m_kato (0bb3f03cb8)
- bug 1215657 - make AccessibleWrap::get_accDefaultAction work with proxied accessibles r=davidb (5732eb38eb)
- Bug 1210549 - Allow IServiceProvider::QueryService to work for proxied accessibles r=tbsaunde (7dcd9c2271)
- bug 1215657 - make AccessibleWrap::accSelect work with proxies r=davidb (d52e3d4873)
- Bug 1225682 - Don't use nsAuto{,C}String as class member variables in rdf/. r=Pike (f681938445)
- Bug 1232454 - use UniquePtr<T[]> instead of nsAutoArrayPtr<T> in security/apps/; r=keeler (e416936ed6)
- Bug 1235796 - Allow allocating YCbCr textures with Cb/Cr planes bigger than the Y plane. r=jrmuizel (8f1dbe137c)
- Bug 1241816 - In CreateSourceSurfaceFromMacIOSurface, unlock the IOSurface even in failure cases. r=mattwoodrow (218e6da6c1)
- Bug 1240190 - Add D3D9 texture upload profiler labels. r=jrmuizel (1e55b77bdf)
- Bug 1213429 - Recycle e10s D3D9 textures and add partial upload support. r=Bas (97aeeefdd2)
- Bug 1213429 - Check the result of LockRect. r=Bas (1c3c981d80)
- Bug 1213429 - GCC compilation fixup. (5449005c99)
- Lazily initialize D3D11 mix-blend shaders. (bug 1246388, r=mattwoodrow) (6fd3226030)
- Bug 1237375: Add some more extensive debugging information. r=milan (aed95e4774)
- Bug 1239861. Part 2 Properly resize DXGI swap chain buffer size. r=bas (e9bf410de4)
- Bug 1247775 - Part 1: Remove D3D10/D2D 1.0 texture integration from layers. r=dvander (74d7e93792)
- Bug 1247775 - Part 2: Remove Direct2D 1.0 code from Thebes. r=dvander (f0a1f53917)
- Bug 1247775 - Part 3: Remove Moz2D code to support Direct2D 1.0. r=dvander (10d27128eb)
- Bug 1221656 - Copy mp4parse.h in update-rust.sh. r=kinetik (96ebce3eb8)
- Bug 868333 - Match more MP4 family file types in media sniffer. r=rillian (cd29bd2a74)
- Bug 1211802 - Recognize 'avc?' as mp4 video. r=jya (b68726705b)
- Bug 1244523: [mp4] P2. Have sniffer recognise ftyp qt subtype. r=cpearce (1770f0862b)
- Bug 1087488: Remove some SPROP macro usages in Omnijar.cpp, to avoid triggering -Wtautological-compare clang warning. r=glandium (697dfa9895)
- Bug 1228437 - Add BHR stats from e10s child process. B2G fix by Ting-Yu Chou. r=nchen (213fbb9f37)
- Bug 1198196 - rework EVENTLOOP_UI_LAG_EXP_MS to record all lag. r=vladan (2807460ce0)
- Bug 1240484 - fixed control flow patch issue by adding brackets. r=mccr8 (d2aac14ee1)
- Bug 1242119 - Remove early exit in WinXP debug content processes. r=froydnj (2c2626a1ea)
- Bug 1245513 - Use _exit(0) to exit in B2G debug content processes. r=froydnj (c37efd34d9)
- some crash and profiler stuff (87547f6d8f)
- bug 1234417 - fix a leak in CreateECPublicKey r=rbarnes (99848f0fae)
- Bug 1204784: Handle cases in nsThreadPool where Gecko doesn't own the thread that we're running on. r=froydnj (3f523fc544)
- Bug 1204784: Do not shut the main thread down before all outstanding asynchronous thread shutdowns complete. r=froydnj (6abfb2562f)
- Bug 1234126 - Add Chaos Mode support for setting thread affinity on OS X and Windows. r=froydnj (8811430596)
- Bug 1245586 - add debugging aids for thread shutdown; r=khuey (28b7ae88c3)
- Bug 1191936 - Implement SPKI/PKCS#8/JWK import/export for RSA-PSS r=rbarnes (212ab7fec5)
- Bug 1241757 - Permit export of JWK with empty key_ops field, r=rbarnes (b19f177a13)
- Bug 1205168 - Part 0: Remove copy-ctor from strong type. r=jgilbert (a6070322a1)
- Bug 1205168 - Part 1 - Sort all the WebGLTexelFormats. r=jgilbert (857cd58641)
- Bug 1205168 - Part 2: Texel Conversion - RG8 format. r=jgilbert (6c241194ed)
- Bug 1205168 - Part 3: Texel Conversion - RG16F format. r=jgilbert (7573635218)
- Bug 1205168 - Part 4: Texel Conversion - RG32F format. r=jgilbert (f54343317e)
- Bug 1205168 - Part 5: Texel Conversion - RGB11F11F10F format. r=jgilbert (500514e025)
- Bug 1205168 - Part 6: Fix TexImage2D and TexSubImage2D with texture conversion. r=jgilbert (b5e2e75276)
- Bug 1205168 - Part 7: Remove unneeded functions. r=jgilbert (9bd24cd813)
- Bug 1234744 - Fix build errors in ImageBitmap.h. r=roc (b4b67e5905)
- missing telemetry bits (28161fd3f9)
- Bug 1237193 - Fix WebGL getActiveUniforms return type. r=jgilbert, r=smaug (f9a37a360e)
- Bug 1233353 - Initialize rb correctly if rb bind to READ_FRAMEBUFFER. r=jgilbert (bbc77437a4)
- Bug 1237637 - Disallow negative levels for framebuffer attachments. -r=jrmuizel (fa65b6ad24)
- Bug 1236395 - [WebGL2] pass getFramebufferAttachmentParameter in gl-object-get-calls.html, r=jgilbert (6f9fde1cd2)
- Bug 1236784 - [WebGL2] pass getRenderbufferParameter in gl-object-get-calls.html, r=jgilbert (e4f20f54ad)
- Bug 1238865 - Part 1: Validate attachments before clearBuffer. r=jgilbert (a6e6e05a0c)
- Bug 1229210. Handle the new formats required by WebGL2 in ReadPixels. r=jgilbert (66e305f97d)
- Bug 1238865 - Part 2: Add more format/type checks for WebGL2. r=jgilbert (af629782b3)
- Bug 1238865 - Part 3: Prevent IMPLEMENTATION_COLOR_READ_FORMAT return SRGB_ALPHA. r=jgilbert (81da93d791)
- Bug 1240673 - Fix WebGL2 framebuffer parameter problem. r=jgilbert (2c957a8294)
- Bug 1240438 - Fix WebGL2 framebuffer attachment related implementation. r=jgilbert (b4339241c8)
- Bug 1239187 - Use the GLFeature instead. - r=jrmuizel (c5f2c57646)
- Bug 1094458 - Implement RenderbufferStorageMultisample. - r=jrmuizel (f20f776597)
- Bug 1246007 - Ignore RENDERBUFFER_SAMPLES outside of webgl2. - r=jrmuizel (6b8f59ae49)
- Bug 1243907 - Don't query _BITS enums on Core profiles. - r=jrmuizel (e722abe45b)
- partial Bug 1242120 - Remove switch fallthrough (0f47fb7a71)
- Bug 1236080. Null check format in GetParameter. r=jgilbert (09fedc2ea8)
- Bug 1240662 - Add max level check for framebufferTextureLayer. r=jgilbert (f6d5eda15c)
- Bug 1236091. Move validate checks inside of null checks. r=jgilbert (4c67e04e87)
- Bug 1237191 - Add check for getQueryParameter to return correct error. r=jgilbert (93345aab7e)
- Bug 1230089 - If sampler is bound, use parameter of sampler. r=jgilbert (e4139a5174)
- Bug 1242336 - Fix WebGL2 return type of GL_UNPACK_SKIP. r=jgilbert (4a2ef1956e)
- Bug 1240262 - Annotate intentional switch fallthrough and suppress -Wimplicit-fallthrough warnings in dom/canvas/. r=jgilbert (eaee57ba8f)
- Bug 1237194 - Fix getSyncParameter return error. r=jgilbert (13119be06e)
- Bug 1239541 - Fix WebGL2 texImage related checking. r=jgilbert (6777244db0)
- Bug 1225291 - IsTransformFeedback doesn't report error when input is null. r=jgilbert (8c67d072b5)
- Bug 1233094. Handle null buffers in GetIndexedParameter. r=jgilbert (ae5d75bd47)
- Bug 1228676 - WebGL2 VertexAttrib funcs should match WebGL 1 patterns. - r=jgilbert (bf96c0e17b)
- Bug 1237420 - "Fix length-checking when setting WebGL 2 vertex attributes with an array". r=jgilbert (d8e9ca7111)
- Bug 1233819 - Fix WebGL on WinXP. - r=jrmuizel (39b15ba9ee)
- Bug 1233046 - Mark non-try platforms. Align some tests. (9d16ce70a4)
- Bug 1201885,1247752,1247753 - Re-mark passing/failing tests. (381c71c0f8)
- Bug 1247764 - Disable STENCIL_TEST on mac+intel when not needed. - r=jrmuizel (0b544d0c36)
- Bug 1243908 - Use DrawBuffers through GLScreenBuffer when operating on fb0. - r=jrmuizel (0ac0fc6047)
- Bug 1229944 - Add glClear for zeroing texture data. - r=kamidphish (51df8cbb50)
- Bug 1220450 - Clear length on cache OOM. r=kamidphish (44431a0d3e)
- Bug 1232346 - Clarify ResolveForDraw's failure checking. - r=kamidphish (542917bb85)
336 lines
9.1 KiB
C++
336 lines
9.1 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 MOZ_THREAD_LOCAL(bool) sTLSIsMainThread;
|
|
|
|
bool
|
|
NS_IsMainThread()
|
|
{
|
|
return sTLSIsMainThread.get();
|
|
}
|
|
|
|
void
|
|
NS_SetMainThread()
|
|
{
|
|
if (!sTLSIsMainThread.init()) {
|
|
MOZ_CRASH();
|
|
}
|
|
sTLSIsMainThread.set(true);
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
}
|
|
|
|
typedef nsTArray<RefPtr<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()) {
|
|
RefPtr<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();
|
|
}
|
|
}
|
|
|
|
// NB: It's possible that there are events in the queue that want to *start*
|
|
// an asynchronous shutdown. But we have already shutdown the threads above,
|
|
// so there's no need to worry about them. We only have to wait for all
|
|
// in-flight asynchronous thread shutdowns to complete.
|
|
mMainThread->WaitForAllAsynchronousShutdowns();
|
|
|
|
// 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 :-)
|
|
RefPtr<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;
|
|
}
|
|
|
|
RefPtr<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;
|
|
}
|
|
|
|
RefPtr<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;
|
|
}
|