mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-02 18:08:58 +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
176 lines
5.0 KiB
C++
176 lines
5.0 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_GFX_ITERABLEARENA_H_
|
|
#define MOZILLA_GFX_ITERABLEARENA_H_
|
|
|
|
#include <stdint.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
|
|
#include <utility>
|
|
#include <vector>
|
|
|
|
#include "mozilla/Assertions.h"
|
|
#include "mozilla/gfx/Logging.h"
|
|
|
|
namespace mozilla {
|
|
namespace gfx {
|
|
|
|
/// A simple pool allocator for plain data structures.
|
|
///
|
|
/// Beware that the pool will not attempt to run the destructors. It is the
|
|
/// responsibility of the user of this class to either use objects with no
|
|
/// destructor or to manually call the allocated objects destructors.
|
|
/// If the pool is growable, its allocated objects must be safely moveable in
|
|
/// in memory (through memcpy).
|
|
class IterableArena {
|
|
protected:
|
|
struct Header {
|
|
size_t mBlocSize;
|
|
};
|
|
|
|
public:
|
|
enum ArenaType { FIXED_SIZE, GROWABLE };
|
|
|
|
IterableArena(ArenaType aType, size_t aStorageSize)
|
|
: mSize(aStorageSize), mCursor(0), mIsGrowable(aType == GROWABLE) {
|
|
if (mSize == 0) {
|
|
mSize = 128;
|
|
}
|
|
|
|
mStorage = (uint8_t*)malloc(mSize);
|
|
if (mStorage == nullptr) {
|
|
gfxCriticalError() << "Not enough Memory allocate a memory pool of size "
|
|
<< aStorageSize;
|
|
MOZ_CRASH("GFX: Out of memory IterableArena");
|
|
}
|
|
}
|
|
|
|
~IterableArena() { free(mStorage); }
|
|
|
|
/// Constructs a new item in the pool and returns a positive offset in case of
|
|
/// success.
|
|
///
|
|
/// The offset never changes even if the storage is reallocated, so users
|
|
/// of this class should prefer storing offsets rather than direct pointers
|
|
/// to the allocated objects.
|
|
/// Alloc can cause the storage to be reallocated if the pool was initialized
|
|
/// with IterableArena::GROWABLE.
|
|
/// If for any reason the pool fails to allocate enough space for the new item
|
|
/// Alloc returns a negative offset and the object's constructor is not
|
|
/// called.
|
|
template <typename T, typename... Args>
|
|
ptrdiff_t Alloc(Args&&... aArgs) {
|
|
void* storage = nullptr;
|
|
auto offset = AllocRaw(sizeof(T), &storage);
|
|
if (offset < 0) {
|
|
return offset;
|
|
}
|
|
new (storage) T(std::forward<Args>(aArgs)...);
|
|
return offset;
|
|
}
|
|
|
|
ptrdiff_t AllocRaw(size_t aSize, void** aOutPtr = nullptr) {
|
|
const size_t blocSize = AlignedSize(sizeof(Header) + aSize);
|
|
|
|
if (AlignedSize(mCursor + blocSize) > mSize) {
|
|
if (!mIsGrowable) {
|
|
return -1;
|
|
}
|
|
|
|
size_t newSize = mSize * 2;
|
|
while (AlignedSize(mCursor + blocSize) > newSize) {
|
|
newSize *= 2;
|
|
}
|
|
|
|
uint8_t* newStorage = (uint8_t*)realloc(mStorage, newSize);
|
|
if (!newStorage) {
|
|
gfxCriticalError()
|
|
<< "Not enough Memory to grow the memory pool, size: " << newSize;
|
|
return -1;
|
|
}
|
|
|
|
mStorage = newStorage;
|
|
mSize = newSize;
|
|
}
|
|
ptrdiff_t offset = mCursor;
|
|
GetHeader(offset)->mBlocSize = blocSize;
|
|
mCursor += blocSize;
|
|
if (aOutPtr) {
|
|
*aOutPtr = GetStorage(offset);
|
|
}
|
|
return offset;
|
|
}
|
|
|
|
/// Get access to an allocated item at a given offset (only use offsets
|
|
/// returned by Alloc or AllocRaw).
|
|
///
|
|
/// If the pool is growable, the returned pointer is only valid temporarily.
|
|
/// The underlying storage can be reallocated in Alloc or AllocRaw, so do not
|
|
/// keep these pointers around and store the offset instead.
|
|
void* GetStorage(ptrdiff_t offset = 0) {
|
|
MOZ_ASSERT(offset >= 0);
|
|
MOZ_ASSERT(offset < mCursor);
|
|
return offset >= 0 ? mStorage + offset + sizeof(Header) : nullptr;
|
|
}
|
|
|
|
/// Clears the storage without running any destructor and without deallocating
|
|
/// it.
|
|
void Clear() { mCursor = 0; }
|
|
|
|
/// Iterate over the elements allocated in this pool.
|
|
///
|
|
/// Takes a lambda or function object accepting a void* as parameter.
|
|
template <typename Func>
|
|
void ForEach(Func cb) {
|
|
Iterator it;
|
|
while (void* ptr = it.Next(this)) {
|
|
cb(ptr);
|
|
}
|
|
}
|
|
|
|
/// A simple iterator over an arena.
|
|
class Iterator {
|
|
public:
|
|
Iterator() : mCursor(0) {}
|
|
|
|
void* Next(IterableArena* aArena) {
|
|
if (mCursor >= aArena->mCursor) {
|
|
return nullptr;
|
|
}
|
|
void* result = aArena->GetStorage(mCursor);
|
|
const size_t blocSize = aArena->GetHeader(mCursor)->mBlocSize;
|
|
MOZ_ASSERT(blocSize != 0);
|
|
mCursor += blocSize;
|
|
return result;
|
|
}
|
|
|
|
private:
|
|
ptrdiff_t mCursor;
|
|
};
|
|
|
|
protected:
|
|
Header* GetHeader(ptrdiff_t offset) { return (Header*)(mStorage + offset); }
|
|
|
|
size_t AlignedSize(size_t aSize) const {
|
|
const size_t alignment = sizeof(uintptr_t);
|
|
return aSize + (alignment - (aSize % alignment)) % alignment;
|
|
}
|
|
|
|
uint8_t* mStorage;
|
|
uint32_t mSize;
|
|
ptrdiff_t mCursor;
|
|
bool mIsGrowable;
|
|
|
|
friend class Iterator;
|
|
};
|
|
|
|
} // namespace gfx
|
|
} // namespace mozilla
|
|
|
|
#endif
|