2017-02-09 01:52:55 +00: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: */
|
|
|
|
/* 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_PlatformMutex_h
|
|
|
|
#define mozilla_PlatformMutex_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 16:19:48 +00:00
|
|
|
#include <utility>
|
|
|
|
|
2017-02-09 01:52:55 +00:00
|
|
|
#include "mozilla/Attributes.h"
|
2021-03-25 10:19:44 +00:00
|
|
|
#include "mozilla/Types.h"
|
2017-02-09 01:52:55 +00:00
|
|
|
|
2021-04-08 08:02:16 +00:00
|
|
|
#if !defined(XP_WIN) && !defined(__wasi__)
|
2017-02-22 21:41:35 +00:00
|
|
|
# include <pthread.h>
|
|
|
|
#endif
|
|
|
|
|
2017-02-09 01:52:55 +00:00
|
|
|
namespace mozilla {
|
|
|
|
|
|
|
|
namespace detail {
|
|
|
|
|
|
|
|
class ConditionVariableImpl;
|
|
|
|
|
|
|
|
class MutexImpl {
|
|
|
|
public:
|
|
|
|
struct PlatformData;
|
|
|
|
|
2020-02-27 17:39:15 +00:00
|
|
|
explicit MFBT_API MutexImpl();
|
2017-02-09 01:52:55 +00:00
|
|
|
MFBT_API ~MutexImpl();
|
|
|
|
|
|
|
|
protected:
|
|
|
|
MFBT_API void lock();
|
|
|
|
MFBT_API void unlock();
|
2019-01-09 15:09:24 +00:00
|
|
|
// We have a separate, forwarding API so internal uses don't have to go
|
|
|
|
// through the PLT.
|
|
|
|
MFBT_API bool tryLock();
|
2017-02-09 01:52:55 +00:00
|
|
|
|
|
|
|
private:
|
|
|
|
MutexImpl(const MutexImpl&) = delete;
|
|
|
|
void operator=(const MutexImpl&) = delete;
|
|
|
|
MutexImpl(MutexImpl&&) = delete;
|
|
|
|
void operator=(MutexImpl&&) = delete;
|
2018-06-17 22:57:18 +00:00
|
|
|
bool operator==(const MutexImpl& rhs) = delete;
|
2017-02-09 01:52:55 +00:00
|
|
|
|
2018-05-02 14:11:53 +00:00
|
|
|
void mutexLock();
|
|
|
|
bool mutexTryLock();
|
|
|
|
|
2017-02-09 01:52:55 +00:00
|
|
|
PlatformData* platformData();
|
|
|
|
|
2021-04-08 08:02:16 +00:00
|
|
|
#if !defined(XP_WIN) && !defined(__wasi__)
|
2017-02-22 21:41:35 +00:00
|
|
|
void* platformData_[sizeof(pthread_mutex_t) / sizeof(void*)];
|
|
|
|
static_assert(sizeof(pthread_mutex_t) / sizeof(void*) != 0 &&
|
|
|
|
sizeof(pthread_mutex_t) % sizeof(void*) == 0,
|
|
|
|
"pthread_mutex_t must have pointer alignment");
|
2017-02-09 01:52:55 +00:00
|
|
|
#else
|
2017-02-22 21:41:35 +00:00
|
|
|
void* platformData_[6];
|
2017-02-09 01:52:55 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
friend class mozilla::detail::ConditionVariableImpl;
|
|
|
|
};
|
|
|
|
|
|
|
|
} // namespace detail
|
|
|
|
|
|
|
|
} // namespace mozilla
|
|
|
|
#endif // mozilla_PlatformMutex_h
|