2014-11-19 05:17:17 +03:00
|
|
|
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
|
|
/* 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 "DecodePool.h"
|
|
|
|
|
|
|
|
#include <algorithm>
|
|
|
|
|
|
|
|
#include "mozilla/ClearOnShutdown.h"
|
2015-05-15 03:08:26 +03:00
|
|
|
#include "mozilla/Monitor.h"
|
2014-11-19 05:17:17 +03:00
|
|
|
#include "nsCOMPtr.h"
|
|
|
|
#include "nsIObserverService.h"
|
|
|
|
#include "nsIThreadPool.h"
|
2015-05-15 03:08:26 +03:00
|
|
|
#include "nsThreadManager.h"
|
2015-01-18 12:27:16 +03:00
|
|
|
#include "nsThreadUtils.h"
|
2014-11-19 05:17:17 +03:00
|
|
|
#include "nsXPCOMCIDInternal.h"
|
|
|
|
#include "prsystem.h"
|
2016-12-09 03:20:13 +03:00
|
|
|
#include "nsIXULRuntime.h"
|
2014-11-19 05:17:17 +03:00
|
|
|
|
|
|
|
#include "gfxPrefs.h"
|
|
|
|
|
|
|
|
#include "Decoder.h"
|
2016-06-29 23:43:19 +03:00
|
|
|
#include "IDecodingTask.h"
|
2014-11-19 05:17:17 +03:00
|
|
|
#include "RasterImage.h"
|
|
|
|
|
|
|
|
using std::max;
|
|
|
|
using std::min;
|
|
|
|
|
|
|
|
namespace mozilla {
|
|
|
|
namespace image {
|
|
|
|
|
2015-05-15 03:08:26 +03:00
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
// DecodePool implementation.
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
/* static */ StaticRefPtr<DecodePool> DecodePool::sSingleton;
|
2015-07-09 01:52:51 +03:00
|
|
|
/* static */ uint32_t DecodePool::sNumCores = 0;
|
2015-05-15 03:08:26 +03:00
|
|
|
|
|
|
|
NS_IMPL_ISUPPORTS(DecodePool, nsIObserver)
|
|
|
|
|
|
|
|
struct Work
|
|
|
|
{
|
|
|
|
enum class Type {
|
2016-06-29 23:43:19 +03:00
|
|
|
TASK,
|
2015-05-15 03:08:26 +03:00
|
|
|
SHUTDOWN
|
|
|
|
} mType;
|
2014-11-19 05:17:17 +03:00
|
|
|
|
2016-06-29 23:43:19 +03:00
|
|
|
RefPtr<IDecodingTask> mTask;
|
2014-11-19 05:17:17 +03:00
|
|
|
};
|
|
|
|
|
2015-05-15 03:08:26 +03:00
|
|
|
class DecodePoolImpl
|
2014-11-19 05:17:17 +03:00
|
|
|
{
|
|
|
|
public:
|
2015-05-15 03:08:26 +03:00
|
|
|
MOZ_DECLARE_REFCOUNTED_TYPENAME(DecodePoolImpl)
|
|
|
|
NS_INLINE_DECL_THREADSAFE_REFCOUNTING(DecodePoolImpl)
|
|
|
|
|
|
|
|
DecodePoolImpl()
|
|
|
|
: mMonitor("DecodePoolImpl")
|
|
|
|
, mShuttingDown(false)
|
|
|
|
{ }
|
2014-11-19 05:17:17 +03:00
|
|
|
|
2015-05-15 03:08:26 +03:00
|
|
|
/// Shut down the provided decode pool thread.
|
|
|
|
static void ShutdownThread(nsIThread* aThisThread)
|
|
|
|
{
|
|
|
|
// Threads have to be shut down from another thread, so we'll ask the
|
|
|
|
// main thread to do it for us.
|
2017-02-11 09:11:48 +03:00
|
|
|
NS_DispatchToMainThread(NewRunnableMethod("DecodePoolImpl::ShutdownThread",
|
|
|
|
aThisThread, &nsIThread::Shutdown));
|
2015-05-15 03:08:26 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Requests shutdown. New work items will be dropped on the floor, and all
|
|
|
|
* decode pool threads will be shut down once existing work items have been
|
|
|
|
* processed.
|
|
|
|
*/
|
|
|
|
void RequestShutdown()
|
|
|
|
{
|
|
|
|
MonitorAutoLock lock(mMonitor);
|
|
|
|
mShuttingDown = true;
|
|
|
|
mMonitor.NotifyAll();
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Pushes a new decode work item.
|
2016-06-29 23:43:19 +03:00
|
|
|
void PushWork(IDecodingTask* aTask)
|
2015-05-15 03:08:26 +03:00
|
|
|
{
|
2016-06-29 23:43:19 +03:00
|
|
|
MOZ_ASSERT(aTask);
|
|
|
|
RefPtr<IDecodingTask> task(aTask);
|
2015-05-15 03:08:26 +03:00
|
|
|
|
|
|
|
MonitorAutoLock lock(mMonitor);
|
|
|
|
|
|
|
|
if (mShuttingDown) {
|
|
|
|
// Drop any new work on the floor if we're shutting down.
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2016-06-29 23:43:19 +03:00
|
|
|
if (task->Priority() == TaskPriority::eHigh) {
|
|
|
|
mHighPriorityQueue.AppendElement(Move(task));
|
2015-05-08 05:12:00 +03:00
|
|
|
} else {
|
2016-06-29 23:43:19 +03:00
|
|
|
mLowPriorityQueue.AppendElement(Move(task));
|
2015-05-08 05:12:00 +03:00
|
|
|
}
|
|
|
|
|
2015-05-15 03:08:26 +03:00
|
|
|
mMonitor.Notify();
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Pops a new work item, blocking if necessary.
|
|
|
|
Work PopWork()
|
|
|
|
{
|
|
|
|
MonitorAutoLock lock(mMonitor);
|
|
|
|
|
|
|
|
do {
|
2016-06-29 23:43:19 +03:00
|
|
|
if (!mHighPriorityQueue.IsEmpty()) {
|
|
|
|
return PopWorkFromQueue(mHighPriorityQueue);
|
2015-05-08 05:12:00 +03:00
|
|
|
}
|
2015-05-15 03:08:26 +03:00
|
|
|
|
2016-06-29 23:43:19 +03:00
|
|
|
if (!mLowPriorityQueue.IsEmpty()) {
|
|
|
|
return PopWorkFromQueue(mLowPriorityQueue);
|
2015-05-15 03:08:26 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
if (mShuttingDown) {
|
2015-05-08 05:12:00 +03:00
|
|
|
Work work;
|
2015-05-15 03:08:26 +03:00
|
|
|
work.mType = Work::Type::SHUTDOWN;
|
|
|
|
return work;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Nothing to do; block until some work is available.
|
|
|
|
mMonitor.Wait();
|
|
|
|
} while (true);
|
|
|
|
}
|
2015-01-18 12:27:16 +03:00
|
|
|
|
2016-12-20 16:20:48 +03:00
|
|
|
nsresult CreateThread(nsIThread** aThread, nsIRunnable* aInitialEvent)
|
|
|
|
{
|
|
|
|
return NS_NewNamedThread(mThreadNaming.GetNextThreadName("ImgDecoder"),
|
|
|
|
aThread, aInitialEvent);
|
|
|
|
}
|
|
|
|
|
2015-01-18 12:27:16 +03:00
|
|
|
private:
|
2015-05-15 03:08:26 +03:00
|
|
|
~DecodePoolImpl() { }
|
2015-01-18 12:27:16 +03:00
|
|
|
|
2016-06-29 23:43:19 +03:00
|
|
|
Work PopWorkFromQueue(nsTArray<RefPtr<IDecodingTask>>& aQueue)
|
2015-05-08 05:12:00 +03:00
|
|
|
{
|
|
|
|
Work work;
|
2016-06-29 23:43:19 +03:00
|
|
|
work.mType = Work::Type::TASK;
|
|
|
|
work.mTask = aQueue.LastElement().forget();
|
2015-06-24 21:37:59 +03:00
|
|
|
aQueue.RemoveElementAt(aQueue.Length() - 1);
|
2015-05-08 05:12:00 +03:00
|
|
|
|
|
|
|
return work;
|
|
|
|
}
|
|
|
|
|
2015-05-15 03:08:26 +03:00
|
|
|
nsThreadPoolNaming mThreadNaming;
|
2015-01-18 12:27:16 +03:00
|
|
|
|
2015-07-23 08:39:54 +03:00
|
|
|
// mMonitor guards the queues and mShuttingDown.
|
2015-05-15 03:08:26 +03:00
|
|
|
Monitor mMonitor;
|
2016-06-29 23:43:19 +03:00
|
|
|
nsTArray<RefPtr<IDecodingTask>> mHighPriorityQueue;
|
|
|
|
nsTArray<RefPtr<IDecodingTask>> mLowPriorityQueue;
|
2015-05-15 03:08:26 +03:00
|
|
|
bool mShuttingDown;
|
|
|
|
};
|
|
|
|
|
2016-04-26 03:23:21 +03:00
|
|
|
class DecodePoolWorker : public Runnable
|
2014-11-19 05:17:17 +03:00
|
|
|
{
|
2015-01-18 12:27:16 +03:00
|
|
|
public:
|
2016-11-25 10:00:10 +03:00
|
|
|
explicit DecodePoolWorker(DecodePoolImpl* aImpl)
|
2017-06-12 22:34:10 +03:00
|
|
|
: Runnable("image::DecodePoolWorker")
|
|
|
|
, mImpl(aImpl)
|
2016-11-25 10:00:10 +03:00
|
|
|
{ }
|
2015-05-15 03:08:26 +03:00
|
|
|
|
2016-08-08 05:18:10 +03:00
|
|
|
NS_IMETHOD Run() override
|
2015-01-18 12:27:16 +03:00
|
|
|
{
|
2015-05-15 03:08:26 +03:00
|
|
|
MOZ_ASSERT(!NS_IsMainThread());
|
2014-11-19 05:17:17 +03:00
|
|
|
|
2015-05-15 03:08:26 +03:00
|
|
|
nsCOMPtr<nsIThread> thisThread;
|
2016-06-10 09:04:49 +03:00
|
|
|
nsThreadManager::get().GetCurrentThread(getter_AddRefs(thisThread));
|
2014-11-19 05:17:17 +03:00
|
|
|
|
2015-05-15 03:08:26 +03:00
|
|
|
do {
|
|
|
|
Work work = mImpl->PopWork();
|
|
|
|
switch (work.mType) {
|
2016-06-29 23:43:19 +03:00
|
|
|
case Work::Type::TASK:
|
|
|
|
work.mTask->Run();
|
2015-05-15 03:08:26 +03:00
|
|
|
break;
|
2014-11-19 05:17:17 +03:00
|
|
|
|
2015-05-15 03:08:26 +03:00
|
|
|
case Work::Type::SHUTDOWN:
|
|
|
|
DecodePoolImpl::ShutdownThread(thisThread);
|
2016-11-25 10:00:10 +03:00
|
|
|
|
|
|
|
profiler_unregister_thread();
|
|
|
|
|
2015-05-15 03:08:26 +03:00
|
|
|
return NS_OK;
|
|
|
|
|
|
|
|
default:
|
|
|
|
MOZ_ASSERT_UNREACHABLE("Unknown work type");
|
|
|
|
}
|
|
|
|
} while (true);
|
|
|
|
|
|
|
|
MOZ_ASSERT_UNREACHABLE("Exiting thread without Work::Type::SHUTDOWN");
|
|
|
|
return NS_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
private:
|
2015-10-18 08:24:48 +03:00
|
|
|
RefPtr<DecodePoolImpl> mImpl;
|
2015-05-15 03:08:26 +03:00
|
|
|
};
|
2014-11-19 05:17:17 +03:00
|
|
|
|
2015-01-18 12:27:16 +03:00
|
|
|
/* static */ void
|
|
|
|
DecodePool::Initialize()
|
|
|
|
{
|
|
|
|
MOZ_ASSERT(NS_IsMainThread());
|
2015-11-01 20:45:40 +03:00
|
|
|
sNumCores = max<int32_t>(PR_GetNumberOfProcessors(), 1);
|
2015-01-18 12:27:16 +03:00
|
|
|
DecodePool::Singleton();
|
|
|
|
}
|
|
|
|
|
2014-11-19 05:17:17 +03:00
|
|
|
/* static */ DecodePool*
|
|
|
|
DecodePool::Singleton()
|
|
|
|
{
|
|
|
|
if (!sSingleton) {
|
|
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
|
|
sSingleton = new DecodePool();
|
|
|
|
ClearOnShutdown(&sSingleton);
|
|
|
|
}
|
|
|
|
|
|
|
|
return sSingleton;
|
|
|
|
}
|
|
|
|
|
2015-07-09 01:52:51 +03:00
|
|
|
/* static */ uint32_t
|
|
|
|
DecodePool::NumberOfCores()
|
|
|
|
{
|
|
|
|
return sNumCores;
|
|
|
|
}
|
|
|
|
|
2014-11-19 05:17:17 +03:00
|
|
|
DecodePool::DecodePool()
|
2015-05-15 03:08:26 +03:00
|
|
|
: mImpl(new DecodePoolImpl)
|
|
|
|
, mMutex("image::DecodePool")
|
2014-11-19 05:17:17 +03:00
|
|
|
{
|
2015-05-15 03:08:26 +03:00
|
|
|
// Determine the number of threads we want.
|
2015-01-08 11:29:41 +03:00
|
|
|
int32_t prefLimit = gfxPrefs::ImageMTDecodingLimit();
|
|
|
|
uint32_t limit;
|
|
|
|
if (prefLimit <= 0) {
|
2015-07-09 01:52:51 +03:00
|
|
|
int32_t numCores = NumberOfCores();
|
2015-05-21 04:54:16 +03:00
|
|
|
if (numCores <= 1) {
|
|
|
|
limit = 1;
|
|
|
|
} else if (numCores == 2) {
|
|
|
|
// On an otherwise mostly idle system, having two image decoding threads
|
|
|
|
// doubles decoding performance, so it's worth doing on dual-core devices,
|
|
|
|
// even if under load we can't actually get that level of parallelism.
|
|
|
|
limit = 2;
|
|
|
|
} else {
|
|
|
|
limit = numCores - 1;
|
|
|
|
}
|
2015-01-08 11:29:41 +03:00
|
|
|
} else {
|
|
|
|
limit = static_cast<uint32_t>(prefLimit);
|
|
|
|
}
|
2015-11-01 20:45:40 +03:00
|
|
|
if (limit > 32) {
|
|
|
|
limit = 32;
|
|
|
|
}
|
2016-12-09 03:20:13 +03:00
|
|
|
// The parent process where there are content processes doesn't need as many
|
|
|
|
// threads for decoding images.
|
2017-04-24 12:40:12 +03:00
|
|
|
if (limit > 4 && XRE_IsE10sParentProcess()) {
|
2016-12-09 03:20:13 +03:00
|
|
|
limit = 4;
|
|
|
|
}
|
2015-01-08 11:29:41 +03:00
|
|
|
|
2015-05-15 03:08:26 +03:00
|
|
|
// Initialize the thread pool.
|
|
|
|
for (uint32_t i = 0 ; i < limit ; ++i) {
|
|
|
|
nsCOMPtr<nsIRunnable> worker = new DecodePoolWorker(mImpl);
|
|
|
|
nsCOMPtr<nsIThread> thread;
|
2016-12-20 16:20:48 +03:00
|
|
|
nsresult rv = mImpl->CreateThread(getter_AddRefs(thread), worker);
|
2015-05-15 03:08:26 +03:00
|
|
|
MOZ_RELEASE_ASSERT(NS_SUCCEEDED(rv) && thread,
|
|
|
|
"Should successfully create image decoding threads");
|
|
|
|
mThreads.AppendElement(Move(thread));
|
2015-01-08 11:29:41 +03:00
|
|
|
}
|
2014-11-19 05:17:17 +03:00
|
|
|
|
2015-01-18 12:27:16 +03:00
|
|
|
// Initialize the I/O thread.
|
|
|
|
nsresult rv = NS_NewNamedThread("ImageIO", getter_AddRefs(mIOThread));
|
|
|
|
MOZ_RELEASE_ASSERT(NS_SUCCEEDED(rv) && mIOThread,
|
|
|
|
"Should successfully create image I/O thread");
|
|
|
|
|
2015-01-08 11:29:41 +03:00
|
|
|
nsCOMPtr<nsIObserverService> obsSvc = services::GetObserverService();
|
|
|
|
if (obsSvc) {
|
|
|
|
obsSvc->AddObserver(this, "xpcom-shutdown-threads", false);
|
2014-11-19 05:17:17 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
DecodePool::~DecodePool()
|
|
|
|
{
|
|
|
|
MOZ_ASSERT(NS_IsMainThread(), "Must shut down DecodePool on main thread!");
|
|
|
|
}
|
|
|
|
|
|
|
|
NS_IMETHODIMP
|
|
|
|
DecodePool::Observe(nsISupports*, const char* aTopic, const char16_t*)
|
|
|
|
{
|
|
|
|
MOZ_ASSERT(strcmp(aTopic, "xpcom-shutdown-threads") == 0, "Unexpected topic");
|
|
|
|
|
2016-05-01 21:29:22 +03:00
|
|
|
nsTArray<nsCOMPtr<nsIThread>> threads;
|
2015-01-18 12:27:16 +03:00
|
|
|
nsCOMPtr<nsIThread> ioThread;
|
2014-11-19 05:17:17 +03:00
|
|
|
|
|
|
|
{
|
2015-01-18 12:27:16 +03:00
|
|
|
MutexAutoLock lock(mMutex);
|
2016-05-01 21:29:22 +03:00
|
|
|
threads.SwapElements(mThreads);
|
2015-01-18 12:27:16 +03:00
|
|
|
ioThread.swap(mIOThread);
|
2014-11-19 05:17:17 +03:00
|
|
|
}
|
|
|
|
|
2015-05-15 03:08:26 +03:00
|
|
|
mImpl->RequestShutdown();
|
|
|
|
|
2016-05-01 21:29:22 +03:00
|
|
|
for (uint32_t i = 0 ; i < threads.Length() ; ++i) {
|
2015-05-15 03:08:26 +03:00
|
|
|
threads[i]->Shutdown();
|
2014-11-19 05:17:17 +03:00
|
|
|
}
|
|
|
|
|
2015-01-18 12:27:16 +03:00
|
|
|
if (ioThread) {
|
|
|
|
ioThread->Shutdown();
|
|
|
|
}
|
|
|
|
|
2014-11-19 05:17:17 +03:00
|
|
|
return NS_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2016-06-29 23:43:19 +03:00
|
|
|
DecodePool::AsyncRun(IDecodingTask* aTask)
|
2014-11-19 05:17:17 +03:00
|
|
|
{
|
2016-06-29 23:43:19 +03:00
|
|
|
MOZ_ASSERT(aTask);
|
|
|
|
mImpl->PushWork(aTask);
|
2014-11-19 05:17:17 +03:00
|
|
|
}
|
|
|
|
|
2016-12-22 22:15:41 +03:00
|
|
|
bool
|
Bug 1375392 - Tweak the PROFILER_LABEL* macros. r=mstange.
This patch makes the following changes to the macros.
- Removes PROFILER_LABEL_FUNC. It's only suitable for use in functions outside
classes, due to PROFILER_FUNCTION_NAME not getting class names, and it was
mostly misused.
- Removes PROFILER_FUNCTION_NAME. It's no longer used, and __func__ is
universally available now anyway.
- Combines the first two string literal arguments of PROFILER_LABEL and
PROFILER_LABEL_DYNAMIC into a single argument. There was no good reason for
them to be separate, and it forced a '::' in the label, which isn't always
appropriate. Also, the meaning of the "name_space" argument was interpreted
in an interesting variety of ways.
- Adds an "AUTO_" prefix to PROFILER_LABEL and PROFILER_LABEL_DYNAMIC, to make
it clearer they construct RAII objects rather than just being function calls.
(I myself have screwed up the scoping because of this in the past.)
- Fills in the 'js::ProfileEntry::Category::' qualifier within the macro, so
the caller doesn't need to. This makes a *lot* more of the uses fit onto a
single line.
The patch also makes the following changes to the macro uses (beyond those
required by the changes described above).
- Fixes a bunch of labels that had gotten out of sync with the name of the
class and/or function that encloses them.
- Removes a useless PROFILER_LABEL use within a trivial scope in
EventStateManager::DispatchMouseOrPointerEvent(). It clearly wasn't serving
any useful purpose. It also serves as extra evidence that the AUTO_ prefix is
a good idea.
- Tweaks DecodePool::SyncRunIf{Preferred,Possible} so that the labelling is
done within them, instead of at their callsites, because that's a more
standard way of doing things.
--HG--
extra : rebase_source : 318d1bc6fc1425a94aacbf489dd46e4f83211de4
2017-06-22 10:08:53 +03:00
|
|
|
DecodePool::SyncRunIfPreferred(IDecodingTask* aTask, const nsCString& aURI)
|
2014-11-19 05:17:17 +03:00
|
|
|
{
|
|
|
|
MOZ_ASSERT(NS_IsMainThread());
|
2016-06-29 23:43:19 +03:00
|
|
|
MOZ_ASSERT(aTask);
|
2014-11-19 05:17:17 +03:00
|
|
|
|
Bug 1375392 - Tweak the PROFILER_LABEL* macros. r=mstange.
This patch makes the following changes to the macros.
- Removes PROFILER_LABEL_FUNC. It's only suitable for use in functions outside
classes, due to PROFILER_FUNCTION_NAME not getting class names, and it was
mostly misused.
- Removes PROFILER_FUNCTION_NAME. It's no longer used, and __func__ is
universally available now anyway.
- Combines the first two string literal arguments of PROFILER_LABEL and
PROFILER_LABEL_DYNAMIC into a single argument. There was no good reason for
them to be separate, and it forced a '::' in the label, which isn't always
appropriate. Also, the meaning of the "name_space" argument was interpreted
in an interesting variety of ways.
- Adds an "AUTO_" prefix to PROFILER_LABEL and PROFILER_LABEL_DYNAMIC, to make
it clearer they construct RAII objects rather than just being function calls.
(I myself have screwed up the scoping because of this in the past.)
- Fills in the 'js::ProfileEntry::Category::' qualifier within the macro, so
the caller doesn't need to. This makes a *lot* more of the uses fit onto a
single line.
The patch also makes the following changes to the macro uses (beyond those
required by the changes described above).
- Fixes a bunch of labels that had gotten out of sync with the name of the
class and/or function that encloses them.
- Removes a useless PROFILER_LABEL use within a trivial scope in
EventStateManager::DispatchMouseOrPointerEvent(). It clearly wasn't serving
any useful purpose. It also serves as extra evidence that the AUTO_ prefix is
a good idea.
- Tweaks DecodePool::SyncRunIf{Preferred,Possible} so that the labelling is
done within them, instead of at their callsites, because that's a more
standard way of doing things.
--HG--
extra : rebase_source : 318d1bc6fc1425a94aacbf489dd46e4f83211de4
2017-06-22 10:08:53 +03:00
|
|
|
AUTO_PROFILER_LABEL_DYNAMIC("DecodePool::SyncRunIfPreferred", GRAPHICS,
|
|
|
|
aURI.get());
|
|
|
|
|
2016-06-29 23:43:19 +03:00
|
|
|
if (aTask->ShouldPreferSyncRun()) {
|
|
|
|
aTask->Run();
|
2016-12-22 22:15:41 +03:00
|
|
|
return true;
|
2014-11-19 05:17:17 +03:00
|
|
|
}
|
|
|
|
|
2016-06-29 23:43:19 +03:00
|
|
|
AsyncRun(aTask);
|
2016-12-22 22:15:41 +03:00
|
|
|
return false;
|
2014-11-19 05:17:17 +03:00
|
|
|
}
|
|
|
|
|
2015-01-16 02:11:36 +03:00
|
|
|
void
|
Bug 1375392 - Tweak the PROFILER_LABEL* macros. r=mstange.
This patch makes the following changes to the macros.
- Removes PROFILER_LABEL_FUNC. It's only suitable for use in functions outside
classes, due to PROFILER_FUNCTION_NAME not getting class names, and it was
mostly misused.
- Removes PROFILER_FUNCTION_NAME. It's no longer used, and __func__ is
universally available now anyway.
- Combines the first two string literal arguments of PROFILER_LABEL and
PROFILER_LABEL_DYNAMIC into a single argument. There was no good reason for
them to be separate, and it forced a '::' in the label, which isn't always
appropriate. Also, the meaning of the "name_space" argument was interpreted
in an interesting variety of ways.
- Adds an "AUTO_" prefix to PROFILER_LABEL and PROFILER_LABEL_DYNAMIC, to make
it clearer they construct RAII objects rather than just being function calls.
(I myself have screwed up the scoping because of this in the past.)
- Fills in the 'js::ProfileEntry::Category::' qualifier within the macro, so
the caller doesn't need to. This makes a *lot* more of the uses fit onto a
single line.
The patch also makes the following changes to the macro uses (beyond those
required by the changes described above).
- Fixes a bunch of labels that had gotten out of sync with the name of the
class and/or function that encloses them.
- Removes a useless PROFILER_LABEL use within a trivial scope in
EventStateManager::DispatchMouseOrPointerEvent(). It clearly wasn't serving
any useful purpose. It also serves as extra evidence that the AUTO_ prefix is
a good idea.
- Tweaks DecodePool::SyncRunIf{Preferred,Possible} so that the labelling is
done within them, instead of at their callsites, because that's a more
standard way of doing things.
--HG--
extra : rebase_source : 318d1bc6fc1425a94aacbf489dd46e4f83211de4
2017-06-22 10:08:53 +03:00
|
|
|
DecodePool::SyncRunIfPossible(IDecodingTask* aTask, const nsCString& aURI)
|
2014-11-19 05:17:17 +03:00
|
|
|
{
|
2015-01-16 02:11:36 +03:00
|
|
|
MOZ_ASSERT(NS_IsMainThread());
|
2016-06-29 23:43:19 +03:00
|
|
|
MOZ_ASSERT(aTask);
|
Bug 1375392 - Tweak the PROFILER_LABEL* macros. r=mstange.
This patch makes the following changes to the macros.
- Removes PROFILER_LABEL_FUNC. It's only suitable for use in functions outside
classes, due to PROFILER_FUNCTION_NAME not getting class names, and it was
mostly misused.
- Removes PROFILER_FUNCTION_NAME. It's no longer used, and __func__ is
universally available now anyway.
- Combines the first two string literal arguments of PROFILER_LABEL and
PROFILER_LABEL_DYNAMIC into a single argument. There was no good reason for
them to be separate, and it forced a '::' in the label, which isn't always
appropriate. Also, the meaning of the "name_space" argument was interpreted
in an interesting variety of ways.
- Adds an "AUTO_" prefix to PROFILER_LABEL and PROFILER_LABEL_DYNAMIC, to make
it clearer they construct RAII objects rather than just being function calls.
(I myself have screwed up the scoping because of this in the past.)
- Fills in the 'js::ProfileEntry::Category::' qualifier within the macro, so
the caller doesn't need to. This makes a *lot* more of the uses fit onto a
single line.
The patch also makes the following changes to the macro uses (beyond those
required by the changes described above).
- Fixes a bunch of labels that had gotten out of sync with the name of the
class and/or function that encloses them.
- Removes a useless PROFILER_LABEL use within a trivial scope in
EventStateManager::DispatchMouseOrPointerEvent(). It clearly wasn't serving
any useful purpose. It also serves as extra evidence that the AUTO_ prefix is
a good idea.
- Tweaks DecodePool::SyncRunIf{Preferred,Possible} so that the labelling is
done within them, instead of at their callsites, because that's a more
standard way of doing things.
--HG--
extra : rebase_source : 318d1bc6fc1425a94aacbf489dd46e4f83211de4
2017-06-22 10:08:53 +03:00
|
|
|
|
|
|
|
AUTO_PROFILER_LABEL_DYNAMIC("DecodePool::SyncRunIfPossible", GRAPHICS,
|
|
|
|
aURI.get());
|
|
|
|
|
2016-06-29 23:43:19 +03:00
|
|
|
aTask->Run();
|
2014-11-19 05:17:17 +03:00
|
|
|
}
|
|
|
|
|
2015-01-18 12:27:16 +03:00
|
|
|
already_AddRefed<nsIEventTarget>
|
|
|
|
DecodePool::GetIOEventTarget()
|
|
|
|
{
|
|
|
|
MutexAutoLock threadPoolLock(mMutex);
|
|
|
|
nsCOMPtr<nsIEventTarget> target = do_QueryInterface(mIOThread);
|
|
|
|
return target.forget();
|
|
|
|
}
|
|
|
|
|
2014-11-19 05:17:17 +03:00
|
|
|
} // namespace image
|
|
|
|
} // namespace mozilla
|