mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Backed out changeset be43a81b35f9 (bug 1689953) for causing failure at test_terminator_record.js. CLOSED TREE

This commit is contained in:
Butkovits Atila 2021-02-27 05:03:11 +02:00
Родитель 0dcdff469a
Коммит bb3fe218a4
42 изменённых файлов: 236 добавлений и 371 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
accessible/ipc/win/DocAccessibleChild.cpp
Просмотреть файл

@ -22,7 +22,7 @@ DocAccessibleChild::DocAccessibleChild(DocAccessible* aDoc, IProtocol* aManager)
MOZ_COUNT_CTOR_INHERITED(DocAccessibleChild, DocAccessibleChildBase);
if (!sPlatformChild) {
sPlatformChild = new PlatformChild();
ClearOnShutdown(&sPlatformChild, ShutdownPhase::XPCOMShutdown);
ClearOnShutdown(&sPlatformChild, ShutdownPhase::Shutdown);
}
SetManager(aManager);

2
browser/components/enterprisepolicies/tests/browser/browser_policy_cookie_settings.js
Просмотреть файл

@ -28,7 +28,7 @@ async function fake_profile_change() {
}, "cookie-db-closed");
Services.cookies
.QueryInterface(Ci.nsIObserver)
.observe(null, "profile-before-change", null);
.observe(null, "profile-before-change", "shutdown-persist");
});
await new Promise(resolve => {
Services.obs.addObserver(function waitForDBOpen() {

2
dom/ipc/ContentChild.cpp
Просмотреть файл

@ -575,7 +575,7 @@ ContentChild::ContentChild()
// happens without requiring the observer service at this time.
if (!sShutdownCanary) {
sShutdownCanary = new ShutdownCanary();
ClearOnShutdown(&sShutdownCanary, ShutdownPhase::XPCOMShutdown);
ClearOnShutdown(&sShutdownCanary, ShutdownPhase::Shutdown);
}
}

2
dom/ipc/ContentParent.cpp
Просмотреть файл

@ -2839,7 +2839,7 @@ bool ContentParent::InitInternal(ProcessPriority aInitialPriority) {
// can't init the process without it, and since we're going to be canceling
// whatever load attempt that initiated this process creation anyway, just
// bail out now if shutdown has already started.
if (PastShutdownPhase(ShutdownPhase::XPCOMShutdown)) {
if (PastShutdownPhase(ShutdownPhase::Shutdown)) {
return false;
}

2
dom/media/MediaCache.cpp
Просмотреть файл

@ -773,7 +773,7 @@ RefPtr<MediaCache> MediaCache::GetMediaCache(int64_t aContentLength,
thread->Shutdown();
}
} sClearThread;
ClearOnShutdown(&sClearThread, ShutdownPhase::XPCOMShutdownThreads);
ClearOnShutdown(&sClearThread, ShutdownPhase::ShutdownThreads);
}
if (!sThread) {

6
dom/media/doctor/DecoderDoctorLogger.cpp
Просмотреть файл

@ -116,11 +116,9 @@ bool DecoderDoctorLogger::EnsureLogIsEnabled() {
TaskCategory::Other,
NS_NewRunnableFunction("DDLogger shutdown setup", [] {
sDDLogShutdowner = MakeUnique<DDLogShutdowner>();
ClearOnShutdown(&sDDLogShutdowner,
ShutdownPhase::XPCOMShutdown);
ClearOnShutdown(&sDDLogShutdowner, ShutdownPhase::Shutdown);
sDDLogDeleter = MakeUnique<DDLogDeleter>();
ClearOnShutdown(&sDDLogDeleter,
ShutdownPhase::XPCOMShutdownThreads);
ClearOnShutdown(&sDDLogDeleter, ShutdownPhase::ShutdownThreads);
})));
// Nobody else should change the state when *we* are enabling logging.

2
dom/media/mediacapabilities/MediaCapabilities.cpp
Просмотреть файл

@ -257,7 +257,7 @@ already_AddRefed<Promise> MediaCapabilities::DecodingInfo(
NS_NewRunnableFunction(
"MediaCapabilities::AllocPolicy:Video", []() {
ClearOnShutdown(&sVideoAllocPolicy,
ShutdownPhase::XPCOMShutdownThreads);
ShutdownPhase::ShutdownThreads);
}));
return new SingleAllocPolicy(TrackInfo::TrackType::kVideoTrack,
taskQueue);

6
dom/media/platforms/AllocationPolicy.cpp
Просмотреть файл

@ -97,8 +97,7 @@ NotNull<AllocPolicy*> GlobalAllocPolicy::Instance(TrackType aTrack) {
TaskCategory::Other,
NS_NewRunnableFunction(
"GlobalAllocPolicy::GlobalAllocPolicy:Audio", []() {
ClearOnShutdown(&sAudioPolicy,
ShutdownPhase::XPCOMShutdownThreads);
ClearOnShutdown(&sAudioPolicy, ShutdownPhase::ShutdownThreads);
}));
return new AllocPolicyImpl(MediaDecoderLimitDefault());
}();
@ -109,8 +108,7 @@ NotNull<AllocPolicy*> GlobalAllocPolicy::Instance(TrackType aTrack) {
TaskCategory::Other,
NS_NewRunnableFunction(
"GlobalAllocPolicy::GlobalAllocPolicy:Audio", []() {
ClearOnShutdown(&sVideoPolicy,
ShutdownPhase::XPCOMShutdownThreads);
ClearOnShutdown(&sVideoPolicy, ShutdownPhase::ShutdownThreads);
}));
return new AllocPolicyImpl(MediaDecoderLimitDefault());
}();

2
dom/media/webrtc/CubebDeviceEnumerator.cpp
Просмотреть файл

@ -30,7 +30,7 @@ CubebDeviceEnumerator* CubebDeviceEnumerator::GetInstance() {
sInstance = new CubebDeviceEnumerator();
static bool clearOnShutdownSetup = []() -> bool {
auto setClearOnShutdown = []() -> void {
ClearOnShutdown(&sInstance, ShutdownPhase::XPCOMShutdownThreads);
ClearOnShutdown(&sInstance, ShutdownPhase::ShutdownThreads);
};
if (NS_IsMainThread()) {
setClearOnShutdown();

2
dom/media/webrtc/transport/nr_socket_prsock.cpp
Просмотреть файл

@ -241,7 +241,7 @@ class SingletonThreadHolder final {
static StaticRefPtr<SingletonThreadHolder> sThread;
static void ClearSingletonOnShutdown() {
ClearOnShutdown(&sThread, ShutdownPhase::XPCOMShutdownLoaders);
ClearOnShutdown(&sThread, ShutdownPhase::ShutdownLoaders);
}
#endif

2
dom/plugins/ipc/PluginProcessChild.cpp
Просмотреть файл

@ -176,7 +176,7 @@ void PluginProcessChild::CleanUp() {
NS_LogTerm();
#endif
mozilla::KillClearOnShutdown(ShutdownPhase::XPCOMShutdownFinal);
mozilla::KillClearOnShutdown(ShutdownPhase::ShutdownFinal);
AbstractThread::ShutdownMainThread();

2
dom/storage/SessionStorageManager.cpp
Просмотреть файл

@ -625,7 +625,7 @@ BackgroundSessionStorageManager* BackgroundSessionStorageManager::GetOrCreate(
return;
}
},
ShutdownPhase::XPCOMShutdown);
ShutdownPhase::Shutdown);
}));
}

2
dom/webauthn/U2FTokenManager.cpp
Просмотреть файл

@ -89,7 +89,7 @@ class U2FPrefManager final : public nsIObserver {
PREF_WEBAUTHN_ANDROID_FIDO2_ENABLED);
Preferences::AddStrongObserver(gPrefManager,
PREF_WEBAUTHN_ALLOW_DIRECT_ATTESTATION);
ClearOnShutdown(&gPrefManager, ShutdownPhase::XPCOMShutdownThreads);
ClearOnShutdown(&gPrefManager, ShutdownPhase::ShutdownThreads);
}
return gPrefManager;
}

2
gfx/vr/VRManager.cpp
Просмотреть файл

@ -161,7 +161,7 @@ VRManager::VRManager()
VRServiceHost::Init(mVRProcessEnabled);
mServiceHost = VRServiceHost::Get();
// We must shutdown before VRServiceHost, which is cleared
// on ShutdownPhase::XPCOMShutdownFinal, potentially before VRManager.
// on ShutdownPhase::ShutdownFinal, potentially before VRManager.
// We hold a reference to VRServiceHost to ensure it stays
// alive until we have shut down.
#else

3
gfx/vr/VRServiceHost.cpp
Просмотреть файл

@ -240,8 +240,7 @@ void VRServiceHost::PuppetReset() {
// If we're already into ShutdownFinal, the VRPuppetCommandBuffer instance
// will have been cleared, so don't try to access it after that point.
if (!mVRProcessEnabled &&
!(NS_IsMainThread() &&
PastShutdownPhase(ShutdownPhase::XPCOMShutdownFinal))) {
!(NS_IsMainThread() && PastShutdownPhase(ShutdownPhase::ShutdownFinal))) {
// Puppet is running in this process, tell it to reset directly.
VRPuppetCommandBuffer::Get().Reset();
}

2
intl/locale/LocaleService.cpp
Просмотреть файл

@ -152,7 +152,7 @@ LocaleService* LocaleService::GetInstance() {
}
// DOM might use ICUUtils and LocaleService during UnbindFromTree by
// final cycle collection.
ClearOnShutdown(&sInstance, ShutdownPhase::CCPostLastCycleCollection);
ClearOnShutdown(&sInstance, ShutdownPhase::ShutdownPostLastCycleCollection);
}
return sInstance;
}

4
intl/strres/nsStringBundle.cpp
Просмотреть файл

@ -472,7 +472,7 @@ nsresult nsStringBundleBase::ParseProperties(nsIPersistentProperties** aProps) {
nsresult nsStringBundle::LoadProperties() {
// Something such as Necko might use string bundle after ClearOnShutdown is
// called. LocaleService etc is already down, so we cannot get bundle data.
if (PastShutdownPhase(ShutdownPhase::XPCOMShutdown)) {
if (PastShutdownPhase(ShutdownPhase::Shutdown)) {
return NS_ERROR_ILLEGAL_DURING_SHUTDOWN;
}
@ -500,7 +500,7 @@ nsresult SharedStringBundle::LoadProperties() {
// our string bundles come from). Since shared string bundles won't be
// useful after shutdown has started anyway (and we almost certainly got
// here from a pre-load attempt in an idle task), just bail out.
if (PastShutdownPhase(ShutdownPhase::XPCOMShutdown)) {
if (PastShutdownPhase(ShutdownPhase::Shutdown)) {
return NS_ERROR_ILLEGAL_DURING_SHUTDOWN;
}

2
ipc/mscom/EnsureMTA.cpp
Просмотреть файл

@ -126,7 +126,7 @@ nsCOMPtr<nsIThread> EnsureMTA::GetMTAThread() {
BackgroundMTAData* bgData = new BackgroundMTAData();
auto setClearOnShutdown = [ptr = &sMTAData]() -> void {
ClearOnShutdown(ptr, ShutdownPhase::XPCOMShutdownThreads);
ClearOnShutdown(ptr, ShutdownPhase::ShutdownThreads);
};
if (NS_IsMainThread()) {

2
ipc/mscom/Registration.cpp
Просмотреть файл

@ -500,7 +500,7 @@ void RegisterArrayData(const ArrayData* aArrayData, size_t aLength) {
if (!sArrayData) {
sArrayData = new Vector<std::pair<const ArrayData*, size_t>>();
ClearOnShutdown(&sArrayData, ShutdownPhase::XPCOMShutdownThreads);
ClearOnShutdown(&sArrayData, ShutdownPhase::ShutdownThreads);
}
MOZ_ALWAYS_TRUE(sArrayData->emplaceBack(std::make_pair(aArrayData, aLength)));

2
js/xpconnect/loader/mozJSComponentLoader.cpp
Просмотреть файл

@ -1220,7 +1220,7 @@ nsresult mozJSComponentLoader::Import(JSContext* aCx,
!mInProgressImports.Get(info.Key(), &mod)) {
// We're trying to import a new JSM, but we're late in shutdown and this
// will likely not succeed and might even crash, so fail here.
if (PastShutdownPhase(ShutdownPhase::XPCOMShutdownFinal)) {
if (PastShutdownPhase(ShutdownPhase::ShutdownFinal)) {
return NS_ERROR_ILLEGAL_DURING_SHUTDOWN;
}

3
netwerk/protocol/http/nsHttpHandler.cpp
Просмотреть файл

@ -172,7 +172,8 @@ already_AddRefed<nsHttpHandler> nsHttpHandler::GetInstance() {
MOZ_ASSERT(NS_SUCCEEDED(rv));
// There is code that may be executed during the final cycle collection
// shutdown and still referencing gHttpHandler.
ClearOnShutdown(&gHttpHandler, ShutdownPhase::CCPostLastCycleCollection);
ClearOnShutdown(&gHttpHandler,
ShutdownPhase::ShutdownPostLastCycleCollection);
}
RefPtr<nsHttpHandler> httpHandler = gHttpHandler;
return httpHandler.forget();

4
netwerk/test/unit/head_cookies.js
Просмотреть файл

@ -100,7 +100,7 @@ function do_close_profile(generator) {
// Close the db.
let service = Services.cookies.QueryInterface(Ci.nsIObserver);
service.observe(null, "profile-before-change", null);
service.observe(null, "profile-before-change", "shutdown-persist");
}
function _promise_observer(topic) {
@ -131,7 +131,7 @@ function promise_close_profile() {
// Close the db.
let service = Services.cookies.QueryInterface(Ci.nsIObserver);
service.observe(null, "profile-before-change", null);
service.observe(null, "profile-before-change", "shutdown-persist");
return promise;
}

2
toolkit/components/extensions/webrequest/ChannelWrapper.cpp
Просмотреть файл

@ -100,7 +100,7 @@ static LinkedList<ChannelWrapper>& ChannelList() {
static UniquePtr<ChannelListHolder> sChannelList;
if (!sChannelList) {
sChannelList.reset(new ChannelListHolder());
ClearOnShutdown(&sChannelList, ShutdownPhase::XPCOMShutdown);
ClearOnShutdown(&sChannelList, ShutdownPhase::Shutdown);
}
return *sChannelList;
}

9
toolkit/components/startup/nsAppStartup.cpp
Просмотреть файл

@ -441,10 +441,11 @@ nsAppStartup::Quit(uint32_t aMode, int aExitCode, bool* aUserAllowedQuit) {
// No chance of the shutdown being cancelled from here on; tell people
// we're shutting down for sure while all services are still available.
bool isRestarting = mozilla::AppShutdown::IsRestarting();
mozilla::AppShutdown::AdvanceShutdownPhase(
mozilla::ShutdownPhase::AppShutdownConfirmed,
isRestarting ? u"restart" : u"shutdown");
if (obsService) {
bool isRestarting = mozilla::AppShutdown::IsRestarting();
obsService->NotifyObservers(nullptr, "quit-application",
isRestarting ? u"restart" : u"shutdown");
}
if (!mRunning) {
postedExitEvent = true;

45
toolkit/components/telemetry/Histograms.json
Просмотреть файл

@ -12632,21 +12632,8 @@
"kind": "exponential",
"high": 65,
"n_buckets": 10,
"bug_numbers": [1689953],
"alert_emails": ["dothayer@mozilla.com, jstutte@mozilla.com"],
"description": "Duration of shutdown phase quit-application, as measured by the shutdown terminator, in seconds of activity"
},
"SHUTDOWN_PHASE_DURATION_TICKS_PROFILE_CHANGE_NET_TEARDOWN": {
"record_in_processes": ["main", "content"],
"products": ["firefox", "fennec", "thunderbird"],
"expires_in_version": "never",
"kind": "exponential",
"high": 65,
"n_buckets": 10,
"bug_numbers": [1689953],
"alert_emails": ["dothayer@mozilla.com, jstutte@mozilla.com"],
"description": "Duration of shutdown phase profile-change-net-teardown, as measured by the shutdown terminator, in seconds of activity"
},
"SHUTDOWN_PHASE_DURATION_TICKS_PROFILE_CHANGE_TEARDOWN": {
"record_in_processes": ["main", "content"],
"products": ["firefox", "fennec", "thunderbird"],
@ -12654,32 +12641,8 @@
"kind": "exponential",
"high": 65,
"n_buckets": 10,
"bug_numbers": [1689953],
"alert_emails": ["dothayer@mozilla.com, jstutte@mozilla.com"],
"description": "Duration of shutdown phase profile-change-teardown, as measured by the shutdown terminator, in seconds of activity"
},
"SHUTDOWN_PHASE_DURATION_TICKS_PROFILE_BEFORE_CHANGE": {
"record_in_processes": ["main", "content"],
"products": ["firefox", "fennec", "thunderbird"],
"expires_in_version": "never",
"kind": "exponential",
"high": 65,
"n_buckets": 10,
"bug_numbers": [1689953],
"alert_emails": ["dothayer@mozilla.com, jstutte@mozilla.com"],
"description": "Duration of shutdown phase profile-before-change, as measured by the shutdown terminator, in seconds of activity"
},
"SHUTDOWN_PHASE_DURATION_TICKS_PROFILE_BEFORE_CHANGE_QM": {
"record_in_processes": ["main", "content"],
"products": ["firefox", "fennec", "thunderbird"],
"expires_in_version": "never",
"kind": "exponential",
"high": 65,
"n_buckets": 10,
"bug_numbers": [1689953],
"alert_emails": ["dothayer@mozilla.com, jstutte@mozilla.com"],
"description": "Duration of shutdown phase profile-before-change-qm, as measured by the shutdown terminator, in seconds of activity"
},
"SHUTDOWN_PHASE_DURATION_TICKS_XPCOM_WILL_SHUTDOWN": {
"record_in_processes": ["main", "content"],
"products": ["firefox", "fennec", "thunderbird"],
@ -12687,20 +12650,16 @@
"kind": "exponential",
"high": 65,
"n_buckets": 10,
"bug_numbers": [1689953],
"alert_emails": ["dothayer@mozilla.com, jstutte@mozilla.com"],
"description": "Duration of shutdown phase xpcom-will-shutdown, as measured by the shutdown terminator, in seconds of activity"
},
"SHUTDOWN_PHASE_DURATION_TICKS_XPCOM_SHUTDOWN": {
"SHUTDOWN_PHASE_DURATION_TICKS_PROFILE_BEFORE_CHANGE": {
"record_in_processes": ["main", "content"],
"products": ["firefox", "fennec", "thunderbird"],
"expires_in_version": "never",
"kind": "exponential",
"high": 65,
"n_buckets": 10,
"bug_numbers": [1689953],
"alert_emails": ["dothayer@mozilla.com, jstutte@mozilla.com"],
"description": "Duration of shutdown phase xpcom-shutdown, as measured by the shutdown terminator, in seconds of activity"
"description": "Duration of shutdown phase profile-before-change, as measured by the shutdown terminator, in seconds of activity"
},
"TAP_TO_LOAD_ENABLED": {
"record_in_processes": ["main", "content"],

8
toolkit/components/telemetry/histogram-allowlists.json
Просмотреть файл

@ -316,6 +316,10 @@
"SERVICE_WORKER_WAS_SPAWNED",
"SHOULD_AUTO_DETECT_LANGUAGE",
"SHOULD_TRANSLATION_UI_APPEAR",
"SHUTDOWN_PHASE_DURATION_TICKS_PROFILE_BEFORE_CHANGE",
"SHUTDOWN_PHASE_DURATION_TICKS_PROFILE_CHANGE_TEARDOWN",
"SHUTDOWN_PHASE_DURATION_TICKS_QUIT_APPLICATION",
"SHUTDOWN_PHASE_DURATION_TICKS_XPCOM_WILL_SHUTDOWN",
"SLOW_ADDON_WARNING_RESPONSE_TIME",
"SLOW_ADDON_WARNING_STATES",
"STARTUP_CRASH_DETECTED",
@ -788,6 +792,10 @@
"SERVICE_WORKER_WAS_SPAWNED",
"SHOULD_AUTO_DETECT_LANGUAGE",
"SHOULD_TRANSLATION_UI_APPEAR",
"SHUTDOWN_PHASE_DURATION_TICKS_PROFILE_BEFORE_CHANGE",
"SHUTDOWN_PHASE_DURATION_TICKS_PROFILE_CHANGE_TEARDOWN",
"SHUTDOWN_PHASE_DURATION_TICKS_QUIT_APPLICATION",
"SHUTDOWN_PHASE_DURATION_TICKS_XPCOM_WILL_SHUTDOWN",
"SLOW_ADDON_WARNING_RESPONSE_TIME",
"SLOW_ADDON_WARNING_STATES",
"SLOW_SCRIPT_NOTICE_COUNT",

5
toolkit/components/terminator/TerminatorTelemetry.jsm
Просмотреть файл

@ -31,16 +31,11 @@ function nsTerminatorTelemetry() {}
var HISTOGRAMS = {
"quit-application": "SHUTDOWN_PHASE_DURATION_TICKS_QUIT_APPLICATION",
"profile-change-net-teardown":
"SHUTDOWN_PHASE_DURATION_TICKS_PROFILE_CHANGE_NET_TEARDOWN",
"profile-change-teardown":
"SHUTDOWN_PHASE_DURATION_TICKS_PROFILE_CHANGE_TEARDOWN",
"profile-before-change":
"SHUTDOWN_PHASE_DURATION_TICKS_PROFILE_BEFORE_CHANGE",
"profile-before-change-qm":
"SHUTDOWN_PHASE_DURATION_TICKS_PROFILE_BEFORE_CHANGE_QM",
"xpcom-will-shutdown": "SHUTDOWN_PHASE_DURATION_TICKS_XPCOM_WILL_SHUTDOWN",
"xpcom-shutdown": "SHUTDOWN_PHASE_DURATION_TICKS_XPCOM_SHUTDOWN",
};
nsTerminatorTelemetry.prototype = {

149
toolkit/components/terminator/nsTerminator.cpp
Просмотреть файл

@ -15,7 +15,6 @@
* process as fast as possible, without any cleanup.
*/
#include "mozilla/ShutdownPhase.h"
#include "nsTerminator.h"
#include "prthread.h"
@ -40,7 +39,6 @@
# include <unistd.h>
#endif
#include "mozilla/AppShutdown.h"
#include "mozilla/ArrayUtils.h"
#include "mozilla/Atomics.h"
#include "mozilla/Attributes.h"
@ -66,8 +64,6 @@
// forcefully.
#define ADDITIONAL_WAIT_BEFORE_CRASH_MS 3000
#define HEARTBEAT_INTERVAL_MS 100
namespace mozilla {
namespace {
@ -80,34 +76,25 @@ namespace {
* ticks between the time we receive a notification and the next one.
*/
struct ShutdownStep {
mozilla::ShutdownPhase mPhase;
char const* const mTopic;
int mTicks;
constexpr explicit ShutdownStep(mozilla::ShutdownPhase aPhase)
: mPhase(aPhase), mTicks(-1) {}
constexpr explicit ShutdownStep(const char* const topic)
: mTopic(topic), mTicks(-1) {}
};
static ShutdownStep sShutdownSteps[] = {
ShutdownStep(mozilla::ShutdownPhase::AppShutdownConfirmed),
ShutdownStep(mozilla::ShutdownPhase::AppShutdownNetTeardown),
ShutdownStep(mozilla::ShutdownPhase::AppShutdownTeardown),
ShutdownStep(mozilla::ShutdownPhase::AppShutdown),
ShutdownStep(mozilla::ShutdownPhase::AppShutdownQM),
ShutdownStep(mozilla::ShutdownPhase::XPCOMWillShutdown),
ShutdownStep(mozilla::ShutdownPhase::XPCOMShutdown),
ShutdownStep("quit-application"),
ShutdownStep("profile-change-net-teardown"),
ShutdownStep("profile-change-teardown"),
ShutdownStep("profile-before-change"),
ShutdownStep("profile-before-change-qm"),
ShutdownStep("xpcom-will-shutdown"),
ShutdownStep("xpcom-shutdown"),
};
Atomic<bool> sShutdownNotified;
int GetStepForPhase(mozilla::ShutdownPhase aPhase) {
for (size_t i = 0; i < std::size(sShutdownSteps); i++) {
if (sShutdownSteps[i].mPhase >= aPhase) {
return (int)i;
}
}
return -1;
}
// Utility function: create a thread that is non-joinable,
// does not prevent the process from terminating, is never
// cooperatively scheduled, and uses a default stack size.
@ -185,9 +172,9 @@ void RunWatchdog(void* arg) {
// more reasonable.
//
#if defined(XP_WIN)
Sleep(HEARTBEAT_INTERVAL_MS /* ms */);
Sleep(1000 /* ms */);
#else
usleep(HEARTBEAT_INTERVAL_MS * 1000 /* usec */);
usleep(1000000 /* usec */);
#endif
if (gHeartbeat++ < timeToLive) {
@ -198,24 +185,24 @@ void RunWatchdog(void* arg) {
// The shutdown steps are not completed yet. Let's report the last one.
if (!sShutdownNotified) {
mozilla::ShutdownPhase lastStep = mozilla::ShutdownPhase::NotInShutdown;
const char* lastStep = nullptr;
// Looping inverse here to make the search more robust in case
// the observer that triggers UpdateHeartbeat was not called
// at all or in the expected order on some step. This should
// give us always the last known ShutdownStep.
for (int i = ArrayLength(sShutdownSteps) - 1; i >= 0; --i) {
if (sShutdownSteps[i].mTicks > -1) {
lastStep = sShutdownSteps[i].mPhase;
lastStep = sShutdownSteps[i].mTopic;
break;
}
}
if (lastStep != mozilla::ShutdownPhase::NotInShutdown) {
if (lastStep) {
nsCString msg;
msg.AppendPrintf(
"Shutdown hanging at step %s. "
"Something is blocking the main-thread.",
mozilla::AppShutdown::GetObserverKey(lastStep));
lastStep);
// This string will be leaked.
MOZ_CRASH_UNSAFE(strdup(msg.BeginReading()));
}
@ -362,7 +349,6 @@ void RunWriter(void* arg) {
// will be written correctly, but, again, we don't care enough
// about the data to make more efforts.
//
Unused << PR_Delete(destinationPath.get());
if (PR_Rename(tmpFilePath.get(), destinationPath.get()) != PR_SUCCESS) {
break;
}
@ -375,11 +361,25 @@ NS_IMPL_ISUPPORTS(nsTerminator, nsIObserver)
nsTerminator::nsTerminator() : mInitialized(false), mCurrentStep(-1) {}
// During startup, register as an observer for all interesting topics.
nsresult nsTerminator::SelfInit() {
nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
if (!os) {
return NS_ERROR_UNEXPECTED;
}
for (auto& shutdownStep : sShutdownSteps) {
DebugOnly<nsresult> rv = os->AddObserver(this, shutdownStep.mTopic, false);
NS_WARNING_ASSERTION(NS_SUCCEEDED(rv), "AddObserver failed");
}
return NS_OK;
}
// Actually launch these threads. This takes place at the first sign of
// shutdown.
void nsTerminator::Start() {
MOZ_ASSERT(!mInitialized);
sShutdownNotified = false;
StartWatchdog();
#if !defined(NS_FREE_PERMANENT_DATA)
// Only allow nsTerminator to write on non-leak-checked builds so we don't
@ -388,33 +388,7 @@ void nsTerminator::Start() {
StartWriter();
#endif // !defined(NS_FREE_PERMANENT_DATA)
mInitialized = true;
}
NS_IMETHODIMP
nsTerminator::Observe(nsISupports*, const char* aTopic, const char16_t*) {
// This Observe is now only used for testing purposes.
// XXX: Check if we should change our testing strategy.
if (strcmp(aTopic, "terminator-test-quit-application") == 0) {
AdvancePhase(mozilla::ShutdownPhase::AppShutdownConfirmed);
} else if (strcmp(aTopic, "terminator-test-profile-change-net-teardown") ==
0) {
AdvancePhase(mozilla::ShutdownPhase::AppShutdownNetTeardown);
} else if (strcmp(aTopic, "terminator-test-profile-change-teardown") == 0) {
AdvancePhase(mozilla::ShutdownPhase::AppShutdownTeardown);
} else if (strcmp(aTopic, "terminator-test-profile-before-change") == 0) {
AdvancePhase(mozilla::ShutdownPhase::AppShutdown);
} else if (strcmp(aTopic, "terminator-test-profile-before-change-qm") == 0) {
AdvancePhase(mozilla::ShutdownPhase::AppShutdownQM);
} else if (strcmp(aTopic,
"terminator-test-profile-before-change-telemetry") == 0) {
AdvancePhase(mozilla::ShutdownPhase::AppShutdownTelemetry);
} else if (strcmp(aTopic, "terminator-test-xpcom-will-shutdown") == 0) {
AdvancePhase(mozilla::ShutdownPhase::XPCOMWillShutdown);
} else if (strcmp(aTopic, "terminator-test-xpcom-shutdown") == 0) {
AdvancePhase(mozilla::ShutdownPhase::XPCOMShutdown);
}
return NS_OK;
sShutdownNotified = false;
}
// Prepare, allocate and start the watchdog thread.
@ -457,12 +431,11 @@ void nsTerminator::StartWatchdog() {
#endif
UniquePtr<Options> options(new Options());
const PRIntervalTime ticksDuration =
PR_MillisecondsToInterval(HEARTBEAT_INTERVAL_MS);
const PRIntervalTime ticksDuration = PR_MillisecondsToInterval(1000);
options->crashAfterTicks = crashAfterMS / ticksDuration;
// Handle systems where ticksDuration is greater than crashAfterMS.
if (options->crashAfterTicks == 0) {
options->crashAfterTicks = crashAfterMS / HEARTBEAT_INTERVAL_MS;
options->crashAfterTicks = crashAfterMS / 1000;
}
DebugOnly<PRThread*> watchdogThread =
@ -505,11 +478,14 @@ void nsTerminator::StartWriter() {
}
}
void nsTerminator::AdvancePhase(mozilla::ShutdownPhase aPhase) {
// If we are done, do nothing
if (sShutdownNotified) {
return;
NS_IMETHODIMP
nsTerminator::Observe(nsISupports*, const char* aTopic, const char16_t*) {
if (strcmp(aTopic, "profile-after-change") == 0) {
return SelfInit();
}
// Other notifications are shutdown-related.
// As we have seen examples in the wild of shutdown notifications
// not being sent (or not being sent in the expected order), we do
// not assume a specific order.
@ -517,29 +493,41 @@ void nsTerminator::AdvancePhase(mozilla::ShutdownPhase aPhase) {
Start();
}
UpdateHeartbeat(GetStepForPhase(aPhase));
UpdateHeartbeat(aTopic);
#if !defined(NS_FREE_PERMANENT_DATA)
// Only allow nsTerminator to write on non-leak checked builds so we don't get
// leak warnings on shutdown for intentional leaks (see bug 1242084). This
// will be enabled again by bug 1255484 when 1255478 lands.
UpdateTelemetry();
#endif // !defined(NS_FREE_PERMANENT_DATA)
UpdateCrashReport(mozilla::AppShutdown::GetObserverKey(aPhase));
UpdateCrashReport(aTopic);
// Perform a little cleanup
nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
MOZ_RELEASE_ASSERT(os);
(void)os->RemoveObserver(this, aTopic);
return NS_OK;
}
void nsTerminator::UpdateHeartbeat(int32_t aStep) {
MOZ_ASSERT(aStep >= mCurrentStep);
if (aStep > mCurrentStep) {
// Reset the clock, find out how long the current phase has lasted.
uint32_t ticks = gHeartbeat.exchange(0);
if (mCurrentStep >= 0) {
sShutdownSteps[mCurrentStep].mTicks = ticks;
}
sShutdownSteps[aStep].mTicks = 0;
mCurrentStep = aStep;
void nsTerminator::UpdateHeartbeat(const char* aTopic) {
// Reset the clock, find out how long the current phase has lasted.
uint32_t ticks = gHeartbeat.exchange(0);
if (mCurrentStep >= 0) {
sShutdownSteps[mCurrentStep].mTicks = ticks;
}
// Find out where we now are in the current shutdown.
// Don't assume that shutdown takes place in the expected order.
int nextStep = -1;
for (size_t i = 0; i < ArrayLength(sShutdownSteps); ++i) {
if (strcmp(sShutdownSteps[i].mTopic, aTopic) == 0) {
nextStep = i;
break;
}
}
MOZ_ASSERT(nextStep != -1);
mCurrentStep = nextStep;
}
void nsTerminator::UpdateTelemetry() {
@ -568,8 +556,7 @@ void nsTerminator::UpdateTelemetry() {
telemetryData->AppendLiteral(", ");
}
telemetryData->AppendLiteral(R"(")");
telemetryData->Append(
mozilla::AppShutdown::GetObserverKey(shutdownStep.mPhase));
telemetryData->Append(shutdownStep.mTopic);
telemetryData->AppendLiteral(R"(": )");
telemetryData->AppendInt(shutdownStep.mTicks);
}

6
toolkit/components/terminator/nsTerminator.h
Просмотреть файл

@ -18,21 +18,21 @@ class nsTerminator final : public nsIObserver {
NS_DECL_NSIOBSERVER
nsTerminator();
void AdvancePhase(mozilla::ShutdownPhase aPhase);
private:
nsresult SelfInit();
void Start();
void StartWatchdog();
void StartWriter();
void UpdateHeartbeat(int aStep);
void UpdateHeartbeat(const char* aTopic);
void UpdateTelemetry();
void UpdateCrashReport(const char* aTopic);
~nsTerminator() = default;
bool mInitialized;
int mCurrentStep;
int32_t mCurrentStep;
};
// This is called by XPCOMInit when the shutdown is completed.

41
toolkit/components/terminator/tests/xpcshell/test_terminator_record.js
Просмотреть файл

@ -16,17 +16,6 @@ var PATH;
var PATH_TMP;
var terminator;
let KEYS = [
"quit-application",
"profile-change-net-teardown",
"profile-change-teardown",
"profile-before-change",
"profile-before-change-qm",
"profile-before-change-telemetry",
"xpcom-will-shutdown",
"xpcom-shutdown",
];
add_task(async function init() {
do_get_profile();
PATH = Path.join(Constants.Path.localProfileDir, "ShutdownDuration.json");
@ -39,6 +28,7 @@ add_task(async function init() {
terminator = Cc["@mozilla.org/toolkit/shutdown-terminator;1"].createInstance(
Ci.nsIObserver
);
terminator.observe(null, "profile-after-change", null);
});
var promiseShutdownDurationData = async function() {
@ -61,22 +51,23 @@ var promiseShutdownDurationData = async function() {
};
add_task(async function test_record() {
let PHASE0 = "profile-change-teardown";
let PHASE1 = "profile-before-change";
let PHASE2 = "xpcom-will-shutdown";
let t0 = Date.now();
info("Starting shutdown");
terminator.observe(null, "terminator-test-" + KEYS[2], null);
await new Promise(resolve => setTimeout(resolve, 200));
terminator.observe(null, "profile-change-teardown", null);
info("Moving to next phase");
terminator.observe(null, "terminator-test-" + KEYS[3], null);
await new Promise(resolve => setTimeout(resolve, 100));
terminator.observe(null, PHASE1, null);
let data = await promiseShutdownDurationData();
let t1 = Date.now();
Assert.ok(KEYS[2] in data, "The file contains the expected key");
let duration = data[KEYS[2]];
Assert.ok(PHASE0 in data, "The file contains the expected key");
let duration = data[PHASE0];
Assert.equal(typeof duration, "number");
Assert.ok(duration >= 0, "Duration is a non-negative number");
Assert.ok(
@ -86,7 +77,7 @@ add_task(async function test_record() {
Assert.equal(
Object.keys(data).length,
2,
1,
"Data does not contain other durations"
);
@ -98,7 +89,7 @@ add_task(async function test_record() {
let WAIT_MS = 2000;
await new Promise(resolve => setTimeout(resolve, WAIT_MS));
terminator.observe(null, "terminator-test-" + KEYS[4], null);
terminator.observe(null, PHASE2, null);
data = await promiseShutdownDurationData();
let t2 = Date.now();
@ -107,18 +98,18 @@ add_task(async function test_record() {
Object.keys(data)
.sort()
.join(", "),
[KEYS[2], KEYS[3], KEYS[4]].sort().join(", "),
[PHASE0, PHASE1].sort().join(", "),
"The file contains the expected keys"
);
Assert.equal(data[KEYS[2]], duration, "Duration of phase 0 hasn't changed");
let duration2 = data[KEYS[3]];
Assert.equal(data[PHASE0], duration, "Duration of phase 0 hasn't changed");
let duration2 = data[PHASE1];
Assert.equal(typeof duration2, "number");
Assert.ok(
duration2 >= WAIT_MS / 100,
"We have waited at least " + WAIT_MS / 100 + " ticks"
duration2 >= WAIT_MS / 2000,
"We have waited at least " + WAIT_MS / 2000 + " ticks"
);
Assert.ok(
duration2 <= Math.ceil((t2 - t1) / 100) + 1,
duration2 <= Math.ceil((t2 - t1) / 1000) + 1,
"Duration is reasonable"
);
});

5
toolkit/components/terminator/tests/xpcshell/test_terminator_reload.js
Просмотреть файл

@ -15,16 +15,11 @@ var PATH;
var HISTOGRAMS = {
"quit-application": "SHUTDOWN_PHASE_DURATION_TICKS_QUIT_APPLICATION",
"profile-change-net-teardown":
"SHUTDOWN_PHASE_DURATION_TICKS_PROFILE_CHANGE_NET_TEARDOWN",
"profile-change-teardown":
"SHUTDOWN_PHASE_DURATION_TICKS_PROFILE_CHANGE_TEARDOWN",
"profile-before-change":
"SHUTDOWN_PHASE_DURATION_TICKS_PROFILE_BEFORE_CHANGE",
"profile-before-change-qm":
"SHUTDOWN_PHASE_DURATION_TICKS_PROFILE_BEFORE_CHANGE_QM",
"xpcom-will-shutdown": "SHUTDOWN_PHASE_DURATION_TICKS_XPCOM_WILL_SHUTDOWN",
"xpcom-shutdown": "SHUTDOWN_PHASE_DURATION_TICKS_XPCOM_SHUTDOWN",
};
add_task(async function init() {

10
toolkit/crashreporter/test/unit/test_crash_terminator.js
Просмотреть файл

@ -11,7 +11,7 @@ function setup_crash() {
);
Services.prefs.setBoolPref("toolkit.terminator.testing", true);
Services.prefs.setIntPref("toolkit.asyncshutdown.crash_timeout", 150);
Services.prefs.setIntPref("toolkit.asyncshutdown.crash_timeout", 10);
// Initialize the terminator
// (normally, this is done through the manifest file, but xpcshell
@ -19,12 +19,12 @@ function setup_crash() {
let terminator = Cc[
"@mozilla.org/toolkit/shutdown-terminator;1"
].createInstance(Ci.nsIObserver);
terminator.observe(null, "terminator-test-profile-after-change", null);
terminator.observe(null, "profile-after-change", null);
// Inform the terminator that shutdown has started
// Pick an arbitrary notification
terminator.observe(null, "terminator-test-profile-before-change", null);
terminator.observe(null, "terminator-test-xpcom-will-shutdown", null);
terminator.observe(null, "xpcom-will-shutdown", null);
terminator.observe(null, "profile-before-change", null);
dump("Waiting (actively) for the crash\n");
Services.tm.spinEventLoopUntil(() => false);
@ -32,7 +32,7 @@ function setup_crash() {
function after_crash(mdump, extra) {
info("Crash signature: " + JSON.stringify(extra, null, "\t"));
Assert.equal(extra.ShutdownProgress, "xpcom-will-shutdown");
Assert.equal(extra.ShutdownProgress, "profile-before-change");
}
add_task(async function run_test() {

9
toolkit/profile/notifications.txt
Просмотреть файл

@ -44,6 +44,15 @@ observer's Observe() method.
profile-do-change
profile-after-change
"shutdown-persist"
The user is logging out and whatever data the observer stores
for the current profile should be released from memory and
saved to disk.
The following topics happen in this context:
profile-change-net-teardown
profile-change-teardown
profile-before-change
See https://wiki.mozilla.org/XPCOM_Shutdown for more details about the shutdown
process.

35
toolkit/xre/nsXREDirProvider.cpp
Просмотреть файл

@ -37,7 +37,6 @@
#include "mozilla/dom/ScriptSettings.h"
#include "mozilla/AppShutdown.h"
#include "mozilla/AutoRestore.h"
#ifdef MOZ_BACKGROUNDTASKS
# include "mozilla/BackgroundTasks.h"
@ -1057,24 +1056,30 @@ void nsXREDirProvider::DoShutdown() {
AUTO_PROFILER_LABEL("nsXREDirProvider::DoShutdown", OTHER);
if (mProfileNotified) {
mozilla::AppShutdown::AdvanceShutdownPhase(
mozilla::ShutdownPhase::AppShutdownNetTeardown, nullptr);
mozilla::AppShutdown::AdvanceShutdownPhase(
mozilla::ShutdownPhase::AppShutdownTeardown, nullptr);
nsCOMPtr<nsIObserverService> obsSvc =
mozilla::services::GetObserverService();
NS_ASSERTION(obsSvc, "No observer service?");
if (obsSvc) {
static const char16_t kShutdownPersist[] = u"shutdown-persist";
obsSvc->NotifyObservers(nullptr, "profile-change-net-teardown",
kShutdownPersist);
obsSvc->NotifyObservers(nullptr, "profile-change-teardown",
kShutdownPersist);
#ifdef DEBUG
// Not having this causes large intermittent leaks. See bug 1340425.
if (JSContext* cx = mozilla::dom::danger::GetJSContext()) {
JS_GC(cx);
}
// Not having this causes large intermittent leaks. See bug 1340425.
if (JSContext* cx = mozilla::dom::danger::GetJSContext()) {
JS_GC(cx);
}
#endif
mozilla::AppShutdown::AdvanceShutdownPhase(
mozilla::ShutdownPhase::AppShutdown, nullptr);
mozilla::AppShutdown::AdvanceShutdownPhase(
mozilla::ShutdownPhase::AppShutdownQM, nullptr);
mozilla::AppShutdown::AdvanceShutdownPhase(
mozilla::ShutdownPhase::AppShutdownTelemetry, nullptr);
obsSvc->NotifyObservers(nullptr, "profile-before-change",
kShutdownPersist);
obsSvc->NotifyObservers(nullptr, "profile-before-change-qm",
kShutdownPersist);
obsSvc->NotifyObservers(nullptr, "profile-before-change-telemetry",
kShutdownPersist);
}
mProfileNotified = false;
}

2
tools/profiler/gecko/ProfilerParent.cpp
Просмотреть файл

@ -400,7 +400,7 @@ void ProfilerParentTracker::EnsureInstance() {
// The tracker should get destroyed before threads are shutdown, because its
// destruction closes extant channels, which could trigger promise rejections
// that need to be dispatched to other threads.
ClearOnShutdown(&sInstance, ShutdownPhase::XPCOMShutdownThreads);
ClearOnShutdown(&sInstance, ShutdownPhase::ShutdownThreads);
}
/* static */

2
widget/windows/WinUtils.cpp
Просмотреть файл

@ -2137,7 +2137,7 @@ const WinUtils::WhitelistVec& WinUtils::GetWhitelistedPaths() {
static WhitelistVec sWhitelist([]() -> WhitelistVec {
auto setClearFn = [ptr = &sWhitelist]() -> void {
RunOnShutdown([ptr]() -> void { ptr->clear(); },
ShutdownPhase::XPCOMShutdownFinal);
ShutdownPhase::ShutdownFinal);
};
if (NS_IsMainThread()) {

28
widget/windows/nsWindow.cpp
Просмотреть файл

@ -5197,30 +5197,22 @@ bool nsWindow::ProcessMessage(UINT msg, WPARAM& wParam, LPARAM& lParam,
// Windows won't let us do that. Bug 212316.
nsCOMPtr<nsIObserverService> obsServ =
mozilla::services::GetObserverService();
const char16_t* context = u"shutdown-persist";
const char16_t* syncShutdown = u"syncShutdown";
const char16_t* quitType = GetQuitType();
AppShutdown::Init(AppShutdownMode::Normal, 0);
obsServ->NotifyObservers(nullptr, "quit-application-granted",
syncShutdown);
obsServ->NotifyObservers(nullptr, "quit-application-forced", nullptr);
AppShutdown::OnShutdownConfirmed();
AppShutdown::AdvanceShutdownPhase(ShutdownPhase::AppShutdownConfirmed,
quitType);
AppShutdown::AdvanceShutdownPhase(ShutdownPhase::AppShutdownNetTeardown,
nullptr);
AppShutdown::AdvanceShutdownPhase(ShutdownPhase::AppShutdownTeardown,
nullptr);
AppShutdown::AdvanceShutdownPhase(ShutdownPhase::AppShutdown, nullptr);
AppShutdown::AdvanceShutdownPhase(ShutdownPhase::AppShutdownQM,
nullptr);
AppShutdown::AdvanceShutdownPhase(ShutdownPhase::AppShutdownTelemetry,
nullptr);
AppShutdown::DoImmediateExit();
obsServ->NotifyObservers(nullptr, "quit-application", quitType);
obsServ->NotifyObservers(nullptr, "profile-change-net-teardown",
context);
obsServ->NotifyObservers(nullptr, "profile-change-teardown", context);
obsServ->NotifyObservers(nullptr, "profile-before-change", context);
obsServ->NotifyObservers(nullptr, "profile-before-change-qm", context);
obsServ->NotifyObservers(nullptr, "profile-before-change-telemetry",
context);
mozilla::AppShutdown::DoImmediateExit();
}
sCanQuit = TRI_UNKNOWN;
result = true;

73
xpcom/base/AppShutdown.cpp
Просмотреть файл

@ -4,6 +4,8 @@
* 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 "AppShutdown.h"
#ifdef XP_WIN
# include <windows.h>
#else
@ -11,7 +13,6 @@
#endif
#include "GeckoProfiler.h"
#include "mozilla/ClearOnShutdown.h"
#include "mozilla/CmdLineAndEnvUtils.h"
#include "mozilla/PoisonIOInterposer.h"
#include "mozilla/Printf.h"
@ -20,19 +21,11 @@
#include "mozilla/StartupTimeline.h"
#include "mozilla/StaticPrefs_toolkit.h"
#include "mozilla/LateWriteChecks.h"
#include "mozilla/Services.h"
#include "nsAppDirectoryServiceDefs.h"
#include "nsAppRunner.h"
#include "nsDirectoryServiceUtils.h"
#include "nsICertStorage.h"
#include "nsThreadUtils.h"
#include "AppShutdown.h"
// TODO: understand why on Android we cannot include this and if we should
#ifndef ANDROID
# include "nsTerminator.h"
#endif
#include "prenv.h"
#ifdef MOZ_NEW_XULSTORE
@ -41,29 +34,6 @@
namespace mozilla {
const char* sPhaseObserverKeys[] = {
nullptr, // NotInShutdown
"quit-application", // AppShutdownConfirmed
"profile-change-net-teardown", // AppShutdownNetTeardown
"profile-change-teardown", // AppShutdownTeardown
"profile-before-change", // AppShutdown
"profile-before-change-qm", // AppShutdownQM
"profile-before-change-telemetry", // AppShutdownTelemetry
"xpcom-will-shutdown", // XPCOMWillShutdown
"xpcom-shutdown", // XPCOMShutdown
"xpcom-shutdown-threads", // XPCOMShutdownThreads
nullptr, // XPCOMShutdownLoaders
nullptr, // XPCOMShutdownFinal
nullptr // CCPostLastCycleCollection
};
static_assert(sizeof(sPhaseObserverKeys) / sizeof(sPhaseObserverKeys[0]) ==
(size_t)ShutdownPhase::ShutdownPhase_Length);
#ifndef ANDROID
static nsTerminator* sTerminator = nullptr;
#endif
static ShutdownPhase sFastShutdownPhase = ShutdownPhase::NotInShutdown;
static ShutdownPhase sLateWriteChecksPhase = ShutdownPhase::NotInShutdown;
static AppShutdownMode sShutdownMode = AppShutdownMode::Normal;
@ -84,11 +54,11 @@ static char* sSavedProfLDEnvVar = nullptr;
ShutdownPhase GetShutdownPhaseFromPrefValue(int32_t aPrefValue) {
switch (aPrefValue) {
case 1:
return ShutdownPhase::CCPostLastCycleCollection;
return ShutdownPhase::ShutdownPostLastCycleCollection;
case 2:
return ShutdownPhase::XPCOMShutdownThreads;
return ShutdownPhase::ShutdownThreads;
case 3:
return ShutdownPhase::XPCOMShutdown;
return ShutdownPhase::Shutdown;
// NOTE: the remaining values from the ShutdownPhase enum will be added
// when we're at least reasonably confident that the world won't come
// crashing down if we do a fast shutdown at that point.
@ -108,11 +78,6 @@ void AppShutdown::SaveEnvVarsForPotentialRestart() {
}
}
const char* AppShutdown::GetObserverKey(ShutdownPhase aPhase) {
return sPhaseObserverKeys[static_cast<std::underlying_type_t<ShutdownPhase>>(
aPhase)];
}
void AppShutdown::MaybeDoRestart() {
if (sShutdownMode == AppShutdownMode::Restart) {
StopLateWriteChecks();
@ -170,10 +135,6 @@ void AppShutdown::Init(AppShutdownMode aMode, int aExitCode) {
sExitCode = aExitCode;
#ifndef ANDROID
sTerminator = new nsTerminator();
#endif
// Late-write checks needs to find the profile directory, so it has to
// be initialized before services::Shutdown or (because of
// xpcshell tests replacing the service) modules being unloaded.
@ -282,28 +243,4 @@ bool AppShutdown::IsRestarting() {
return sShutdownMode == AppShutdownMode::Restart;
}
void AppShutdown::AdvanceShutdownPhase(
ShutdownPhase aPhase, const char16_t* aNotificationData,
nsCOMPtr<nsISupports> aNotificationSubject) {
#ifndef ANDROID
if (sTerminator) {
sTerminator->AdvancePhase(aPhase);
}
#endif
mozilla::KillClearOnShutdown(aPhase);
MaybeFastShutdown(aPhase);
const char* aTopic = AppShutdown::GetObserverKey(aPhase);
if (aTopic) {
nsCOMPtr<nsIObserverService> obsService =
mozilla::services::GetObserverService();
if (obsService) {
obsService->NotifyObservers(aNotificationSubject, aTopic,
aNotificationData);
}
}
}
} // namespace mozilla

27
xpcom/base/AppShutdown.h
Просмотреть файл

@ -7,7 +7,6 @@
#ifndef AppShutdown_h
#define AppShutdown_h
#include <type_traits>
#include "ShutdownPhase.h"
namespace mozilla {
@ -20,6 +19,7 @@ enum class AppShutdownMode {
class AppShutdown {
public:
static bool IsShuttingDown();
/**
* Returns the current exit code that the process will be terminated with.
*/
@ -47,6 +47,12 @@ class AppShutdown {
*/
static void MaybeDoRestart();
/**
* This will perform a fast shutdown via _exit(0) or similar if the user's
* prefs are configured to do so at this phase.
*/
static void MaybeFastShutdown(ShutdownPhase aPhase);
/**
* The _exit() call is not a safe way to terminate your own process on
* Windows, because _exit runs DLL detach callbacks which run static
@ -63,25 +69,6 @@ class AppShutdown {
* restart.
*/
static bool IsRestarting();
/**
* Wrapper for shutdown notifications that inform the terminator before
* we notify other observers. Calls MaybeFastShutdown.
*/
static void AdvanceShutdownPhase(
ShutdownPhase aPhase, const char16_t* aNotificationData = nullptr,
nsCOMPtr<nsISupports> aNotificationSubject = nullptr);
/**
* This will perform a fast shutdown via _exit(0) or similar if the user's
* prefs are configured to do so at this phase.
*/
static void MaybeFastShutdown(ShutdownPhase aPhase);
/**
* Map shutdown phases to observer keys
*/
static const char* GetObserverKey(ShutdownPhase aPhase);
};
} // namespace mozilla

12
xpcom/base/ClearOnShutdown.h
Просмотреть файл

@ -19,8 +19,7 @@
* This header exports two public methods in the mozilla namespace:
*
* template<class SmartPtr>
* void ClearOnShutdown(SmartPtr *aPtr,
* aPhase=ShutdownPhase::XPCOMShutdownFinal)
* void ClearOnShutdown(SmartPtr *aPtr, aPhase=ShutdownPhase::ShutdownFinal)
*
* This function takes a pointer to a smart pointer and nulls the smart pointer
* on shutdown (and a particular phase of shutdown as needed). If a phase
@ -41,7 +40,7 @@
*
* template <typename CallableT>
* void RunOnShutdown(CallableT&& aCallable,
* aPhase = ShutdownPhase::XPCOMShutdownFinal)
* aPhase = ShutdownPhase::ShutdownFinal)
*
* This function takes a callable and executes it upon shutdown at the start of
* the specified phase. If the phase has already occurred when RunOnShutdown()
@ -109,7 +108,7 @@ extern ShutdownPhase sCurrentShutdownPhase;
template <class SmartPtr>
inline void ClearOnShutdown(
SmartPtr* aPtr, ShutdownPhase aPhase = ShutdownPhase::XPCOMShutdownFinal) {
SmartPtr* aPtr, ShutdownPhase aPhase = ShutdownPhase::ShutdownFinal) {
using namespace ClearOnShutdown_Internal;
MOZ_ASSERT(NS_IsMainThread());
@ -119,9 +118,8 @@ inline void ClearOnShutdown(
}
template <typename CallableT>
inline void RunOnShutdown(
CallableT&& aCallable,
ShutdownPhase aPhase = ShutdownPhase::XPCOMShutdownFinal) {
inline void RunOnShutdown(CallableT&& aCallable,
ShutdownPhase aPhase = ShutdownPhase::ShutdownFinal) {
using namespace ClearOnShutdown_Internal;
MOZ_ASSERT(NS_IsMainThread());

24
xpcom/base/ShutdownPhase.h
Просмотреть файл

@ -12,21 +12,15 @@ namespace mozilla {
// Must be contiguous starting at 0
enum class ShutdownPhase {
NotInShutdown = 0,
AppShutdownConfirmed,
AppShutdownNetTeardown,
AppShutdownTeardown,
AppShutdown,
AppShutdownQM,
AppShutdownTelemetry,
XPCOMWillShutdown,
XPCOMShutdown,
XPCOMShutdownThreads,
XPCOMShutdownLoaders,
XPCOMShutdownFinal,
CCPostLastCycleCollection,
ShutdownPhase_Length, // never pass this value
First = AppShutdownConfirmed, // for iteration
Last = XPCOMShutdownFinal
WillShutdown,
Shutdown,
ShutdownThreads,
ShutdownLoaders,
ShutdownFinal,
ShutdownPostLastCycleCollection,
ShutdownPhase_Length, // never pass this value
First = WillShutdown, // for iteration
Last = ShutdownFinal
};
} // namespace mozilla

57
xpcom/build/XPCOMInit.cpp
Просмотреть файл

@ -598,29 +598,45 @@ nsresult ShutdownXPCOM(nsIServiceManager* aServMgr) {
return NS_ERROR_UNEXPECTED;
}
mozilla::AppShutdown::AdvanceShutdownPhase(
mozilla::ShutdownPhase::XPCOMWillShutdown);
RefPtr<nsObserverService> observerService;
CallGetService("@mozilla.org/observer-service;1",
(nsObserverService**)getter_AddRefs(observerService));
nsCOMPtr<nsIServiceManager> mgr;
rv = NS_GetServiceManager(getter_AddRefs(mgr));
if (NS_SUCCEEDED(rv)) {
// We want the service manager to be the subject of notifications
mozilla::AppShutdown::AdvanceShutdownPhase(
mozilla::ShutdownPhase::XPCOMShutdown, nullptr,
do_QueryInterface(mgr));
}
if (observerService) {
mozilla::KillClearOnShutdown(ShutdownPhase::WillShutdown);
mozilla::AppShutdown::MaybeFastShutdown(
mozilla::ShutdownPhase::WillShutdown);
observerService->NotifyObservers(
nullptr, NS_XPCOM_WILL_SHUTDOWN_OBSERVER_ID, nullptr);
nsCOMPtr<nsIServiceManager> mgr;
rv = NS_GetServiceManager(getter_AddRefs(mgr));
if (NS_SUCCEEDED(rv)) {
mozilla::KillClearOnShutdown(ShutdownPhase::Shutdown);
mozilla::AppShutdown::MaybeFastShutdown(
mozilla::ShutdownPhase::Shutdown);
observerService->NotifyObservers(mgr, NS_XPCOM_SHUTDOWN_OBSERVER_ID,
nullptr);
}
#ifndef ANDROID
mozilla::XPCOMShutdownNotified();
mozilla::XPCOMShutdownNotified();
#endif
}
// This must happen after the shutdown of media and widgets, which
// are triggered by the NS_XPCOM_SHUTDOWN_OBSERVER_ID notification.
NS_ProcessPendingEvents(thread);
gfxPlatform::ShutdownLayersIPC();
mozilla::AppShutdown::AdvanceShutdownPhase(
mozilla::ShutdownPhase::XPCOMShutdownThreads);
if (observerService) {
mozilla::KillClearOnShutdown(ShutdownPhase::ShutdownThreads);
mozilla::AppShutdown::MaybeFastShutdown(
mozilla::ShutdownPhase::ShutdownThreads);
observerService->NotifyObservers(
nullptr, NS_XPCOM_SHUTDOWN_THREADS_OBSERVER_ID, nullptr);
}
gXPCOMThreadsShutDown = true;
NS_ProcessPendingEvents(thread);
@ -630,13 +646,8 @@ nsresult ShutdownXPCOM(nsIServiceManager* aServMgr) {
NS_ProcessPendingEvents(thread);
mozilla::KillClearOnShutdown(ShutdownPhase::XPCOMShutdownLoaders);
// XXX: Why don't we try a MaybeFastShutdown for XPCOMShutdownLoaders ?
RefPtr<nsObserverService> observerService;
CallGetService("@mozilla.org/observer-service;1",
(nsObserverService**)getter_AddRefs(observerService));
if (observerService) {
mozilla::KillClearOnShutdown(ShutdownPhase::ShutdownLoaders);
observerService->Shutdown();
}
@ -644,7 +655,7 @@ nsresult ShutdownXPCOM(nsIServiceManager* aServMgr) {
// we've finished notifying observers of XPCOM shutdown, because shutdown
// observers themselves might call ClearOnShutdown().
// Some destructors may fire extra runnables that will be processed below.
mozilla::KillClearOnShutdown(ShutdownPhase::XPCOMShutdownFinal);
mozilla::KillClearOnShutdown(ShutdownPhase::ShutdownFinal);
// Shutdown all remaining threads. This method does not return until
// all threads created using the thread manager (with the exception of
@ -664,7 +675,7 @@ nsresult ShutdownXPCOM(nsIServiceManager* aServMgr) {
AbstractThread::ShutdownMainThread();
mozilla::AppShutdown::MaybeFastShutdown(
mozilla::ShutdownPhase::XPCOMShutdownFinal);
mozilla::ShutdownPhase::ShutdownFinal);
// XPCOM is officially in shutdown mode NOW
// Set this only after the observers have been notified as this
@ -707,9 +718,9 @@ nsresult ShutdownXPCOM(nsIServiceManager* aServMgr) {
// There can be code trying to refer to global objects during the final cc
// shutdown. This is the phase for such global objects to correctly release.
mozilla::KillClearOnShutdown(ShutdownPhase::CCPostLastCycleCollection);
mozilla::KillClearOnShutdown(ShutdownPhase::ShutdownPostLastCycleCollection);
mozilla::AppShutdown::MaybeFastShutdown(
mozilla::ShutdownPhase::CCPostLastCycleCollection);
mozilla::ShutdownPhase::ShutdownPostLastCycleCollection);
mozilla::scache::StartupCache::DeleteSingleton();