2014-06-30 19:39:45 +04:00
|
|
|
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
2013-03-26 20:11:00 +04:00
|
|
|
/* 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
|
2013-12-13 04:30:59 +04:00
|
|
|
#define mozilla_SyncRunnable_h
|
2013-03-26 20:11:00 +04:00
|
|
|
|
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>
|
|
|
|
|
2016-05-04 11:24:25 +03:00
|
|
|
#include "mozilla/AbstractThread.h"
|
2020-03-26 03:36:24 +03:00
|
|
|
#include "mozilla/dom/JSExecutionManager.h"
|
2013-03-26 20:11:00 +04:00
|
|
|
#include "mozilla/Monitor.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"
|
2013-03-26 20:11:00 +04:00
|
|
|
|
|
|
|
namespace mozilla {
|
|
|
|
|
|
|
|
/**
|
|
|
|
* This class will wrap a nsIRunnable and dispatch it to the main thread
|
|
|
|
* synchronously. This is different from nsIEventTarget.DISPATCH_SYNC:
|
|
|
|
* 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:
|
2015-10-18 08:24:48 +03:00
|
|
|
* RefPtr<SyncRunnable> sr = new SyncRunnable(new myrunnable...());
|
2013-03-26 20:11:00 +04:00
|
|
|
* sr->DispatchToThread(t);
|
|
|
|
*
|
|
|
|
* We also provide a convenience wrapper:
|
|
|
|
* SyncRunnable::DispatchToThread(new myrunnable...());
|
|
|
|
*
|
|
|
|
*/
|
2016-04-26 03:23:21 +03:00
|
|
|
class SyncRunnable : public Runnable {
|
2013-03-26 20:11:00 +04:00
|
|
|
public:
|
2014-09-02 17:50:07 +04:00
|
|
|
explicit SyncRunnable(nsIRunnable* aRunnable)
|
2017-06-12 22:34:10 +03:00
|
|
|
: Runnable("SyncRunnable"),
|
|
|
|
mRunnable(aRunnable),
|
2013-03-26 20:11:00 +04:00
|
|
|
mMonitor("SyncRunnable"),
|
2014-03-11 20:42:58 +04:00
|
|
|
mDone(false) {}
|
2013-03-26 20:11:00 +04:00
|
|
|
|
2016-06-29 05:24:54 +03:00
|
|
|
explicit SyncRunnable(already_AddRefed<nsIRunnable> aRunnable)
|
2017-06-12 22:34:10 +03:00
|
|
|
: Runnable("SyncRunnable"),
|
2018-05-30 22:15:35 +03:00
|
|
|
mRunnable(std::move(aRunnable)),
|
2016-06-29 05:24:54 +03:00
|
|
|
mMonitor("SyncRunnable"),
|
|
|
|
mDone(false) {}
|
|
|
|
|
2014-05-27 11:15:35 +04:00
|
|
|
void DispatchToThread(nsIEventTarget* aThread, bool aForceDispatch = false) {
|
2013-03-26 20:11:00 +04:00
|
|
|
nsresult rv;
|
|
|
|
bool on;
|
|
|
|
|
2014-05-27 11:15:35 +04:00
|
|
|
if (!aForceDispatch) {
|
|
|
|
rv = aThread->IsOnCurrentThread(&on);
|
2013-09-26 04:58:16 +04:00
|
|
|
MOZ_ASSERT(NS_SUCCEEDED(rv));
|
|
|
|
if (NS_SUCCEEDED(rv) && on) {
|
|
|
|
mRunnable->Run();
|
|
|
|
return;
|
|
|
|
}
|
2013-03-26 20:11:00 +04:00
|
|
|
}
|
|
|
|
|
2014-05-27 11:15:35 +04:00
|
|
|
rv = aThread->Dispatch(this, NS_DISPATCH_NORMAL);
|
2013-03-26 20:11:00 +04:00
|
|
|
if (NS_SUCCEEDED(rv)) {
|
2014-03-11 20:42:58 +04:00
|
|
|
mozilla::MonitorAutoLock lock(mMonitor);
|
2020-03-26 03:36:24 +03:00
|
|
|
// This could be synchronously dispatching to a thread currently waiting
|
|
|
|
// for JS execution clearance. Yield JS execution.
|
|
|
|
dom::AutoYieldJSThreadExecution yield;
|
|
|
|
|
2014-03-11 20:42:58 +04:00
|
|
|
while (!mDone) {
|
|
|
|
lock.Wait();
|
|
|
|
}
|
2013-03-26 20:11:00 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-05-04 11:24:25 +03:00
|
|
|
void DispatchToThread(AbstractThread* aThread, bool aForceDispatch = false) {
|
|
|
|
if (!aForceDispatch && aThread->IsCurrentThreadIn()) {
|
|
|
|
mRunnable->Run();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check we don't have tail dispatching here. Otherwise we will deadlock
|
|
|
|
// ourself when spinning the loop below.
|
|
|
|
MOZ_ASSERT(!aThread->RequiresTailDispatchFromCurrentThread());
|
|
|
|
|
|
|
|
aThread->Dispatch(RefPtr<nsIRunnable>(this).forget());
|
|
|
|
mozilla::MonitorAutoLock lock(mMonitor);
|
|
|
|
while (!mDone) {
|
|
|
|
lock.Wait();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-05-27 11:15:35 +04:00
|
|
|
static void DispatchToThread(nsIEventTarget* aThread, nsIRunnable* aRunnable,
|
|
|
|
bool aForceDispatch = false) {
|
2015-10-18 08:24:48 +03:00
|
|
|
RefPtr<SyncRunnable> s(new SyncRunnable(aRunnable));
|
2014-05-27 11:15:35 +04:00
|
|
|
s->DispatchToThread(aThread, aForceDispatch);
|
2013-03-26 20:11:00 +04:00
|
|
|
}
|
|
|
|
|
2016-05-04 11:24:25 +03:00
|
|
|
static void DispatchToThread(AbstractThread* aThread, nsIRunnable* aRunnable,
|
|
|
|
bool aForceDispatch = false) {
|
|
|
|
RefPtr<SyncRunnable> s(new SyncRunnable(aRunnable));
|
|
|
|
s->DispatchToThread(aThread, aForceDispatch);
|
|
|
|
}
|
|
|
|
|
2013-03-26 20:11:00 +04:00
|
|
|
protected:
|
2016-08-08 05:18:10 +03:00
|
|
|
NS_IMETHOD Run() override {
|
2013-03-26 20:11:00 +04:00
|
|
|
mRunnable->Run();
|
2014-03-11 20:42:58 +04:00
|
|
|
|
|
|
|
mozilla::MonitorAutoLock lock(mMonitor);
|
|
|
|
MOZ_ASSERT(!mDone);
|
|
|
|
|
|
|
|
mDone = true;
|
|
|
|
mMonitor.Notify();
|
|
|
|
|
2013-03-26 20:11:00 +04:00
|
|
|
return NS_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
private:
|
|
|
|
nsCOMPtr<nsIRunnable> mRunnable;
|
|
|
|
mozilla::Monitor mMonitor;
|
2014-03-11 20:42:58 +04:00
|
|
|
bool mDone;
|
2013-03-26 20:11:00 +04:00
|
|
|
};
|
|
|
|
|
|
|
|
} // namespace mozilla
|
|
|
|
|
|
|
|
#endif // mozilla_SyncRunnable_h
|