778b011866
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
100 lines
2.5 KiB
C++
100 lines
2.5 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set sw=2 ts=8 et ft=cpp : */
|
|
/* 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 "mozilla/ShmemPool.h"
|
|
|
|
#include <utility>
|
|
|
|
#include "mozilla/Assertions.h"
|
|
#include "mozilla/Logging.h"
|
|
|
|
mozilla::LazyLogModule sShmemPoolLog("ShmemPool");
|
|
|
|
#define SHMEMPOOL_LOG_VERBOSE(args) \
|
|
MOZ_LOG(sShmemPoolLog, mozilla::LogLevel::Verbose, args)
|
|
|
|
namespace mozilla {
|
|
|
|
ShmemPool::ShmemPool(size_t aPoolSize, PoolType aPoolType)
|
|
: mPoolType(aPoolType),
|
|
mMutex("mozilla::ShmemPool"),
|
|
mPoolFree(aPoolSize),
|
|
mErrorLogged(false)
|
|
#ifdef DEBUG
|
|
,
|
|
mMaxPoolUse(0)
|
|
#endif
|
|
{
|
|
mShmemPool.SetLength(aPoolSize);
|
|
}
|
|
|
|
mozilla::ShmemBuffer ShmemPool::GetIfAvailable(size_t aSize) {
|
|
MutexAutoLock lock(mMutex);
|
|
|
|
// Pool is empty, don't block caller.
|
|
if (mPoolFree == 0) {
|
|
if (!mErrorLogged) {
|
|
// log "out of pool" once as error to avoid log spam
|
|
mErrorLogged = true;
|
|
SHMEMPOOL_LOG_ERROR(
|
|
("ShmemPool is empty, future occurrences "
|
|
"will be logged as warnings"));
|
|
} else {
|
|
SHMEMPOOL_LOG_WARN(("ShmemPool is empty"));
|
|
}
|
|
// This isn't initialized, so will be understood as an error.
|
|
return ShmemBuffer();
|
|
}
|
|
|
|
ShmemBuffer& res = mShmemPool[mPoolFree - 1];
|
|
|
|
if (!res.mInitialized) {
|
|
SHMEMPOOL_LOG(("No free preallocated Shmem"));
|
|
return ShmemBuffer();
|
|
}
|
|
|
|
MOZ_ASSERT(res.mShmem.IsWritable(), "Pool in Shmem is not writable?");
|
|
|
|
if (res.mShmem.Size<uint8_t>() < aSize) {
|
|
SHMEMPOOL_LOG(("Free Shmem but not of the right size"));
|
|
return ShmemBuffer();
|
|
}
|
|
|
|
mPoolFree--;
|
|
#ifdef DEBUG
|
|
size_t poolUse = mShmemPool.Length() - mPoolFree;
|
|
if (poolUse > mMaxPoolUse) {
|
|
mMaxPoolUse = poolUse;
|
|
SHMEMPOOL_LOG(
|
|
("Maximum ShmemPool use increased: %zu buffers", mMaxPoolUse));
|
|
}
|
|
#endif
|
|
return std::move(res);
|
|
}
|
|
|
|
void ShmemPool::Put(ShmemBuffer&& aShmem) {
|
|
MutexAutoLock lock(mMutex);
|
|
MOZ_ASSERT(mPoolFree < mShmemPool.Length());
|
|
mShmemPool[mPoolFree] = std::move(aShmem);
|
|
mPoolFree++;
|
|
#ifdef DEBUG
|
|
size_t poolUse = mShmemPool.Length() - mPoolFree;
|
|
if (poolUse > 0) {
|
|
SHMEMPOOL_LOG_VERBOSE(("ShmemPool usage reduced to %zu buffers", poolUse));
|
|
}
|
|
#endif
|
|
}
|
|
|
|
ShmemPool::~ShmemPool() {
|
|
#ifdef DEBUG
|
|
for (size_t i = 0; i < mShmemPool.Length(); i++) {
|
|
MOZ_ASSERT(!mShmemPool[i].Valid());
|
|
}
|
|
#endif
|
|
}
|
|
|
|
} // namespace mozilla
|