2014-12-09 01:45:13 +03: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/. */
|
|
|
|
|
|
|
|
// A simple segmented vector class.
|
|
|
|
//
|
|
|
|
// This class should be used in preference to mozilla::Vector or nsTArray when
|
|
|
|
// you are simply gathering items in order to later iterate over them.
|
|
|
|
//
|
|
|
|
// - In the case where you don't know the final size in advance, using
|
|
|
|
// SegmentedVector avoids the need to repeatedly allocate increasingly large
|
|
|
|
// buffers and copy the data into them.
|
|
|
|
//
|
|
|
|
// - In the case where you know the final size in advance and so can set the
|
|
|
|
// capacity appropriately, using SegmentedVector still avoids the need for
|
|
|
|
// large allocations (which can trigger OOMs).
|
|
|
|
|
|
|
|
#ifndef mozilla_SegmentedVector_h
|
|
|
|
#define mozilla_SegmentedVector_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 <new> // for placement new
|
|
|
|
#include <utility>
|
|
|
|
|
2014-12-09 01:45:13 +03:00
|
|
|
#include "mozilla/AllocPolicy.h"
|
|
|
|
#include "mozilla/Array.h"
|
2018-06-18 21:55:41 +03:00
|
|
|
#include "mozilla/Attributes.h"
|
2014-12-09 01:45:13 +03:00
|
|
|
#include "mozilla/LinkedList.h"
|
|
|
|
#include "mozilla/MemoryReporting.h"
|
2018-11-27 02:51:35 +03:00
|
|
|
#include "mozilla/OperatorNewExtensions.h"
|
2014-12-09 01:45:13 +03:00
|
|
|
#include "mozilla/TypeTraits.h"
|
|
|
|
|
|
|
|
namespace mozilla {
|
|
|
|
|
2014-12-12 01:11:43 +03:00
|
|
|
// |IdealSegmentSize| specifies how big each segment will be in bytes (or as
|
|
|
|
// close as is possible). Use the following guidelines to choose a size.
|
|
|
|
//
|
|
|
|
// - It should be a power-of-two, to avoid slop.
|
|
|
|
//
|
|
|
|
// - It should not be too small, so that segment allocations are infrequent,
|
|
|
|
// and so that per-segment bookkeeping overhead is low. Typically each
|
|
|
|
// segment should be able to hold hundreds of elements, at least.
|
|
|
|
//
|
|
|
|
// - It should not be too large, so that OOMs are unlikely when allocating
|
|
|
|
// segments, and so that not too much space is wasted when the final segment
|
|
|
|
// is not full.
|
|
|
|
//
|
|
|
|
// The ideal size depends on how the SegmentedVector is used and the size of
|
|
|
|
// |T|, but reasonable sizes include 1024, 4096 (the default), 8192, and 16384.
|
|
|
|
//
|
|
|
|
template <typename T, size_t IdealSegmentSize = 4096,
|
2014-12-09 01:45:13 +03:00
|
|
|
typename AllocPolicy = MallocAllocPolicy>
|
|
|
|
class SegmentedVector : private AllocPolicy {
|
|
|
|
template <size_t SegmentCapacity>
|
|
|
|
struct SegmentImpl
|
|
|
|
: public mozilla::LinkedListElement<SegmentImpl<SegmentCapacity>> {
|
2018-06-18 21:55:41 +03:00
|
|
|
private:
|
|
|
|
uint32_t mLength;
|
|
|
|
alignas(T) MOZ_INIT_OUTSIDE_CTOR
|
|
|
|
unsigned char mData[sizeof(T) * SegmentCapacity];
|
|
|
|
|
|
|
|
// Some versions of GCC treat it as a -Wstrict-aliasing violation (ergo a
|
|
|
|
// -Werror compile error) to reinterpret_cast<> |mData| to |T*|, even
|
|
|
|
// through |void*|. Placing the latter cast in these separate functions
|
|
|
|
// breaks the chain such that affected GCC versions no longer warn/error.
|
|
|
|
void* RawData() { return mData; }
|
|
|
|
|
|
|
|
public:
|
2018-04-13 16:01:28 +03:00
|
|
|
SegmentImpl() : mLength(0) {}
|
2014-12-09 01:45:13 +03:00
|
|
|
|
|
|
|
~SegmentImpl() {
|
|
|
|
for (uint32_t i = 0; i < mLength; i++) {
|
|
|
|
(*this)[i].~T();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
uint32_t Length() const { return mLength; }
|
|
|
|
|
2018-06-18 21:55:41 +03:00
|
|
|
T* Elems() { return reinterpret_cast<T*>(RawData()); }
|
2014-12-09 01:45:13 +03:00
|
|
|
|
|
|
|
T& operator[](size_t aIndex) {
|
|
|
|
MOZ_ASSERT(aIndex < mLength);
|
|
|
|
return Elems()[aIndex];
|
|
|
|
}
|
|
|
|
|
|
|
|
const T& operator[](size_t aIndex) const {
|
|
|
|
MOZ_ASSERT(aIndex < mLength);
|
|
|
|
return Elems()[aIndex];
|
|
|
|
}
|
|
|
|
|
|
|
|
template <typename U>
|
|
|
|
void Append(U&& aU) {
|
|
|
|
MOZ_ASSERT(mLength < SegmentCapacity);
|
|
|
|
// Pre-increment mLength so that the bounds-check in operator[] passes.
|
|
|
|
mLength++;
|
|
|
|
T* elem = &(*this)[mLength - 1];
|
2018-11-27 02:51:35 +03:00
|
|
|
new (KnownNotNull, elem) T(std::forward<U>(aU));
|
2014-12-09 01:45:13 +03:00
|
|
|
}
|
|
|
|
|
2015-05-07 10:11:00 +03:00
|
|
|
void PopLast() {
|
|
|
|
MOZ_ASSERT(mLength > 0);
|
|
|
|
(*this)[mLength - 1].~T();
|
|
|
|
mLength--;
|
|
|
|
}
|
2014-12-09 01:45:13 +03:00
|
|
|
};
|
|
|
|
|
|
|
|
// See how many we elements we can fit in a segment of IdealSegmentSize. If
|
|
|
|
// IdealSegmentSize is too small, it'll be just one. The +1 is because
|
|
|
|
// kSingleElementSegmentSize already accounts for one element.
|
|
|
|
static const size_t kSingleElementSegmentSize = sizeof(SegmentImpl<1>);
|
|
|
|
static const size_t kSegmentCapacity =
|
|
|
|
kSingleElementSegmentSize <= IdealSegmentSize
|
|
|
|
? (IdealSegmentSize - kSingleElementSegmentSize) / sizeof(T) + 1
|
|
|
|
: 1;
|
|
|
|
|
2017-05-05 00:49:22 +03:00
|
|
|
public:
|
2014-12-09 01:45:13 +03:00
|
|
|
typedef SegmentImpl<kSegmentCapacity> Segment;
|
|
|
|
|
|
|
|
// The |aIdealSegmentSize| is only for sanity checking. If it's specified, we
|
|
|
|
// check that the actual segment size is as close as possible to it. This
|
|
|
|
// serves as a sanity check for SegmentedVectorCapacity's capacity
|
|
|
|
// computation.
|
2014-12-11 01:47:42 +03:00
|
|
|
explicit SegmentedVector(size_t aIdealSegmentSize = 0) {
|
2014-12-09 01:45:13 +03:00
|
|
|
// The difference between the actual segment size and the ideal segment
|
|
|
|
// size should be less than the size of a single element... unless the
|
|
|
|
// ideal size was too small, in which case the capacity should be one.
|
|
|
|
MOZ_ASSERT_IF(
|
|
|
|
aIdealSegmentSize != 0,
|
|
|
|
(sizeof(Segment) > aIdealSegmentSize && kSegmentCapacity == 1) ||
|
|
|
|
aIdealSegmentSize - sizeof(Segment) < sizeof(T));
|
|
|
|
}
|
|
|
|
|
2018-03-01 22:26:54 +03:00
|
|
|
SegmentedVector(SegmentedVector&& aOther)
|
2018-05-30 22:15:35 +03:00
|
|
|
: mSegments(std::move(aOther.mSegments)) {}
|
2018-03-01 22:26:54 +03:00
|
|
|
|
2014-12-09 01:45:13 +03:00
|
|
|
~SegmentedVector() { Clear(); }
|
|
|
|
|
|
|
|
bool IsEmpty() const { return !mSegments.getFirst(); }
|
|
|
|
|
|
|
|
// Note that this is O(n) rather than O(1), but the constant factor is very
|
|
|
|
// small because it only has to do one addition per segment.
|
|
|
|
size_t Length() const {
|
|
|
|
size_t n = 0;
|
|
|
|
for (auto segment = mSegments.getFirst(); segment;
|
|
|
|
segment = segment->getNext()) {
|
|
|
|
n += segment->Length();
|
|
|
|
}
|
|
|
|
return n;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Returns false if the allocation failed. (If you are using an infallible
|
|
|
|
// allocation policy, use InfallibleAppend() instead.)
|
|
|
|
template <typename U>
|
2016-04-27 07:16:50 +03:00
|
|
|
MOZ_MUST_USE bool Append(U&& aU) {
|
2014-12-09 01:45:13 +03:00
|
|
|
Segment* last = mSegments.getLast();
|
|
|
|
if (!last || last->Length() == kSegmentCapacity) {
|
|
|
|
last = this->template pod_malloc<Segment>(1);
|
|
|
|
if (!last) {
|
|
|
|
return false;
|
|
|
|
}
|
2018-11-27 02:51:35 +03:00
|
|
|
new (KnownNotNull, last) Segment();
|
2014-12-09 01:45:13 +03:00
|
|
|
mSegments.insertBack(last);
|
|
|
|
}
|
2018-06-01 19:30:30 +03:00
|
|
|
last->Append(std::forward<U>(aU));
|
2014-12-09 01:45:13 +03:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
// You should probably only use this instead of Append() if you are using an
|
|
|
|
// infallible allocation policy. It will crash if the allocation fails.
|
|
|
|
template <typename U>
|
|
|
|
void InfallibleAppend(U&& aU) {
|
2018-06-01 19:30:30 +03:00
|
|
|
bool ok = Append(std::forward<U>(aU));
|
2014-12-09 01:45:13 +03:00
|
|
|
MOZ_RELEASE_ASSERT(ok);
|
|
|
|
}
|
|
|
|
|
|
|
|
void Clear() {
|
|
|
|
Segment* segment;
|
|
|
|
while ((segment = mSegments.popFirst())) {
|
|
|
|
segment->~Segment();
|
2018-07-21 02:58:34 +03:00
|
|
|
this->free_(segment, 1);
|
2014-12-09 01:45:13 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-05-07 10:11:00 +03:00
|
|
|
T& GetLast() {
|
|
|
|
MOZ_ASSERT(!IsEmpty());
|
|
|
|
Segment* last = mSegments.getLast();
|
|
|
|
return (*last)[last->Length() - 1];
|
|
|
|
}
|
|
|
|
|
|
|
|
const T& GetLast() const {
|
|
|
|
MOZ_ASSERT(!IsEmpty());
|
|
|
|
Segment* last = mSegments.getLast();
|
|
|
|
return (*last)[last->Length() - 1];
|
|
|
|
}
|
|
|
|
|
|
|
|
void PopLast() {
|
|
|
|
MOZ_ASSERT(!IsEmpty());
|
|
|
|
Segment* last = mSegments.getLast();
|
|
|
|
last->PopLast();
|
|
|
|
if (!last->Length()) {
|
|
|
|
mSegments.popLast();
|
|
|
|
last->~Segment();
|
2018-07-21 02:58:34 +03:00
|
|
|
this->free_(last, 1);
|
2015-05-07 10:11:00 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-03-04 20:02:24 +03:00
|
|
|
// Equivalent to calling |PopLast| |aNumElements| times, but potentially
|
|
|
|
// more efficient.
|
|
|
|
void PopLastN(uint32_t aNumElements) {
|
|
|
|
MOZ_ASSERT(aNumElements <= Length());
|
|
|
|
|
|
|
|
Segment* last;
|
|
|
|
|
|
|
|
// Pop full segments for as long as we can. Note that this loop
|
|
|
|
// cleanly handles the case when the initial last segment is not
|
|
|
|
// full and we are popping more elements than said segment contains.
|
|
|
|
do {
|
|
|
|
last = mSegments.getLast();
|
|
|
|
|
|
|
|
// The list is empty. We're all done.
|
|
|
|
if (!last) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check to see if the list contains too many elements. Handle
|
|
|
|
// that in the epilogue.
|
|
|
|
uint32_t segmentLen = last->Length();
|
|
|
|
if (segmentLen > aNumElements) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Destroying the segment destroys all elements contained therein.
|
|
|
|
mSegments.popLast();
|
|
|
|
last->~Segment();
|
2018-07-21 02:58:34 +03:00
|
|
|
this->free_(last, 1);
|
2016-03-04 20:02:24 +03:00
|
|
|
|
|
|
|
MOZ_ASSERT(aNumElements >= segmentLen);
|
|
|
|
aNumElements -= segmentLen;
|
|
|
|
if (aNumElements == 0) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
} while (true);
|
|
|
|
|
|
|
|
// Handle the case where the last segment contains more elements
|
|
|
|
// than we want to pop.
|
|
|
|
MOZ_ASSERT(last);
|
|
|
|
MOZ_ASSERT(last == mSegments.getLast());
|
|
|
|
MOZ_ASSERT(aNumElements < last->Length());
|
|
|
|
for (uint32_t i = 0; i < aNumElements; ++i) {
|
|
|
|
last->PopLast();
|
|
|
|
}
|
|
|
|
MOZ_ASSERT(last->Length() != 0);
|
|
|
|
}
|
|
|
|
|
2014-12-09 01:45:13 +03:00
|
|
|
// Use this class to iterate over a SegmentedVector, like so:
|
|
|
|
//
|
|
|
|
// for (auto iter = v.Iter(); !iter.Done(); iter.Next()) {
|
|
|
|
// MyElem& elem = iter.Get();
|
|
|
|
// f(elem);
|
|
|
|
// }
|
|
|
|
//
|
2017-05-05 00:49:22 +03:00
|
|
|
// Note, adding new entries to the SegmentedVector while using iterators
|
|
|
|
// is supported, but removing is not!
|
|
|
|
// If an iterator has entered Done() state, adding more entries to the
|
|
|
|
// vector doesn't affect it.
|
2014-12-09 01:45:13 +03:00
|
|
|
class IterImpl {
|
|
|
|
friend class SegmentedVector;
|
|
|
|
|
|
|
|
Segment* mSegment;
|
|
|
|
size_t mIndex;
|
|
|
|
|
2017-05-05 00:49:22 +03:00
|
|
|
explicit IterImpl(SegmentedVector* aVector, bool aFromFirst)
|
|
|
|
: mSegment(aFromFirst ? aVector->mSegments.getFirst()
|
|
|
|
: aVector->mSegments.getLast()),
|
|
|
|
mIndex(aFromFirst ? 0 : (mSegment ? mSegment->Length() - 1 : 0)) {
|
|
|
|
MOZ_ASSERT_IF(mSegment, mSegment->Length() > 0);
|
|
|
|
}
|
2014-12-09 01:45:13 +03:00
|
|
|
|
|
|
|
public:
|
|
|
|
bool Done() const { return !mSegment; }
|
|
|
|
|
|
|
|
T& Get() {
|
|
|
|
MOZ_ASSERT(!Done());
|
|
|
|
return (*mSegment)[mIndex];
|
|
|
|
}
|
|
|
|
|
|
|
|
const T& Get() const {
|
|
|
|
MOZ_ASSERT(!Done());
|
|
|
|
return (*mSegment)[mIndex];
|
|
|
|
}
|
|
|
|
|
|
|
|
void Next() {
|
|
|
|
MOZ_ASSERT(!Done());
|
|
|
|
mIndex++;
|
|
|
|
if (mIndex == mSegment->Length()) {
|
|
|
|
mSegment = mSegment->getNext();
|
|
|
|
mIndex = 0;
|
|
|
|
}
|
|
|
|
}
|
2017-05-05 00:49:22 +03:00
|
|
|
|
|
|
|
void Prev() {
|
|
|
|
MOZ_ASSERT(!Done());
|
|
|
|
if (mIndex == 0) {
|
|
|
|
mSegment = mSegment->getPrevious();
|
|
|
|
if (mSegment) {
|
|
|
|
mIndex = mSegment->Length() - 1;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
--mIndex;
|
|
|
|
}
|
|
|
|
}
|
2014-12-09 01:45:13 +03:00
|
|
|
};
|
|
|
|
|
2017-05-05 00:49:22 +03:00
|
|
|
IterImpl Iter() { return IterImpl(this, true); }
|
|
|
|
IterImpl IterFromLast() { return IterImpl(this, false); }
|
2014-12-09 01:45:13 +03:00
|
|
|
|
|
|
|
// Measure the memory consumption of the vector excluding |this|. Note that
|
|
|
|
// it only measures the vector itself. If the vector elements contain
|
|
|
|
// pointers to other memory blocks, those blocks must be measured separately
|
|
|
|
// during a subsequent iteration over the vector.
|
|
|
|
size_t SizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf) const {
|
|
|
|
return mSegments.sizeOfExcludingThis(aMallocSizeOf);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Like sizeOfExcludingThis(), but measures |this| as well.
|
|
|
|
size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const {
|
|
|
|
return aMallocSizeOf(this) + SizeOfExcludingThis(aMallocSizeOf);
|
|
|
|
}
|
|
|
|
|
|
|
|
private:
|
|
|
|
mozilla::LinkedList<Segment> mSegments;
|
|
|
|
};
|
|
|
|
|
|
|
|
} // namespace mozilla
|
|
|
|
|
|
|
|
#endif /* mozilla_SegmentedVector_h */
|