Skip to content

Commit 08f296e

Browse files
author
Randell Jesup
committed
Bug 1743895: Add names to all TaskQueues, remove no-name constructor r=nika,necko-reviewers
Differential Revision: https://phabricator.services.mozilla.com/D132638
1 parent 3364130 commit 08f296e

File tree

18 files changed

+64
-43
lines changed

18 files changed

+64
-43
lines changed

‎dom/file/MutableBlobStorage.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ nsresult MutableBlobStorage::DispatchToIOThread(
631631
do_GetService(NS_STREAMTRANSPORTSERVICE_CONTRACTID);
632632
MOZ_ASSERT(target);
633633

634-
mTaskQueue = new TaskQueue(target.forget());
634+
mTaskQueue = new TaskQueue(target.forget(), "BlobStorage");
635635
}
636636

637637
nsCOMPtr<nsIRunnable> runnable(aRunnable);

‎dom/indexedDB/ActorsChild.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2691,7 +2691,7 @@ nsresult BackgroundRequestChild::PreprocessHelper::Init(
26912691
// We use a TaskQueue here in order to be sure that the events are dispatched
26922692
// in the correct order. This is not guaranteed in case we use the I/O thread
26932693
// directly.
2694-
mTaskQueue = MakeRefPtr<TaskQueue>(target.forget());
2694+
mTaskQueue = MakeRefPtr<TaskQueue>(target.forget(), "BackgroundRequestChild");
26952695

26962696
ErrorResult errorResult;
26972697

‎dom/media/gtest/TestMP4Demuxer.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ class MP4DemuxerBinding {
4141
explicit MP4DemuxerBinding(const char* aFileName = "dash_dashinit.mp4")
4242
: resource(new MockMediaResource(aFileName)),
4343
mDemuxer(new MP4Demuxer(resource)),
44-
mTaskQueue(
45-
new TaskQueue(GetMediaThreadPool(MediaThreadType::SUPERVISOR))),
44+
mTaskQueue(new TaskQueue(
45+
GetMediaThreadPool(MediaThreadType::SUPERVISOR), "TestMP4Demuxer")),
4646
mIndex(0) {
4747
EXPECT_EQ(NS_OK, resource->Open());
4848
}

‎dom/media/gtest/TestMediaDataEncoder.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,8 @@ already_AddRefed<MediaDataEncoder> CreateVideoEncoder(
152152
VideoInfo videoInfo(aWidth, aHeight);
153153
videoInfo.mMimeType = nsCString(aMimeType);
154154
const RefPtr<TaskQueue> taskQueue(
155-
new TaskQueue(GetMediaThreadPool(MediaThreadType::PLATFORM_ENCODER)));
155+
new TaskQueue(GetMediaThreadPool(MediaThreadType::PLATFORM_ENCODER),
156+
"TestMediaDataEncoder"));
156157

157158
RefPtr<MediaDataEncoder> e;
158159
if (aSpecific) {

‎dom/media/gtest/TestMediaEventSource.cpp‎

Lines changed: 31 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ using namespace mozilla;
1919
TEST(MediaEventSource, SingleListener)
2020
{
2121
RefPtr<TaskQueue> queue =
22-
new TaskQueue(GetMediaThreadPool(MediaThreadType::SUPERVISOR));
22+
new TaskQueue(GetMediaThreadPool(MediaThreadType::SUPERVISOR),
23+
"TestMediaEventSource SingleListener");
2324

2425
MediaEventProducer<int> source;
2526
int i = 0;
@@ -43,7 +44,8 @@ TEST(MediaEventSource, SingleListener)
4344
TEST(MediaEventSource, MultiListener)
4445
{
4546
RefPtr<TaskQueue> queue =
46-
new TaskQueue(GetMediaThreadPool(MediaThreadType::SUPERVISOR));
47+
new TaskQueue(GetMediaThreadPool(MediaThreadType::SUPERVISOR),
48+
"TestMediaEventSource MultiListener");
4749

4850
MediaEventProducer<int> source;
4951
int i = 0;
@@ -74,7 +76,8 @@ TEST(MediaEventSource, MultiListener)
7476
TEST(MediaEventSource, DisconnectAfterNotification)
7577
{
7678
RefPtr<TaskQueue> queue =
77-
new TaskQueue(GetMediaThreadPool(MediaThreadType::SUPERVISOR));
79+
new TaskQueue(GetMediaThreadPool(MediaThreadType::SUPERVISOR),
80+
"TestMediaEventSource DisconnectAfterNotification");
7881

7982
MediaEventProducer<int> source;
8083
int i = 0;
@@ -101,7 +104,8 @@ TEST(MediaEventSource, DisconnectAfterNotification)
101104
TEST(MediaEventSource, DisconnectBeforeNotification)
102105
{
103106
RefPtr<TaskQueue> queue =
104-
new TaskQueue(GetMediaThreadPool(MediaThreadType::SUPERVISOR));
107+
new TaskQueue(GetMediaThreadPool(MediaThreadType::SUPERVISOR),
108+
"TestMediaEventSource DisconnectBeforeNotification");
105109

106110
MediaEventProducer<int> source;
107111
int i = 0;
@@ -133,7 +137,8 @@ TEST(MediaEventSource, DisconnectBeforeNotification)
133137
TEST(MediaEventSource, DisconnectAndConnect)
134138
{
135139
RefPtr<TaskQueue> queue =
136-
new TaskQueue(GetMediaThreadPool(MediaThreadType::SUPERVISOR));
140+
new TaskQueue(GetMediaThreadPool(MediaThreadType::SUPERVISOR),
141+
"TestMediaEventSource DisconnectAndConnect");
137142

138143
MediaEventProducerExc<int> source;
139144
MediaEventListener listener = source.Connect(queue, []() {});
@@ -148,7 +153,8 @@ TEST(MediaEventSource, DisconnectAndConnect)
148153
TEST(MediaEventSource, VoidEventType)
149154
{
150155
RefPtr<TaskQueue> queue =
151-
new TaskQueue(GetMediaThreadPool(MediaThreadType::SUPERVISOR));
156+
new TaskQueue(GetMediaThreadPool(MediaThreadType::SUPERVISOR),
157+
"TestMediaEventSource VoidEventType");
152158

153159
MediaEventProducer<void> source;
154160
int i = 0;
@@ -185,7 +191,8 @@ TEST(MediaEventSource, VoidEventType)
185191
TEST(MediaEventSource, ListenerType1)
186192
{
187193
RefPtr<TaskQueue> queue =
188-
new TaskQueue(GetMediaThreadPool(MediaThreadType::SUPERVISOR));
194+
new TaskQueue(GetMediaThreadPool(MediaThreadType::SUPERVISOR),
195+
"TestMediaEventSource ListenerType1");
189196

190197
MediaEventProducer<int> source;
191198
int i = 0;
@@ -213,7 +220,8 @@ TEST(MediaEventSource, ListenerType1)
213220
TEST(MediaEventSource, ListenerType2)
214221
{
215222
RefPtr<TaskQueue> queue =
216-
new TaskQueue(GetMediaThreadPool(MediaThreadType::SUPERVISOR));
223+
new TaskQueue(GetMediaThreadPool(MediaThreadType::SUPERVISOR),
224+
"TestMediaEventSource ListenerType2");
217225

218226
MediaEventProducer<int> source;
219227

@@ -263,7 +271,8 @@ struct SomeEvent {
263271
TEST(MediaEventSource, CopyEvent1)
264272
{
265273
RefPtr<TaskQueue> queue =
266-
new TaskQueue(GetMediaThreadPool(MediaThreadType::SUPERVISOR));
274+
new TaskQueue(GetMediaThreadPool(MediaThreadType::SUPERVISOR),
275+
"TestMediaEventSource CopyEvent1");
267276

268277
MediaEventProducer<SomeEvent> source;
269278
int i = 0;
@@ -290,7 +299,8 @@ TEST(MediaEventSource, CopyEvent1)
290299
TEST(MediaEventSource, CopyEvent2)
291300
{
292301
RefPtr<TaskQueue> queue =
293-
new TaskQueue(GetMediaThreadPool(MediaThreadType::SUPERVISOR));
302+
new TaskQueue(GetMediaThreadPool(MediaThreadType::SUPERVISOR),
303+
"TestMediaEventSource CopyEvent2");
294304

295305
MediaEventProducer<SomeEvent> source;
296306
int i = 0;
@@ -319,7 +329,8 @@ TEST(MediaEventSource, CopyEvent2)
319329
TEST(MediaEventSource, MoveOnly)
320330
{
321331
RefPtr<TaskQueue> queue =
322-
new TaskQueue(GetMediaThreadPool(MediaThreadType::SUPERVISOR));
332+
new TaskQueue(GetMediaThreadPool(MediaThreadType::SUPERVISOR),
333+
"TestMediaEventSource MoveOnly");
323334

324335
MediaEventProducerExc<UniquePtr<int>> source;
325336

@@ -353,7 +364,8 @@ struct RefCounter {
353364
TEST(MediaEventSource, NoMove)
354365
{
355366
RefPtr<TaskQueue> queue =
356-
new TaskQueue(GetMediaThreadPool(MediaThreadType::SUPERVISOR));
367+
new TaskQueue(GetMediaThreadPool(MediaThreadType::SUPERVISOR),
368+
"TestMediaEventSource NoMove");
357369

358370
MediaEventProducer<RefPtr<RefCounter>> source;
359371

@@ -378,7 +390,8 @@ TEST(MediaEventSource, NoMove)
378390
TEST(MediaEventSource, MoveLambda)
379391
{
380392
RefPtr<TaskQueue> queue =
381-
new TaskQueue(GetMediaThreadPool(MediaThreadType::SUPERVISOR));
393+
new TaskQueue(GetMediaThreadPool(MediaThreadType::SUPERVISOR),
394+
"TestMediaEventSource MoveLambda");
382395

383396
MediaEventProducer<void> source;
384397

@@ -430,7 +443,8 @@ class ClassForDestroyCheck final : private DestroyChecker<bool> {
430443
TEST(MediaEventSource, ResetFuncReferenceAfterDisconnect)
431444
{
432445
const RefPtr<TaskQueue> queue =
433-
new TaskQueue(GetMediaThreadPool(MediaThreadType::SUPERVISOR));
446+
new TaskQueue(GetMediaThreadPool(MediaThreadType::SUPERVISOR),
447+
"TestMediaEventSource ResetFuncReferenceAfterDisconnect");
434448
MediaEventProducer<void> source;
435449

436450
// Using a class that supports refcounting to check the object destruction.
@@ -462,7 +476,9 @@ class TestTaskQueue : public TaskQueue, private DestroyChecker<Atomic<bool>> {
462476
public:
463477
TestTaskQueue(already_AddRefed<nsIEventTarget> aTarget,
464478
Atomic<bool>* aIsDestroyed)
465-
: TaskQueue(std::move(aTarget)), DestroyChecker(aIsDestroyed) {}
479+
: TaskQueue(std::move(aTarget),
480+
"TestMediaEventSource ResetTargetAfterDisconnect"),
481+
DestroyChecker(aIsDestroyed) {}
466482
};
467483

468484
TEST(MediaEventSource, ResetTargetAfterDisconnect)

‎dom/media/hls/HLSDemuxer.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ class HLSDemuxer::HLSDemuxerCallbacksSupport
128128

129129
HLSDemuxer::HLSDemuxer(int aPlayerId)
130130
: mTaskQueue(new TaskQueue(GetMediaThreadPool(MediaThreadType::SUPERVISOR),
131+
"HLSDemuxer",
131132
/* aSupportsTailDispatch = */ false)) {
132133
MOZ_ASSERT(NS_IsMainThread());
133134
HLSDemuxerCallbacksSupport::Init();

‎gfx/layers/ipc/CanvasThread.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ void CanvasThreadHolder::DispatchToCanvasThread(
131131
}
132132

133133
already_AddRefed<TaskQueue> CanvasThreadHolder::CreateWorkerTaskQueue() {
134-
return MakeAndAddRef<TaskQueue>(do_AddRef(mCanvasWorkers));
134+
return MakeAndAddRef<TaskQueue>(do_AddRef(mCanvasWorkers), "CanvasWorker");
135135
}
136136

137137
} // namespace layers

‎ipc/glue/GeckoChildProcessHost.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ class BaseProcessLauncher {
171171

172172
// Compute the serial event target we'll use for launching.
173173
nsCOMPtr<nsIEventTarget> threadOrPool = GetIPCLauncher();
174-
mLaunchThread = new TaskQueue(threadOrPool.forget());
174+
mLaunchThread = new TaskQueue(threadOrPool.forget(), "BaseProcessLauncher");
175175

176176
if (ShouldHaveDirectoryService()) {
177177
// "Current process directory" means the app dir, not the current

‎netwerk/base/nsNetUtil.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1544,7 +1544,7 @@ class BufferWriter final : public nsIInputStreamCallback {
15441544
return NS_ERROR_FAILURE;
15451545
}
15461546

1547-
mTaskQueue = new TaskQueue(target.forget());
1547+
mTaskQueue = new TaskQueue(target.forget(), "nsNetUtil:BufferWriter");
15481548
}
15491549

15501550
return NS_OK;

‎netwerk/protocol/file/nsFileChannel.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ nsresult nsFileChannel::ListenerBlockingPromise(BlockingPromise** aPromise) {
428428
return FixupContentLength(true);
429429
}
430430

431-
RefPtr<TaskQueue> taskQueue = new TaskQueue(sts.forget());
431+
RefPtr<TaskQueue> taskQueue = new TaskQueue(sts.forget(), "FileChannel");
432432
RefPtr<nsFileChannel> self = this;
433433
RefPtr<BlockingPromise> promise =
434434
mozilla::InvokeAsync(taskQueue, __func__, [self{std::move(self)}]() {

0 commit comments

Comments
 (0)