mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-27 14:52:16 +00:00
2f65cf28ae
WorkerRunnable no longer keeps a raw pointer(mWorkerPrivate) for the associated WorkerPrivate in this patch. Removing the WorkerRunnable::mWorkerPrivate needs to fix the following problems. 1. Thread assertions in WorkerRunnable::Dispatch() To fix this problem, the associated WorkerPrivate is as a parameter and passed to WorkerRunnable::Dispatch() for the dispatching thread assertions. This associated WorkerPrivate is also propagated to PreDispatch() and PostDispatch() for the children classes of WorkerRunnable() 2. Get the associated WorkerPrivate in WorkerRunnable::Run() for environment setup(GlobabObject, JSContext setting for the runnable) - For WorkerThreadRunnable Since WorkerThreadRunnable is supposed to run on the worker thread, it does not need to keep a raw pointer to WorkerPrivate as its class member. GetCurrentThreadWorkerPrivate() should always get the correct WorkerPrivate for WorkerThreadRunnable. - For WorkerParentThreadRunnable WorkerParentRef is introduced to keep a RefPtr<WorkerPrivate> for WorkerParentThreadRunnable instead of using a raw pointer. Checking the associated WorkerPrivate existence by WorkerParentRef at the beginning of WorkerParentThreadRunnable::Run(). If the Worker has already shut down, WorkerParentThreadRunnable cannot do anything with the associated WorkerPrivate, so WorkerParentThreadRunnable::Run() will return NS_OK directly but with a warning. The associated WorkerPrivate is also passed into WorkerRun(), PreRun(), and PostRun(), so the majority of implementations of child classes of WorkerRunnable do not need to be changed. If there are any cases in which the child classes of WorkerThreadRunnable/WorkerParentThreadRunnable want to keep the associated WorkerPrivate, they should use WorkerRefs instead of raw pointers. Depends on D205679 Differential Revision: https://phabricator.services.mozilla.com/D207039
185 lines
5.4 KiB
C++
185 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 "PerformanceStorageWorker.h"
|
|
#include "Performance.h"
|
|
#include "PerformanceResourceTiming.h"
|
|
#include "PerformanceTiming.h"
|
|
#include "mozilla/dom/WorkerRef.h"
|
|
#include "mozilla/dom/WorkerRunnable.h"
|
|
#include "mozilla/dom/WorkerScope.h"
|
|
|
|
namespace mozilla::dom {
|
|
|
|
class PerformanceProxyData {
|
|
public:
|
|
PerformanceProxyData(UniquePtr<PerformanceTimingData>&& aData,
|
|
const nsAString& aInitiatorType,
|
|
const nsAString& aEntryName)
|
|
: mData(std::move(aData)),
|
|
mInitiatorType(aInitiatorType),
|
|
mEntryName(aEntryName) {
|
|
MOZ_RELEASE_ASSERT(mData);
|
|
}
|
|
|
|
UniquePtr<PerformanceTimingData> mData; // always non-null
|
|
nsString mInitiatorType;
|
|
nsString mEntryName;
|
|
};
|
|
|
|
namespace {
|
|
|
|
// Here we use control runnable because this code must be executed also when in
|
|
// a sync event loop
|
|
class PerformanceEntryAdder final : public WorkerControlRunnable {
|
|
public:
|
|
PerformanceEntryAdder(WorkerPrivate* aWorkerPrivate,
|
|
PerformanceStorageWorker* aStorage,
|
|
UniquePtr<PerformanceProxyData>&& aData)
|
|
: WorkerControlRunnable("PerformanceEntryAdder"),
|
|
mStorage(aStorage),
|
|
mData(std::move(aData)) {}
|
|
|
|
bool WorkerRun(JSContext* aCx, WorkerPrivate* aWorkerPrivate) override {
|
|
mStorage->AddEntryOnWorker(std::move(mData));
|
|
return true;
|
|
}
|
|
|
|
nsresult Cancel() override {
|
|
mStorage->ShutdownOnWorker();
|
|
return NS_OK;
|
|
}
|
|
|
|
bool PreDispatch(WorkerPrivate* aWorkerPrivate) override { return true; }
|
|
|
|
void PostDispatch(WorkerPrivate* aWorkerPrivate,
|
|
bool aDispatchResult) override {}
|
|
|
|
private:
|
|
RefPtr<PerformanceStorageWorker> mStorage;
|
|
UniquePtr<PerformanceProxyData> mData;
|
|
};
|
|
|
|
} // namespace
|
|
|
|
/* static */
|
|
already_AddRefed<PerformanceStorageWorker> PerformanceStorageWorker::Create(
|
|
WorkerPrivate* aWorkerPrivate) {
|
|
MOZ_ASSERT(aWorkerPrivate);
|
|
aWorkerPrivate->AssertIsOnWorkerThread();
|
|
|
|
RefPtr<PerformanceStorageWorker> storage = new PerformanceStorageWorker();
|
|
|
|
MutexAutoLock lock(storage->mMutex); // for thread-safety analysis
|
|
storage->mWorkerRef = WeakWorkerRef::Create(
|
|
aWorkerPrivate, [storage]() { storage->ShutdownOnWorker(); });
|
|
|
|
// PerformanceStorageWorker is created at the creation time of the worker.
|
|
MOZ_ASSERT(storage->mWorkerRef);
|
|
|
|
return storage.forget();
|
|
}
|
|
|
|
PerformanceStorageWorker::PerformanceStorageWorker()
|
|
: mMutex("PerformanceStorageWorker::mMutex") {}
|
|
|
|
PerformanceStorageWorker::~PerformanceStorageWorker() = default;
|
|
|
|
void PerformanceStorageWorker::AddEntry(nsIHttpChannel* aChannel,
|
|
nsITimedChannel* aTimedChannel) {
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
|
|
MutexAutoLock lock(mMutex);
|
|
|
|
if (!mWorkerRef) {
|
|
return;
|
|
}
|
|
|
|
// If we have mWorkerRef, we haven't received the WorkerRef notification and
|
|
// we haven't yet call ShutdownOnWorker, which uses the mutex.
|
|
WorkerPrivate* workerPrivate = mWorkerRef->GetUnsafePrivate();
|
|
MOZ_ASSERT(workerPrivate);
|
|
|
|
nsAutoString initiatorType;
|
|
nsAutoString entryName;
|
|
|
|
UniquePtr<PerformanceTimingData> performanceTimingData(
|
|
PerformanceTimingData::Create(aTimedChannel, aChannel, 0, initiatorType,
|
|
entryName));
|
|
if (!performanceTimingData) {
|
|
return;
|
|
}
|
|
|
|
UniquePtr<PerformanceProxyData> data(new PerformanceProxyData(
|
|
std::move(performanceTimingData), initiatorType, entryName));
|
|
|
|
RefPtr<PerformanceEntryAdder> r =
|
|
new PerformanceEntryAdder(workerPrivate, this, std::move(data));
|
|
Unused << NS_WARN_IF(!r->Dispatch(workerPrivate));
|
|
}
|
|
|
|
void PerformanceStorageWorker::AddEntry(
|
|
const nsString& aEntryName, const nsString& aInitiatorType,
|
|
UniquePtr<PerformanceTimingData>&& aData) {
|
|
MOZ_ASSERT(!NS_IsMainThread());
|
|
if (!aData) {
|
|
return;
|
|
}
|
|
|
|
UniquePtr<PerformanceProxyData> data = MakeUnique<PerformanceProxyData>(
|
|
std::move(aData), aInitiatorType, aEntryName);
|
|
|
|
AddEntryOnWorker(std::move(data));
|
|
}
|
|
|
|
void PerformanceStorageWorker::ShutdownOnWorker() {
|
|
MutexAutoLock lock(mMutex);
|
|
|
|
if (!mWorkerRef) {
|
|
return;
|
|
}
|
|
|
|
MOZ_ASSERT(!NS_IsMainThread());
|
|
|
|
mWorkerRef = nullptr;
|
|
}
|
|
|
|
void PerformanceStorageWorker::AddEntryOnWorker(
|
|
UniquePtr<PerformanceProxyData>&& aData) {
|
|
RefPtr<Performance> performance;
|
|
UniquePtr<PerformanceProxyData> data = std::move(aData);
|
|
|
|
{
|
|
MutexAutoLock lock(mMutex);
|
|
|
|
if (!mWorkerRef) {
|
|
return;
|
|
}
|
|
|
|
// We must have the workerPrivate because it is available until a
|
|
// notification is received by WorkerRef and we use mutex to make the code
|
|
// protected.
|
|
WorkerPrivate* workerPrivate = mWorkerRef->GetPrivate();
|
|
MOZ_ASSERT(workerPrivate);
|
|
|
|
WorkerGlobalScope* scope = workerPrivate->GlobalScope();
|
|
performance = scope->GetPerformance();
|
|
}
|
|
|
|
if (NS_WARN_IF(!performance)) {
|
|
return;
|
|
}
|
|
|
|
RefPtr<PerformanceResourceTiming> performanceEntry =
|
|
new PerformanceResourceTiming(std::move(data->mData), performance,
|
|
data->mEntryName);
|
|
performanceEntry->SetInitiatorType(data->mInitiatorType);
|
|
|
|
performance->InsertResourceEntry(performanceEntry);
|
|
}
|
|
|
|
} // namespace mozilla::dom
|