1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
|
commit 74ed31e949fa
Author: Andrea Marchesini <amarchesini@mozilla.com>
Date: Mon Feb 5 19:55:08 2018 +0100
Bug 1422036 - Using WorkerControlRunnable to release resources in fetch when the worker is shutting down. r=catalinb, a=RyanVM
--HG--
extra : source : d79788e03f7451ebc4a3c694117497f091a5a129
---
dom/fetch/FetchConsumer.cpp | 123 +++++++++++++++++++++++++++++++++++++-------
dom/fetch/FetchConsumer.h | 5 +-
2 files changed, 106 insertions(+), 22 deletions(-)
diff --git dom/fetch/FetchConsumer.cpp dom/fetch/FetchConsumer.cpp
index b83c8671404a..1e173f9c9661 100644
--- dom/fetch/FetchConsumer.cpp
+++ dom/fetch/FetchConsumer.cpp
@@ -102,6 +102,32 @@ public:
}
};
+// ControlRunnable used to complete the releasing of resources on the worker
+// thread when already shutting down.
+template <class Derived>
+class ContinueConsumeBodyControlRunnable final : public MainThreadWorkerControlRunnable
+{
+ RefPtr<FetchBodyConsumer<Derived>> mFetchBodyConsumer;
+
+public:
+ ContinueConsumeBodyControlRunnable(FetchBodyConsumer<Derived>* aFetchBodyConsumer,
+ uint8_t* aResult)
+ : MainThreadWorkerControlRunnable(aFetchBodyConsumer->GetWorkerPrivate())
+ , mFetchBodyConsumer(aFetchBodyConsumer)
+ {
+ MOZ_ASSERT(NS_IsMainThread());
+ free(aResult);
+ }
+
+ bool
+ WorkerRun(JSContext* aCx, WorkerPrivate* aWorkerPrivate) override
+ {
+ mFetchBodyConsumer->ContinueConsumeBody(NS_BINDING_ABORTED, 0, nullptr,
+ true /* shutting down */);
+ return true;
+ }
+};
+
template <class Derived>
class FailConsumeBodyWorkerRunnable : public MainThreadWorkerControlRunnable
{
@@ -189,6 +215,31 @@ public:
}
};
+// ControlRunnable used to complete the releasing of resources on the worker
+// thread when already shutting down.
+template <class Derived>
+class ContinueConsumeBlobBodyControlRunnable final
+ : public MainThreadWorkerControlRunnable
+{
+ RefPtr<FetchBodyConsumer<Derived>> mFetchBodyConsumer;
+
+public:
+ explicit ContinueConsumeBlobBodyControlRunnable(FetchBodyConsumer<Derived>* aFetchBodyConsumer)
+ : MainThreadWorkerControlRunnable(aFetchBodyConsumer->GetWorkerPrivate())
+ , mFetchBodyConsumer(aFetchBodyConsumer)
+ {
+ MOZ_ASSERT(NS_IsMainThread());
+ }
+
+ bool
+ WorkerRun(JSContext* aCx, WorkerPrivate* aWorkerPrivate) override
+ {
+ mFetchBodyConsumer->ContinueConsumeBlobBody(nullptr,
+ true /* shutting down */);
+ return true;
+ }
+};
+
template <class Derived>
class ConsumeBodyDoneObserver : public nsIStreamLoaderObserver
, public MutableBlobStorageCallback
@@ -216,20 +267,33 @@ public:
mFetchBodyConsumer->NullifyConsumeBodyPump();
uint8_t* nonconstResult = const_cast<uint8_t*>(aResult);
- if (mFetchBodyConsumer->GetWorkerPrivate()) {
+ if (!mFetchBodyConsumer->GetWorkerPrivate()) {
+ mFetchBodyConsumer->ContinueConsumeBody(aStatus, aResultLength,
+ nonconstResult);
+ // FetchBody is responsible for data.
+ return NS_SUCCESS_ADOPTED_DATA;
+ }
+
+ {
RefPtr<ContinueConsumeBodyRunnable<Derived>> r =
new ContinueConsumeBodyRunnable<Derived>(mFetchBodyConsumer,
aStatus,
aResultLength,
nonconstResult);
- if (!r->Dispatch()) {
- NS_WARNING("Could not dispatch ConsumeBodyRunnable");
- // Return failure so that aResult is freed.
- return NS_ERROR_FAILURE;
+ if (r->Dispatch()) {
+ // FetchBody is responsible for data.
+ return NS_SUCCESS_ADOPTED_DATA;
}
- } else {
- mFetchBodyConsumer->ContinueConsumeBody(aStatus, aResultLength,
- nonconstResult);
+ }
+
+ // The worker is shutting down. Let's use a control runnable to complete the
+ // shutting down procedure.
+
+ RefPtr<ContinueConsumeBodyControlRunnable<Derived>> r =
+ new ContinueConsumeBodyControlRunnable<Derived>(mFetchBodyConsumer,
+ nonconstResult);
+ if (NS_WARN_IF(!r->Dispatch())) {
+ return NS_ERROR_FAILURE;
}
// FetchBody is responsible for data.
@@ -252,18 +316,28 @@ public:
MOZ_ASSERT(aBlob);
- if (mFetchBodyConsumer->GetWorkerPrivate()) {
+ if (!mFetchBodyConsumer->GetWorkerPrivate()) {
+ mFetchBodyConsumer->ContinueConsumeBlobBody(aBlob->Impl());
+ return;
+ }
+
+ {
RefPtr<ContinueConsumeBlobBodyRunnable<Derived>> r =
new ContinueConsumeBlobBodyRunnable<Derived>(mFetchBodyConsumer,
aBlob->Impl());
- if (!r->Dispatch()) {
- NS_WARNING("Could not dispatch ConsumeBlobBodyRunnable");
+ if (r->Dispatch()) {
return;
}
- } else {
- mFetchBodyConsumer->ContinueConsumeBlobBody(aBlob->Impl());
}
+
+ // The worker is shutting down. Let's use a control runnable to complete the
+ // shutting down procedure.
+
+ RefPtr<ContinueConsumeBlobBodyControlRunnable<Derived>> r =
+ new ContinueConsumeBlobBodyControlRunnable<Derived>(mFetchBodyConsumer);
+
+ Unused << NS_WARN_IF(!r->Dispatch());
}
private:
@@ -525,7 +599,8 @@ template <class Derived>
void
FetchBodyConsumer<Derived>::ContinueConsumeBody(nsresult aStatus,
uint32_t aResultLength,
- uint8_t* aResult)
+ uint8_t* aResult,
+ bool aShuttingDown)
{
AssertIsOnTargetThread();
@@ -550,6 +625,11 @@ FetchBodyConsumer<Derived>::ContinueConsumeBody(nsresult aStatus,
self->ReleaseObject();
});
+ if (aShuttingDown) {
+ // If shutting down, we don't want to resolve any promise.
+ return;
+ }
+
if (NS_WARN_IF(NS_FAILED(aStatus))) {
localPromise->MaybeReject(NS_ERROR_DOM_ABORT_ERR);
}
@@ -632,7 +712,8 @@ FetchBodyConsumer<Derived>::ContinueConsumeBody(nsresult aStatus,
template <class Derived>
void
-FetchBodyConsumer<Derived>::ContinueConsumeBlobBody(BlobImpl* aBlobImpl)
+FetchBodyConsumer<Derived>::ContinueConsumeBlobBody(BlobImpl* aBlobImpl,
+ bool aShuttingDown)
{
AssertIsOnTargetThread();
MOZ_ASSERT(mConsumeType == CONSUME_BLOB);
@@ -646,13 +727,15 @@ FetchBodyConsumer<Derived>::ContinueConsumeBlobBody(BlobImpl* aBlobImpl)
// sync with a body read.
MOZ_ASSERT(mBody->BodyUsed());
- MOZ_ASSERT(mConsumePromise);
- RefPtr<Promise> localPromise = mConsumePromise.forget();
+ if (!aShuttingDown) {
+ MOZ_ASSERT(mConsumePromise);
+ RefPtr<Promise> localPromise = mConsumePromise.forget();
- RefPtr<dom::Blob> blob = dom::Blob::Create(mGlobal, aBlobImpl);
- MOZ_ASSERT(blob);
+ RefPtr<dom::Blob> blob = dom::Blob::Create(mGlobal, aBlobImpl);
+ MOZ_ASSERT(blob);
- localPromise->MaybeResolve(blob);
+ localPromise->MaybeResolve(blob);
+ }
ReleaseObject();
}
diff --git dom/fetch/FetchConsumer.h dom/fetch/FetchConsumer.h
index 04b02aee5d4b..d45b62b8379b 100644
--- dom/fetch/FetchConsumer.h
+++ dom/fetch/FetchConsumer.h
@@ -54,10 +54,11 @@ public:
BeginConsumeBodyMainThread();
void
- ContinueConsumeBody(nsresult aStatus, uint32_t aLength, uint8_t* aResult);
+ ContinueConsumeBody(nsresult aStatus, uint32_t aLength, uint8_t* aResult,
+ bool aShuttingDown = false);
void
- ContinueConsumeBlobBody(BlobImpl* aBlobImpl);
+ ContinueConsumeBlobBody(BlobImpl* aBlobImpl, bool aShuttingDown = false);
void
ShutDownMainThreadConsuming();
|
