mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-20 00:35:44 +00:00
256c124f94
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
72 lines
2.1 KiB
C++
72 lines
2.1 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_ConditionVariable_h
|
|
#define mozilla_ConditionVariable_h
|
|
|
|
#include <stdint.h>
|
|
|
|
#include <utility>
|
|
|
|
#include "mozilla/Attributes.h"
|
|
#include "mozilla/PlatformMutex.h"
|
|
#include "mozilla/TimeStamp.h"
|
|
#ifndef XP_WIN
|
|
# include <pthread.h>
|
|
#endif
|
|
|
|
namespace mozilla {
|
|
|
|
enum class CVStatus { NoTimeout, Timeout };
|
|
|
|
namespace detail {
|
|
|
|
class ConditionVariableImpl {
|
|
public:
|
|
struct PlatformData;
|
|
|
|
MFBT_API ConditionVariableImpl();
|
|
MFBT_API ~ConditionVariableImpl();
|
|
|
|
// Wake one thread that is waiting on this condition.
|
|
MFBT_API void notify_one();
|
|
|
|
// Wake all threads that are waiting on this condition.
|
|
MFBT_API void notify_all();
|
|
|
|
// Atomically release |lock| and sleep the current thread of execution on
|
|
// this condition variable.
|
|
// |lock| will be re-acquired before this function returns.
|
|
// The thread may be woken from sleep from another thread via notify_one()
|
|
// or notify_all(), but may also wake spuriously. The caller should recheck
|
|
// its predicate after this function returns, typically in a while loop.
|
|
MFBT_API void wait(MutexImpl& lock);
|
|
|
|
MFBT_API CVStatus wait_for(MutexImpl& lock,
|
|
const mozilla::TimeDuration& rel_time);
|
|
|
|
private:
|
|
ConditionVariableImpl(const ConditionVariableImpl&) = delete;
|
|
ConditionVariableImpl& operator=(const ConditionVariableImpl&) = delete;
|
|
|
|
PlatformData* platformData();
|
|
|
|
#ifndef XP_WIN
|
|
void* platformData_[sizeof(pthread_cond_t) / sizeof(void*)];
|
|
static_assert(sizeof(pthread_cond_t) / sizeof(void*) != 0 &&
|
|
sizeof(pthread_cond_t) % sizeof(void*) == 0,
|
|
"pthread_cond_t must have pointer alignment");
|
|
#else
|
|
void* platformData_[4];
|
|
#endif
|
|
};
|
|
|
|
} // namespace detail
|
|
|
|
} // namespace mozilla
|
|
|
|
#endif // mozilla_ConditionVariable_h
|