mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
14f7ec3aac
- Bug 1173947 - Make getRandomValues message be urgent (r=mrbkap) (aca1a06a9) - Bug 1182824 - Part 1: Use move assignment rather than copy assignment with ContextState::dash. r=mattwoodrow (73af33d32) - Bug 1182824 - Part 2: Make ContextState::dash a nsTArray. r=mattwoodrow (c66c3105d) - Bug 1134166 - Restart toolbox if selected app re-opens. r=ochameau (e370c8f02) - Bug 1134166 - Close toolbox if selected app dies. r=ochameau (5acb76254) - Bug 1134166 - Check for project when updating toolbox state. r=me (c60bb8766) - Bug 1090949 - Add way to make WebIDE runtimes configurable. r=ochameau (eef01e3e6) - Bug 1090949 - Refactor WebIDE preferences panel style. r=ochameau (fe1a9c757) - Bug 1135191 - Add runtime panel with toggle. r=jryans (e2e290a67) - missing bit of Bug 1116188 - Add async ProfileGatherer (308cfdd4f) - Bug 1185737 - Propagate pause and resume commands to child processes. r=BenWa (2dd302569) - Bug 1161831 - Stop using threaddsafe ISupports for nsResProtocolHandler. r=billm (0bec61aac) - Bug 1155968 - Correct indent not multiple of 4. r=khuey (5fb8e3b20) - Bug 1183291 - Factor idl-parser into a Python package. r=khuey (63a2f0c68) - Bug 1155968 - Add blank lines where needed in xpcom/idl-parser. r=khuey (ce91a905b) - Bug 1161831 - Generate an extra macro to declare a non-virtual variant of an interface. r=billm (058876228) - Bug 1161831 - Factor the sharable bits out of nsIResProtocolHandler. r=billm (b02278fb9) - Bug 1152997 - Cleanup app update build to exclude android. r=glandium, r=mossop (6cd935294) - Bug 1170075 - Remove Print Progress UI and view source XUL files from Android. r=snorp (64796ae4a) - Bug 1180921 - Create a dumping ground for simple services in toolkit/components/utils. r=Gijs (2757d43c8) - Bug 1180921 - Support custom callbacks for allowing access per-addon load access to cross-origin URIs. r=bz,r=billm (8cc7e2c96) - Bug 1161831 - Implement moz-extension protocol. r=bz,r=billm,sr=mcmanus (5ee451357) - Bug 1161831 - Associate extension URIs with the appropriate addon ID. r=billm,sr=bz (f36655ac9) - Bug 1161831 - Forbid mapping to anything but file:// and jar:// URIs. r=billm,sr=bz (144add9de) - Bug 1180921 - Generalize test_origin to make it easier to add new origin attributes. r=gabor (b3fbc3545) - Bug 1180921 - Add the addonId OriginAttribute. r=bholley (0723d0dec) - Bug 1174093 - Don't recurse into caps/tests/mochitest during the build; r=mshal (76366d21a) - Bug 1161831 - Tests. r=billm (ed116a703) - Bug 1155547, Part 1: Fix unified build breakage in adding new sources under dom/ipc/. r=khuey (0d6875348) - Bug 1166985 - Use two image decoding threads on dual core devices. r=tn (7f07ee8b8) - Bug 1160422 - Prioritize size decodes over full decodes. r=tn (48d42c011) - Bug 1151672 - Part 1: Remove the calls to nsThreadManager::SetThreadWorking() and nsThreadManager::SetThreadIdle() due to backout of bug 970307. r=seth (0428dd4a4) - Bug 1151672 - Part 2: Block PHal::Msg_NotifyNetworkChange__ID to the Nuwa process after it is ready. r=khuey (42debf2c0) - Bug 1176034 - MessagePort should force a close() if the structured clone algorithm fails, r=bent (3afe74856) - Bug 1176034 - Implement JSAutoStructuredCloneBuffer::clear(with callbacks and closure), r=sfink (f28f6852b) - Bug 1155547, Part 2: Create PNuwa protocol (managed by PBackground) for forking content processes. r=khuey (047bc5e61) - missing bit of Bug 1170075 - Remove Print Progress UI and view source XUL (a08888308)
495 lines
12 KiB
C++
495 lines
12 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 "mozilla/PreallocatedProcessManager.h"
|
|
#include "mozilla/ClearOnShutdown.h"
|
|
#include "mozilla/Preferences.h"
|
|
#include "mozilla/unused.h"
|
|
#include "mozilla/dom/ContentParent.h"
|
|
#include "mozilla/dom/ScriptSettings.h"
|
|
#include "nsIPropertyBag2.h"
|
|
#include "ProcessPriorityManager.h"
|
|
#include "nsServiceManagerUtils.h"
|
|
|
|
#ifdef MOZ_NUWA_PROCESS
|
|
#include "ipc/Nuwa.h"
|
|
#endif
|
|
|
|
// This number is fairly arbitrary ... the intention is to put off
|
|
// launching another app process until the last one has finished
|
|
// loading its content, to reduce CPU/memory/IO contention.
|
|
#define DEFAULT_ALLOCATE_DELAY 1000
|
|
#define NUWA_FORK_WAIT_DURATION_MS 2000 // 2 seconds.
|
|
|
|
using namespace mozilla;
|
|
using namespace mozilla::hal;
|
|
using namespace mozilla::dom;
|
|
|
|
namespace {
|
|
|
|
/**
|
|
* This singleton class implements the static methods on
|
|
* PreallocatedProcessManager.
|
|
*/
|
|
class PreallocatedProcessManagerImpl final
|
|
: public nsIObserver
|
|
{
|
|
public:
|
|
static PreallocatedProcessManagerImpl* Singleton();
|
|
|
|
NS_DECL_ISUPPORTS
|
|
NS_DECL_NSIOBSERVER
|
|
|
|
// See comments on PreallocatedProcessManager for these methods.
|
|
void AllocateAfterDelay();
|
|
void AllocateOnIdle();
|
|
void AllocateNow();
|
|
already_AddRefed<ContentParent> Take();
|
|
|
|
#ifdef MOZ_NUWA_PROCESS
|
|
public:
|
|
void ScheduleDelayedNuwaFork();
|
|
void DelayedNuwaFork();
|
|
void PublishSpareProcess(ContentParent* aContent);
|
|
void MaybeForgetSpare(ContentParent* aContent);
|
|
bool IsNuwaReady();
|
|
void OnNuwaReady();
|
|
bool PreallocatedProcessReady();
|
|
already_AddRefed<ContentParent> GetSpareProcess();
|
|
|
|
private:
|
|
void NuwaFork();
|
|
|
|
// initialization off the critical path of app startup.
|
|
CancelableTask* mPreallocateAppProcessTask;
|
|
|
|
// The array containing the preallocated processes. 4 as the inline storage size
|
|
// should be enough so we don't need to grow the nsAutoTArray.
|
|
nsAutoTArray<nsRefPtr<ContentParent>, 4> mSpareProcesses;
|
|
|
|
// Nuwa process is ready for creating new process.
|
|
bool mIsNuwaReady;
|
|
#endif
|
|
|
|
private:
|
|
static mozilla::StaticRefPtr<PreallocatedProcessManagerImpl> sSingleton;
|
|
|
|
PreallocatedProcessManagerImpl();
|
|
~PreallocatedProcessManagerImpl() {}
|
|
DISALLOW_EVIL_CONSTRUCTORS(PreallocatedProcessManagerImpl);
|
|
|
|
void Init();
|
|
|
|
void RereadPrefs();
|
|
void Enable();
|
|
void Disable();
|
|
|
|
void ObserveProcessShutdown(nsISupports* aSubject);
|
|
|
|
bool mEnabled;
|
|
bool mShutdown;
|
|
nsRefPtr<ContentParent> mPreallocatedAppProcess;
|
|
};
|
|
|
|
/* static */ StaticRefPtr<PreallocatedProcessManagerImpl>
|
|
PreallocatedProcessManagerImpl::sSingleton;
|
|
|
|
/* static */ PreallocatedProcessManagerImpl*
|
|
PreallocatedProcessManagerImpl::Singleton()
|
|
{
|
|
if (!sSingleton) {
|
|
sSingleton = new PreallocatedProcessManagerImpl();
|
|
sSingleton->Init();
|
|
ClearOnShutdown(&sSingleton);
|
|
}
|
|
|
|
return sSingleton;
|
|
}
|
|
|
|
NS_IMPL_ISUPPORTS(PreallocatedProcessManagerImpl, nsIObserver)
|
|
|
|
PreallocatedProcessManagerImpl::PreallocatedProcessManagerImpl()
|
|
:
|
|
#ifdef MOZ_NUWA_PROCESS
|
|
mPreallocateAppProcessTask(nullptr)
|
|
, mIsNuwaReady(false)
|
|
,
|
|
#endif
|
|
mEnabled(false)
|
|
, mShutdown(false)
|
|
{}
|
|
|
|
void
|
|
PreallocatedProcessManagerImpl::Init()
|
|
{
|
|
Preferences::AddStrongObserver(this, "dom.ipc.processPrelaunch.enabled");
|
|
nsCOMPtr<nsIObserverService> os = services::GetObserverService();
|
|
if (os) {
|
|
os->AddObserver(this, "ipc:content-shutdown",
|
|
/* weakRef = */ false);
|
|
os->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID,
|
|
/* weakRef = */ false);
|
|
}
|
|
RereadPrefs();
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
PreallocatedProcessManagerImpl::Observe(nsISupports* aSubject,
|
|
const char* aTopic,
|
|
const char16_t* aData)
|
|
{
|
|
if (!strcmp("ipc:content-shutdown", aTopic)) {
|
|
ObserveProcessShutdown(aSubject);
|
|
} else if (!strcmp("nsPref:changed", aTopic)) {
|
|
// The only other observer we registered was for our prefs.
|
|
RereadPrefs();
|
|
} else if (!strcmp(NS_XPCOM_SHUTDOWN_OBSERVER_ID, aTopic)) {
|
|
mShutdown = true;
|
|
} else {
|
|
MOZ_ASSERT(false);
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
void
|
|
PreallocatedProcessManagerImpl::RereadPrefs()
|
|
{
|
|
if (Preferences::GetBool("dom.ipc.processPrelaunch.enabled")) {
|
|
Enable();
|
|
} else {
|
|
Disable();
|
|
}
|
|
}
|
|
|
|
already_AddRefed<ContentParent>
|
|
PreallocatedProcessManagerImpl::Take()
|
|
{
|
|
return mPreallocatedAppProcess.forget();
|
|
}
|
|
|
|
void
|
|
PreallocatedProcessManagerImpl::Enable()
|
|
{
|
|
if (mEnabled) {
|
|
return;
|
|
}
|
|
|
|
mEnabled = true;
|
|
#ifdef MOZ_NUWA_PROCESS
|
|
ScheduleDelayedNuwaFork();
|
|
#else
|
|
AllocateAfterDelay();
|
|
#endif
|
|
}
|
|
|
|
void
|
|
PreallocatedProcessManagerImpl::AllocateAfterDelay()
|
|
{
|
|
if (!mEnabled || mPreallocatedAppProcess) {
|
|
return;
|
|
}
|
|
|
|
MessageLoop::current()->PostDelayedTask(
|
|
FROM_HERE,
|
|
NewRunnableMethod(this, &PreallocatedProcessManagerImpl::AllocateOnIdle),
|
|
Preferences::GetUint("dom.ipc.processPrelaunch.delayMs",
|
|
DEFAULT_ALLOCATE_DELAY));
|
|
}
|
|
|
|
void
|
|
PreallocatedProcessManagerImpl::AllocateOnIdle()
|
|
{
|
|
if (!mEnabled || mPreallocatedAppProcess) {
|
|
return;
|
|
}
|
|
|
|
MessageLoop::current()->PostIdleTask(
|
|
FROM_HERE,
|
|
NewRunnableMethod(this, &PreallocatedProcessManagerImpl::AllocateNow));
|
|
}
|
|
|
|
void
|
|
PreallocatedProcessManagerImpl::AllocateNow()
|
|
{
|
|
if (!mEnabled || mPreallocatedAppProcess) {
|
|
return;
|
|
}
|
|
|
|
mPreallocatedAppProcess = ContentParent::PreallocateAppProcess();
|
|
}
|
|
|
|
#ifdef MOZ_NUWA_PROCESS
|
|
|
|
void
|
|
PreallocatedProcessManagerImpl::ScheduleDelayedNuwaFork()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
|
|
if (mPreallocateAppProcessTask) {
|
|
// Make sure there is only one request running.
|
|
return;
|
|
}
|
|
|
|
mPreallocateAppProcessTask = NewRunnableMethod(
|
|
this, &PreallocatedProcessManagerImpl::DelayedNuwaFork);
|
|
MessageLoop::current()->PostDelayedTask(
|
|
FROM_HERE, mPreallocateAppProcessTask,
|
|
Preferences::GetUint("dom.ipc.processPrelaunch.delayMs",
|
|
DEFAULT_ALLOCATE_DELAY));
|
|
}
|
|
|
|
void
|
|
PreallocatedProcessManagerImpl::DelayedNuwaFork()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
|
|
mPreallocateAppProcessTask = nullptr;
|
|
|
|
if (!mIsNuwaReady) {
|
|
if (!mPreallocatedAppProcess && !mShutdown && mEnabled) {
|
|
mPreallocatedAppProcess = ContentParent::RunNuwaProcess();
|
|
}
|
|
// else mPreallocatedAppProcess is starting. It will NuwaFork() when ready.
|
|
} else if (mSpareProcesses.IsEmpty()) {
|
|
NuwaFork();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Get a spare ContentParent from mSpareProcesses list.
|
|
*/
|
|
already_AddRefed<ContentParent>
|
|
PreallocatedProcessManagerImpl::GetSpareProcess()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
|
|
if (!mIsNuwaReady) {
|
|
return nullptr;
|
|
}
|
|
|
|
if (mSpareProcesses.IsEmpty()) {
|
|
// After this call, there should be a spare process.
|
|
mPreallocatedAppProcess->ForkNewProcess(true);
|
|
}
|
|
|
|
nsRefPtr<ContentParent> process = mSpareProcesses.LastElement();
|
|
mSpareProcesses.RemoveElementAt(mSpareProcesses.Length() - 1);
|
|
|
|
if (mSpareProcesses.IsEmpty() && mIsNuwaReady) {
|
|
NS_ASSERTION(mPreallocatedAppProcess != nullptr,
|
|
"Nuwa process is not present!");
|
|
ScheduleDelayedNuwaFork();
|
|
}
|
|
|
|
return process.forget();
|
|
}
|
|
|
|
/**
|
|
* Publish a ContentParent to spare process list.
|
|
*/
|
|
void
|
|
PreallocatedProcessManagerImpl::PublishSpareProcess(ContentParent* aContent)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
|
|
if (Preferences::GetBool("dom.ipc.processPriorityManager.testMode")) {
|
|
AutoJSContext cx;
|
|
nsCOMPtr<nsIMessageBroadcaster> ppmm =
|
|
do_GetService("@mozilla.org/parentprocessmessagemanager;1");
|
|
mozilla::unused << ppmm->BroadcastAsyncMessage(
|
|
NS_LITERAL_STRING("TEST-ONLY:nuwa-add-new-process"),
|
|
JS::NullHandleValue, JS::NullHandleValue, cx, 1);
|
|
}
|
|
|
|
mSpareProcesses.AppendElement(aContent);
|
|
}
|
|
|
|
void
|
|
PreallocatedProcessManagerImpl::MaybeForgetSpare(ContentParent* aContent)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
|
|
if (mSpareProcesses.RemoveElement(aContent)) {
|
|
return;
|
|
}
|
|
|
|
if (aContent == mPreallocatedAppProcess) {
|
|
mPreallocatedAppProcess = nullptr;
|
|
mIsNuwaReady = false;
|
|
while (mSpareProcesses.Length() > 0) {
|
|
nsRefPtr<ContentParent> process = mSpareProcesses[mSpareProcesses.Length() - 1];
|
|
process->Close();
|
|
mSpareProcesses.RemoveElementAt(mSpareProcesses.Length() - 1);
|
|
}
|
|
ScheduleDelayedNuwaFork();
|
|
}
|
|
}
|
|
|
|
bool
|
|
PreallocatedProcessManagerImpl::IsNuwaReady()
|
|
{
|
|
return mIsNuwaReady;
|
|
}
|
|
|
|
void
|
|
PreallocatedProcessManagerImpl::OnNuwaReady()
|
|
{
|
|
NS_ASSERTION(!mIsNuwaReady, "Multiple Nuwa processes created!");
|
|
ProcessPriorityManager::SetProcessPriority(mPreallocatedAppProcess,
|
|
hal::PROCESS_PRIORITY_MASTER);
|
|
mIsNuwaReady = true;
|
|
if (Preferences::GetBool("dom.ipc.processPriorityManager.testMode")) {
|
|
AutoJSContext cx;
|
|
nsCOMPtr<nsIMessageBroadcaster> ppmm =
|
|
do_GetService("@mozilla.org/parentprocessmessagemanager;1");
|
|
mozilla::unused << ppmm->BroadcastAsyncMessage(
|
|
NS_LITERAL_STRING("TEST-ONLY:nuwa-ready"),
|
|
JS::NullHandleValue, JS::NullHandleValue, cx, 1);
|
|
}
|
|
NuwaFork();
|
|
}
|
|
|
|
bool
|
|
PreallocatedProcessManagerImpl::PreallocatedProcessReady()
|
|
{
|
|
return !mSpareProcesses.IsEmpty();
|
|
}
|
|
|
|
|
|
void
|
|
PreallocatedProcessManagerImpl::NuwaFork()
|
|
{
|
|
mPreallocatedAppProcess->ForkNewProcess(false);
|
|
}
|
|
#endif
|
|
|
|
void
|
|
PreallocatedProcessManagerImpl::Disable()
|
|
{
|
|
if (!mEnabled) {
|
|
return;
|
|
}
|
|
|
|
mEnabled = false;
|
|
|
|
#ifdef MOZ_NUWA_PROCESS
|
|
// Cancel pending fork.
|
|
if (mPreallocateAppProcessTask) {
|
|
mPreallocateAppProcessTask->Cancel();
|
|
mPreallocateAppProcessTask = nullptr;
|
|
}
|
|
#endif
|
|
|
|
if (mPreallocatedAppProcess) {
|
|
#ifdef MOZ_NUWA_PROCESS
|
|
while (mSpareProcesses.Length() > 0){
|
|
nsRefPtr<ContentParent> process = mSpareProcesses[0];
|
|
process->Close();
|
|
mSpareProcesses.RemoveElementAt(0);
|
|
}
|
|
mIsNuwaReady = false;
|
|
#endif
|
|
mPreallocatedAppProcess->Close();
|
|
mPreallocatedAppProcess = nullptr;
|
|
}
|
|
}
|
|
|
|
void
|
|
PreallocatedProcessManagerImpl::ObserveProcessShutdown(nsISupports* aSubject)
|
|
{
|
|
if (!mPreallocatedAppProcess) {
|
|
return;
|
|
}
|
|
|
|
nsCOMPtr<nsIPropertyBag2> props = do_QueryInterface(aSubject);
|
|
NS_ENSURE_TRUE_VOID(props);
|
|
|
|
uint64_t childID = CONTENT_PROCESS_ID_UNKNOWN;
|
|
props->GetPropertyAsUint64(NS_LITERAL_STRING("childID"), &childID);
|
|
NS_ENSURE_TRUE_VOID(childID != CONTENT_PROCESS_ID_UNKNOWN);
|
|
|
|
if (childID == mPreallocatedAppProcess->ChildID()) {
|
|
mPreallocatedAppProcess = nullptr;
|
|
}
|
|
}
|
|
|
|
inline PreallocatedProcessManagerImpl* GetPPMImpl()
|
|
{
|
|
return PreallocatedProcessManagerImpl::Singleton();
|
|
}
|
|
|
|
} // namespace
|
|
|
|
namespace mozilla {
|
|
|
|
/* static */ void
|
|
PreallocatedProcessManager::AllocateAfterDelay()
|
|
{
|
|
#ifdef MOZ_NUWA_PROCESS
|
|
GetPPMImpl()->ScheduleDelayedNuwaFork();
|
|
#else
|
|
GetPPMImpl()->AllocateAfterDelay();
|
|
#endif
|
|
}
|
|
|
|
/* static */ void
|
|
PreallocatedProcessManager::AllocateOnIdle()
|
|
{
|
|
GetPPMImpl()->AllocateOnIdle();
|
|
}
|
|
|
|
/* static */ void
|
|
PreallocatedProcessManager::AllocateNow()
|
|
{
|
|
GetPPMImpl()->AllocateNow();
|
|
}
|
|
|
|
/* static */ already_AddRefed<ContentParent>
|
|
PreallocatedProcessManager::Take()
|
|
{
|
|
#ifdef MOZ_NUWA_PROCESS
|
|
return GetPPMImpl()->GetSpareProcess();
|
|
#else
|
|
return GetPPMImpl()->Take();
|
|
#endif
|
|
}
|
|
|
|
#ifdef MOZ_NUWA_PROCESS
|
|
/* static */ void
|
|
PreallocatedProcessManager::PublishSpareProcess(ContentParent* aContent)
|
|
{
|
|
GetPPMImpl()->PublishSpareProcess(aContent);
|
|
}
|
|
|
|
/* static */ void
|
|
PreallocatedProcessManager::MaybeForgetSpare(ContentParent* aContent)
|
|
{
|
|
GetPPMImpl()->MaybeForgetSpare(aContent);
|
|
}
|
|
|
|
/* static */ void
|
|
PreallocatedProcessManager::OnNuwaReady()
|
|
{
|
|
GetPPMImpl()->OnNuwaReady();
|
|
}
|
|
|
|
/* static */ bool
|
|
PreallocatedProcessManager::IsNuwaReady()
|
|
{
|
|
return GetPPMImpl()->IsNuwaReady();
|
|
}
|
|
|
|
/*static */ bool
|
|
PreallocatedProcessManager::PreallocatedProcessReady()
|
|
{
|
|
return GetPPMImpl()->PreallocatedProcessReady();
|
|
}
|
|
|
|
#endif
|
|
|
|
} // namespace mozilla
|