Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-21 01:05:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1381748 - Cleanup FetchConsumer workflow - part 3 - shutdown workflow, r=catalinb

Browse Source
This commit is contained in:
Andrea Marchesini 2017-07-26 08:55:31 +02:00
parent e3222ef75d
commit edc70aa1cb
2 changed files with 15 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
dom/fetch/FetchConsumer.cpp
View File

@ -42,9 +42,7 @@ public:
MOZ_ASSERT(aStatus > workers::Running);
if (!mWasNotified) {
mWasNotified = true;
// This will probably cause the releasing of the consumer.
// The WorkerHolder will be released as well.
mConsumer->ContinueConsumeBody(NS_BINDING_ABORTED, 0, nullptr);
mConsumer->ShutDownMainThreadConsuming();
}
return true;
@ -215,12 +213,6 @@ public:
// consuming of the body.
mFetchBodyConsumer->NullifyConsumeBodyPump();
// If the binding requested cancel, we don't need to call
// ContinueConsumeBody, since that is the originator.
if (aStatus == NS_BINDING_ABORTED) {
return NS_OK;
}
uint8_t* nonconstResult = const_cast<uint8_t*>(aResult);
if (mFetchBodyConsumer->GetWorkerPrivate()) {
RefPtr<ContinueConsumeBodyRunnable<Derived>> r =
@ -252,6 +244,10 @@ public:
return;
}
// The loading is completed. Let's nullify the pump before continuing the
// consuming of the body.
mFetchBodyConsumer->NullifyConsumeBodyPump();
MOZ_ASSERT(aBlob);
if (mFetchBodyConsumer->GetWorkerPrivate()) {
@ -283,26 +279,6 @@ NS_INTERFACE_MAP_BEGIN(ConsumeBodyDoneObserver<Derived>)
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIStreamLoaderObserver)
NS_INTERFACE_MAP_END
template <class Derived>
class ShutDownMainThreadConsumingRunnable final : public WorkerMainThreadRunnable
{
RefPtr<FetchBodyConsumer<Derived>> mBodyConsumer;
public:
explicit ShutDownMainThreadConsumingRunnable(FetchBodyConsumer<Derived>* aBodyConsumer)
: WorkerMainThreadRunnable(aBodyConsumer->GetWorkerPrivate(),
NS_LITERAL_CSTRING("Fetch :: Cancel Pump"))
, mBodyConsumer(aBodyConsumer)
{}
bool
MainThreadRun() override
{
mBodyConsumer->ShutDownMainThreadConsuming();
return true;
}
};
} // anonymous
template <class Derived>
@ -479,13 +455,14 @@ FetchBodyConsumer<Derived>::BeginConsumeBodyMainThread()
{
AssertIsOnMainThread();
// Nothing to do.
AutoFailConsumeBody<Derived> autoReject(this);
if (mShuttingDown) {
// We haven't started yet, but we have been terminated. AutoFailConsumeBody
// will dispatch a runnable to release resources.
return;
}
AutoFailConsumeBody<Derived> autoReject(this);
nsCOMPtr<nsIInputStreamPump> pump;
nsresult rv = NS_NewInputStreamPump(getter_AddRefs(pump),
mBodyStream, -1, -1, 0, 0, false,
@ -568,11 +545,6 @@ FetchBodyConsumer<Derived>::ContinueConsumeBody(nsresult aStatus,
localPromise->MaybeReject(NS_ERROR_DOM_ABORT_ERR);
}
// We need to nullify mConsumeBodyPump on the main-thread and, in case it has
// not been created yet, we need to block the creation setting mShuttingDown
// to true.
ShutDownMainThreadConsuming();
// Don't warn here since we warned above.
if (NS_FAILED(aStatus)) {
return;
@ -668,9 +640,6 @@ FetchBodyConsumer<Derived>::ContinueConsumeBlobBody(BlobImpl* aBlobImpl)
MOZ_ASSERT(mConsumePromise);
RefPtr<Promise> localPromise = mConsumePromise.forget();
// Release the pump.
ShutDownMainThreadConsuming();
RefPtr<dom::Blob> blob = dom::Blob::Create(mGlobal, aBlobImpl);
MOZ_ASSERT(blob);
@ -684,21 +653,13 @@ void
FetchBodyConsumer<Derived>::ShutDownMainThreadConsuming()
{
if (!NS_IsMainThread()) {
MOZ_ASSERT(mWorkerPrivate);
// In case of worker thread, we block the worker while the request is
// canceled on the main thread. This ensures that OnStreamComplete has a
// valid FetchConsumer around to call ShutDownMainThreadConsuming and we
// don't release the FetchConsumer on the main thread.
RefPtr<ShutDownMainThreadConsumingRunnable<Derived>> r =
new ShutDownMainThreadConsumingRunnable<Derived>(this);
RefPtr<FetchBodyConsumer<Derived>> self = this;
IgnoredErrorResult rv;
r->Dispatch(Killing, rv);
if (NS_WARN_IF(rv.Failed())) {
return;
}
nsCOMPtr<nsIRunnable> r = NS_NewRunnableFunction(
"FetchBodyConsumer::ShutDownMainThreadConsuming",
[self] () { self->ShutDownMainThreadConsuming(); });
MOZ_DIAGNOSTIC_ASSERT(mShuttingDown);
mMainThreadEventTarget->Dispatch(r.forget(), NS_DISPATCH_NORMAL);
return;
}

1
dom/fetch/FetchConsumer.h
View File

@ -68,6 +68,7 @@ public:
void
NullifyConsumeBodyPump()
{
mShuttingDown = true;
mConsumeBodyPump = nullptr;
}