gecko-dev/xpcom/threads/SyncRunnable.h

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

158 строки
5.2 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/. */
#ifndef mozilla_SyncRunnable_h
#define mozilla_SyncRunnable_h
Bug 1609996 - Reorder some includes affected by the previous patches. r=froydnj This was done by: This was done by applying: ``` diff --git a/python/mozbuild/mozbuild/code-analysis/mach_commands.py b/python/mozbuild/mozbuild/code-analysis/mach_commands.py index 789affde7bbf..fe33c4c7d4d1 100644 --- a/python/mozbuild/mozbuild/code-analysis/mach_commands.py +++ b/python/mozbuild/mozbuild/code-analysis/mach_commands.py @@ -2007,7 +2007,7 @@ class StaticAnalysis(MachCommandBase): from subprocess import Popen, PIPE, check_output, CalledProcessError diff_process = Popen(self._get_clang_format_diff_command(commit), stdout=PIPE) - args = [sys.executable, clang_format_diff, "-p1", "-binary=%s" % clang_format] + args = [sys.executable, clang_format_diff, "-p1", "-binary=%s" % clang_format, '-sort-includes'] if not output_file: args.append("-i") ``` Then running `./mach clang-format -c <commit-hash>` Then undoing that patch. Then running check_spidermonkey_style.py --fixup Then running `./mach clang-format` I had to fix four things: * I needed to move <utility> back down in GuardObjects.h because I was hitting obscure problems with our system include wrappers like this: 0:03.94 /usr/include/stdlib.h:550:14: error: exception specification in declaration does not match previous declaration 0:03.94 extern void *realloc (void *__ptr, size_t __size) 0:03.94 ^ 0:03.94 /home/emilio/src/moz/gecko-2/obj-debug/dist/include/malloc_decls.h:53:1: note: previous declaration is here 0:03.94 MALLOC_DECL(realloc, void*, void*, size_t) 0:03.94 ^ 0:03.94 /home/emilio/src/moz/gecko-2/obj-debug/dist/include/mozilla/mozalloc.h:22:32: note: expanded from macro 'MALLOC_DECL' 0:03.94 MOZ_MEMORY_API return_type name##_impl(__VA_ARGS__); 0:03.94 ^ 0:03.94 <scratch space>:178:1: note: expanded from here 0:03.94 realloc_impl 0:03.94 ^ 0:03.94 /home/emilio/src/moz/gecko-2/obj-debug/dist/include/mozmemory_wrap.h:142:41: note: expanded from macro 'realloc_impl' 0:03.94 #define realloc_impl mozmem_malloc_impl(realloc) Which I really didn't feel like digging into. * I had to restore the order of TrustOverrideUtils.h and related files in nss because the .inc files depend on TrustOverrideUtils.h being included earlier. * I had to add a missing include to RollingNumber.h * Also had to partially restore include order in JsepSessionImpl.cpp to avoid some -WError issues due to some static inline functions being defined in a header but not used in the rest of the compilation unit. Differential Revision: https://phabricator.services.mozilla.com/D60327 --HG-- extra : moz-landing-system : lando
2020-01-20 19:19:48 +03:00
#include <utility>
#include "mozilla/AbstractThread.h"
#include "mozilla/Monitor.h"
#include "mozilla/dom/JSExecutionManager.h"
Bug 1609996 - Reorder some includes affected by the previous patches. r=froydnj This was done by: This was done by applying: ``` diff --git a/python/mozbuild/mozbuild/code-analysis/mach_commands.py b/python/mozbuild/mozbuild/code-analysis/mach_commands.py index 789affde7bbf..fe33c4c7d4d1 100644 --- a/python/mozbuild/mozbuild/code-analysis/mach_commands.py +++ b/python/mozbuild/mozbuild/code-analysis/mach_commands.py @@ -2007,7 +2007,7 @@ class StaticAnalysis(MachCommandBase): from subprocess import Popen, PIPE, check_output, CalledProcessError diff_process = Popen(self._get_clang_format_diff_command(commit), stdout=PIPE) - args = [sys.executable, clang_format_diff, "-p1", "-binary=%s" % clang_format] + args = [sys.executable, clang_format_diff, "-p1", "-binary=%s" % clang_format, '-sort-includes'] if not output_file: args.append("-i") ``` Then running `./mach clang-format -c <commit-hash>` Then undoing that patch. Then running check_spidermonkey_style.py --fixup Then running `./mach clang-format` I had to fix four things: * I needed to move <utility> back down in GuardObjects.h because I was hitting obscure problems with our system include wrappers like this: 0:03.94 /usr/include/stdlib.h:550:14: error: exception specification in declaration does not match previous declaration 0:03.94 extern void *realloc (void *__ptr, size_t __size) 0:03.94 ^ 0:03.94 /home/emilio/src/moz/gecko-2/obj-debug/dist/include/malloc_decls.h:53:1: note: previous declaration is here 0:03.94 MALLOC_DECL(realloc, void*, void*, size_t) 0:03.94 ^ 0:03.94 /home/emilio/src/moz/gecko-2/obj-debug/dist/include/mozilla/mozalloc.h:22:32: note: expanded from macro 'MALLOC_DECL' 0:03.94 MOZ_MEMORY_API return_type name##_impl(__VA_ARGS__); 0:03.94 ^ 0:03.94 <scratch space>:178:1: note: expanded from here 0:03.94 realloc_impl 0:03.94 ^ 0:03.94 /home/emilio/src/moz/gecko-2/obj-debug/dist/include/mozmemory_wrap.h:142:41: note: expanded from macro 'realloc_impl' 0:03.94 #define realloc_impl mozmem_malloc_impl(realloc) Which I really didn't feel like digging into. * I had to restore the order of TrustOverrideUtils.h and related files in nss because the .inc files depend on TrustOverrideUtils.h being included earlier. * I had to add a missing include to RollingNumber.h * Also had to partially restore include order in JsepSessionImpl.cpp to avoid some -WError issues due to some static inline functions being defined in a header but not used in the rest of the compilation unit. Differential Revision: https://phabricator.services.mozilla.com/D60327 --HG-- extra : moz-landing-system : lando
2020-01-20 19:19:48 +03:00
#include "nsThreadUtils.h"
namespace mozilla {
/**
* This class will wrap a nsIRunnable and dispatch it to the target thread
* synchronously. This is different from
* NS_DispatchAndSpinEventLoopUntilComplete: this class does not spin the event
* loop waiting for the event to be dispatched. This means that you don't risk
* reentrance from pending messages, but you must be sure that the target thread
* does not ever block on this thread, or else you will deadlock.
*
* Typical usage:
* RefPtr<SyncRunnable> sr = new SyncRunnable(new myrunnable...());
* sr->DispatchToThread(t);
*
* We also provide convenience wrappers:
* SyncRunnable::DispatchToThread(pThread, new myrunnable...());
* SyncRunnable::DispatchToThread(pThread, NS_NewRunnableFunction(...));
*
*/
class SyncRunnable : public Runnable {
public:
explicit SyncRunnable(nsIRunnable* aRunnable)
: Runnable("SyncRunnable"),
mRunnable(aRunnable),
mMonitor("SyncRunnable"),
mDone(false) {}
explicit SyncRunnable(already_AddRefed<nsIRunnable> aRunnable)
: Runnable("SyncRunnable"),
mRunnable(std::move(aRunnable)),
mMonitor("SyncRunnable"),
mDone(false) {}
nsresult DispatchToThread(nsIEventTarget* aThread,
bool aForceDispatch = false) {
nsresult rv;
bool on;
if (!aForceDispatch) {
rv = aThread->IsOnCurrentThread(&on);
MOZ_ASSERT(NS_SUCCEEDED(rv));
if (NS_SUCCEEDED(rv) && on) {
mRunnable->Run();
return NS_OK;
}
}
rv = aThread->Dispatch(this, NS_DISPATCH_NORMAL);
if (NS_SUCCEEDED(rv)) {
mozilla::MonitorAutoLock lock(mMonitor);
// This could be synchronously dispatching to a thread currently waiting
// for JS execution clearance. Yield JS execution.
dom::AutoYieldJSThreadExecution yield;
while (!mDone) {
lock.Wait();
}
}
return rv;
}
nsresult DispatchToThread(AbstractThread* aThread,
bool aForceDispatch = false) {
if (!aForceDispatch && aThread->IsCurrentThreadIn()) {
mRunnable->Run();
return NS_OK;
}
// Check we don't have tail dispatching here. Otherwise we will deadlock
// ourself when spinning the loop below.
MOZ_ASSERT(!aThread->RequiresTailDispatchFromCurrentThread());
nsresult rv = aThread->Dispatch(RefPtr<nsIRunnable>(this).forget());
if (NS_SUCCEEDED(rv)) {
mozilla::MonitorAutoLock lock(mMonitor);
while (!mDone) {
lock.Wait();
}
}
return rv;
}
static nsresult DispatchToThread(nsIEventTarget* aThread,
nsIRunnable* aRunnable,
bool aForceDispatch = false) {
Bug 1207245 - part 6 - rename nsRefPtr<T> to RefPtr<T>; r=ehsan; a=Tomcat The bulk of this commit was generated with a script, executed at the top level of a typical source code checkout. The only non-machine-generated part was modifying MFBT's moz.build to reflect the new naming. CLOSED TREE makes big refactorings like this a piece of cake. # The main substitution. find . -name '*.cpp' -o -name '*.cc' -o -name '*.h' -o -name '*.mm' -o -name '*.idl'| \ xargs perl -p -i -e ' s/nsRefPtr\.h/RefPtr\.h/g; # handle includes s/nsRefPtr ?</RefPtr</g; # handle declarations and variables ' # Handle a special friend declaration in gfx/layers/AtomicRefCountedWithFinalize.h. perl -p -i -e 's/::nsRefPtr;/::RefPtr;/' gfx/layers/AtomicRefCountedWithFinalize.h # Handle nsRefPtr.h itself, a couple places that define constructors # from nsRefPtr, and code generators specially. We do this here, rather # than indiscriminantly s/nsRefPtr/RefPtr/, because that would rename # things like nsRefPtrHashtable. perl -p -i -e 's/nsRefPtr/RefPtr/g' \ mfbt/nsRefPtr.h \ xpcom/glue/nsCOMPtr.h \ xpcom/base/OwningNonNull.h \ ipc/ipdl/ipdl/lower.py \ ipc/ipdl/ipdl/builtin.py \ dom/bindings/Codegen.py \ python/lldbutils/lldbutils/utils.py # In our indiscriminate substitution above, we renamed # nsRefPtrGetterAddRefs, the class behind getter_AddRefs. Fix that up. find . -name '*.cpp' -o -name '*.h' -o -name '*.idl' | \ xargs perl -p -i -e 's/nsRefPtrGetterAddRefs/RefPtrGetterAddRefs/g' if [ -d .git ]; then git mv mfbt/nsRefPtr.h mfbt/RefPtr.h else hg mv mfbt/nsRefPtr.h mfbt/RefPtr.h fi --HG-- rename : mfbt/nsRefPtr.h => mfbt/RefPtr.h
2015-10-18 08:24:48 +03:00
RefPtr<SyncRunnable> s(new SyncRunnable(aRunnable));
return s->DispatchToThread(aThread, aForceDispatch);
}
static nsresult DispatchToThread(AbstractThread* aThread,
nsIRunnable* aRunnable,
bool aForceDispatch = false) {
RefPtr<SyncRunnable> s(new SyncRunnable(aRunnable));
return s->DispatchToThread(aThread, aForceDispatch);
}
static nsresult DispatchToThread(nsIEventTarget* aThread,
already_AddRefed<nsIRunnable> aRunnable,
bool aForceDispatch = false) {
RefPtr<SyncRunnable> s(new SyncRunnable(std::move(aRunnable)));
return s->DispatchToThread(aThread, aForceDispatch);
}
static nsresult DispatchToThread(AbstractThread* aThread,
already_AddRefed<nsIRunnable> aRunnable,
bool aForceDispatch = false) {
RefPtr<SyncRunnable> s(new SyncRunnable(std::move(aRunnable)));
return s->DispatchToThread(aThread, aForceDispatch);
}
// These deleted overloads prevent accidentally (if harmlessly) double-
// wrapping SyncRunnable, which was previously a common anti-pattern.
static nsresult DispatchToThread(nsIEventTarget* aThread,
SyncRunnable* aRunnable,
bool aForceDispatch = false) = delete;
static nsresult DispatchToThread(AbstractThread* aThread,
SyncRunnable* aRunnable,
bool aForceDispatch = false) = delete;
protected:
NS_IMETHOD Run() override {
mRunnable->Run();
mozilla::MonitorAutoLock lock(mMonitor);
MOZ_ASSERT(!mDone);
mDone = true;
mMonitor.Notify();
return NS_OK;
}
private:
nsCOMPtr<nsIRunnable> mRunnable;
mozilla::Monitor mMonitor;
bool mDone MOZ_GUARDED_BY(mMonitor);
};
} // namespace mozilla
#endif // mozilla_SyncRunnable_h