Bug 1544232 changed it so ServiceWorker globals used a ClientInfo and Client Id created by the ServiceWorkerPrivate rather than creating a random client id. This allows the ServiceWorkerManager to reliably map a ServiceWorker Client Id back to the underlying ServiceWorker. The problem with this was that ClientManagerService is not okay with there being multiple ClientSources using the same id and it results in an IPC_FAIL. This was not a problem in desktop testing because under fission the potential race window is incredibly small for a ServiceWorker and its spawned successor to have a live ClientSource at the same time because the ClientSource will be torn down by the ClientManager WorkerRef on the transition to canceling and both SWs will be spawned in the same process. But on Android where there is no fission, SWs spawn randomly with no affinity and so a successor can be spawned on a different, more responsive process. The fix here is to regenerate the Client Id whenever we terminate the SW so we are prepared for the next time we spawn the SW. This patch adds an additional test case to browser_sw_lifetime_extension.js that is able to reproduce the crash case on desktop by artificially blocking the ServiceWorker thread with a monitor so that the ServiceWorker can't transition to Canceling until its successor has already been spawned. This reliably reproduces the bug (when the fix is not in place). This required adding some new test infrastructure to WorkerTestUtils. The new WorkerTestUtils methods provide 2 ways to hang the worker in a controlled fashion until an observer notification is notified on the main thread which use a shared helper class: 1. Use a monitor to completely block the thread until notified. This prevents control runnables from running and thereby prevents worker refs from being notified. 2. Acquire a ThreadSafeWorkerRef and hold it until notified. This lets the worker advance to Canceling but prevents progressing to Killing. I added the WorkerRef mechanism first but it wasn't sufficient, so I added the monitor mechanism, slightly generalizing the mechanism. A mechanism to generate an observer notification on the main thread is also added so that the successor ServiceWorker can notify the predecessor SW without us needing to involve JSActors or other means of running arbitrary JS in the process hosting the SWs. This does mean that when we are in non-fission mode we do need to limit the browser to a single process in order to ensure both workers are spawned in the same process. Differential Revision: https://phabricator.services.mozilla.com/D227446
176 lines
5.4 KiB
C++
176 lines
5.4 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/ErrorResult.h"
|
|
#include "mozilla/Monitor.h"
|
|
#include "mozilla/RefPtr.h"
|
|
#include "mozilla/dom/WorkerPrivate.h"
|
|
#include "mozilla/dom/WorkerRef.h"
|
|
#include "mozilla/dom/WorkerTestUtils.h"
|
|
#include "mozilla/dom/WorkerTestUtilsBinding.h"
|
|
#include "nsIObserverService.h"
|
|
#include "nsThreadUtils.h"
|
|
|
|
namespace mozilla::dom {
|
|
|
|
uint32_t WorkerTestUtils::CurrentTimerNestingLevel(const GlobalObject& aGlobal,
|
|
ErrorResult& aErr) {
|
|
MOZ_ASSERT(!NS_IsMainThread());
|
|
WorkerPrivate* worker = GetCurrentThreadWorkerPrivate();
|
|
MOZ_ASSERT(worker);
|
|
return worker->GetCurrentTimerNestingLevel();
|
|
}
|
|
|
|
bool WorkerTestUtils::IsRunningInBackground(const GlobalObject&,
|
|
ErrorResult& aErr) {
|
|
MOZ_ASSERT(!NS_IsMainThread());
|
|
WorkerPrivate* worker = GetCurrentThreadWorkerPrivate();
|
|
MOZ_ASSERT(worker);
|
|
return worker->IsRunningInBackground();
|
|
}
|
|
|
|
namespace {
|
|
|
|
// Helper for HoldStrongWorkerRefUntilMainThreadObserverNotified that optionally
|
|
// holds a ThreadSafeWorkerRef until the given observer notification is notified
|
|
// and also notifies a monitor.
|
|
class WorkerTestUtilsObserver final : public nsIObserver {
|
|
public:
|
|
WorkerTestUtilsObserver(const nsACString& aTopic,
|
|
RefPtr<ThreadSafeWorkerRef>&& aWorkerRef)
|
|
: mMonitor("WorkerTestUtils"),
|
|
mTopic(aTopic),
|
|
mWorkerRef(std::move(aWorkerRef)),
|
|
mRegistered(false),
|
|
mObserved(false) {}
|
|
|
|
NS_DECL_THREADSAFE_ISUPPORTS
|
|
NS_IMETHOD Observe(nsISupports* aSubject, const char* aTopic,
|
|
const char16_t* aData) override {
|
|
// We only register for one topic so we don't actually need to compare it.
|
|
nsCOMPtr<nsIObserverService> observerService =
|
|
services::GetObserverService();
|
|
MOZ_ALWAYS_SUCCEEDS(observerService->RemoveObserver(this, mTopic.get()));
|
|
|
|
// The ThreadSafeWorkerRef is responsible for / knows how to drop the
|
|
// underlying StrongWorkerRef on the worker.
|
|
mWorkerRef = nullptr;
|
|
|
|
MonitorAutoLock lock(mMonitor);
|
|
mObserved = true;
|
|
mMonitor.Notify();
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
void Register() {
|
|
nsCOMPtr<nsIObserverService> observerService =
|
|
services::GetObserverService();
|
|
MOZ_ALWAYS_SUCCEEDS(
|
|
observerService->AddObserver(this, mTopic.get(), false));
|
|
|
|
MonitorAutoLock lock(mMonitor);
|
|
mRegistered = true;
|
|
mMonitor.Notify();
|
|
}
|
|
|
|
void WaitOnRegister() {
|
|
MonitorAutoLock lock(mMonitor);
|
|
while (!mRegistered) {
|
|
mMonitor.Wait();
|
|
}
|
|
}
|
|
|
|
void WaitOnObserver() {
|
|
MonitorAutoLock lock(mMonitor);
|
|
while (!mObserved) {
|
|
mMonitor.Wait();
|
|
}
|
|
}
|
|
|
|
private:
|
|
~WorkerTestUtilsObserver() = default;
|
|
|
|
Monitor mMonitor;
|
|
nsAutoCString mTopic;
|
|
RefPtr<ThreadSafeWorkerRef> mWorkerRef;
|
|
bool mRegistered;
|
|
bool mObserved;
|
|
};
|
|
|
|
NS_IMPL_ISUPPORTS(WorkerTestUtilsObserver, nsIObserver)
|
|
|
|
} // anonymous namespace
|
|
|
|
void WorkerTestUtils::HoldStrongWorkerRefUntilMainThreadObserverNotified(
|
|
const GlobalObject&, const nsACString& aTopic, ErrorResult& aErr) {
|
|
MOZ_ASSERT(!NS_IsMainThread());
|
|
|
|
WorkerPrivate* workerPrivate = GetCurrentThreadWorkerPrivate();
|
|
MOZ_ASSERT(workerPrivate);
|
|
|
|
RefPtr<StrongWorkerRef> strongWorkerRef =
|
|
StrongWorkerRef::Create(workerPrivate, "WorkerTestUtils");
|
|
if (NS_WARN_IF(!strongWorkerRef)) {
|
|
aErr.Throw(NS_ERROR_FAILURE);
|
|
return;
|
|
}
|
|
|
|
RefPtr<ThreadSafeWorkerRef> tsWorkerRef =
|
|
new ThreadSafeWorkerRef(strongWorkerRef);
|
|
|
|
auto observer =
|
|
MakeRefPtr<WorkerTestUtilsObserver>(aTopic, std::move(tsWorkerRef));
|
|
|
|
aErr = NS_DispatchToMainThread(NewRunnableMethod(
|
|
"WorkerTestUtils::HoldStrongWorkerRefUntilMainThreadObserverNotified",
|
|
observer, &WorkerTestUtilsObserver::Register));
|
|
|
|
// Wait for the observer to be registered before returning control so that we
|
|
// can be certain we won't miss an observer notification.
|
|
observer->WaitOnRegister();
|
|
}
|
|
|
|
void WorkerTestUtils::BlockUntilMainThreadObserverNotified(
|
|
const GlobalObject&, const nsACString& aTopic,
|
|
WorkerTestCallback& aWhenObserving, ErrorResult& aErr) {
|
|
MOZ_ASSERT(!NS_IsMainThread());
|
|
|
|
auto observer = MakeRefPtr<WorkerTestUtilsObserver>(aTopic, nullptr);
|
|
|
|
aErr = NS_DispatchToMainThread(
|
|
NewRunnableMethod("WorkerTestUtils::BlockUntilMainThreadObserverNotified",
|
|
observer, &WorkerTestUtilsObserver::Register));
|
|
if (aErr.Failed()) {
|
|
return;
|
|
}
|
|
|
|
observer->WaitOnRegister();
|
|
|
|
aWhenObserving.Call(aErr);
|
|
if (aErr.Failed()) {
|
|
return;
|
|
}
|
|
|
|
observer->WaitOnObserver();
|
|
}
|
|
|
|
void WorkerTestUtils::NotifyObserverOnMainThread(const GlobalObject&,
|
|
const nsACString& aTopic,
|
|
ErrorResult& aErr) {
|
|
MOZ_ASSERT(!NS_IsMainThread());
|
|
|
|
aErr = NS_DispatchToMainThread(NS_NewRunnableFunction(
|
|
"WorkerTestUtils::NotifyObserverOnMainThread",
|
|
[topic = nsCString(aTopic)] {
|
|
nsCOMPtr<nsIObserverService> observerService =
|
|
services::GetObserverService();
|
|
observerService->NotifyObservers(nullptr, topic.get(), nullptr);
|
|
}));
|
|
}
|
|
|
|
} // namespace mozilla::dom
|