mirror of
https://github.com/Xahau/xahaud.git
synced 2025-12-06 17:27:52 +00:00
0e7bac9Fix include pathe5bb90fFix constness of Proxyac0142aUse template castef6e381Add missing Url.h include206e65cFix constness of operator[]695cc38Use template instantiation for friend declaration7b1e03aAdd BaseFromMember49bc04fMake List<>::Node not uncopyabled5954ffAdd Journal to UnitTest58da106Temporarily disable ServiceQueue dtor precondition assertsfe58c1aAdd missing #include2c02580Add PropertyStream for server state introspection24c2315Add ScopedWrapperContexta3845f5Add RelativeTime::value_type typedef7442932Fix missing PropertyStream membersed5a98fMore PropertyStream output for PeerFinderfcfa10dAdd PropertyStream3cf0729Tidy up AbstractHandler usage in HTTPClient55171f4Remove obsolete source files1311ca3Increase arity of SharedFunction67d807dAdd IPEndpoint::key_equalebf395eAdd ErrorCode and boost library2c3ead3Add ServiceQueue::wrap6c7f5d0Move many Thread related classes93e9d86Measure CPU utilization in ServiceQueueca47d72Move ServiceQueue, ThreadLocalValue, SpinLockc864e4dMove WaitableEventff305e6Add CPUMeter and ScopedTimeInterval01fd05cAdd RecursiveMutex, UnlockGuard, TryLockGuard5831a53Remove Journal from most Stoppable overridesb60a7f3Add Request and Response HTTP parsers44445ffRefactor net buffers classesac37c38Beast class refactor8b7056bFix eof on HTTP client get228b664Remove obsolete beast container classes1dfd655Use RelativeTime from startup in DeadlineTimerae22d5dAdd more methods to RelativeTimec67929eRemove unhandled exception catcher2472a90Add 64 bit output for MurmurHashf3d97c7Add RelativeTime::fromStartupb0b8660IPEndpoint better parsingae551cdAdd alternate form string parsing to IPEndpointd0a0dbfDon't break on Throw0e46762Add hasher functors for IPEndpointa1ec423Add Thread::stopThreadAsync4f7dca3Add compiler, stdlib, and platform skeleton to beast/config4394594Tidy up some use of Error for throwe5e0f52Journal console output improvementsf07515eAdd Stoppable prepare and start interfacesd37dd46Move RelativeTime to chrono, add ostream support3f6e7aaAdd console feature to Journalad0064aJournal option to write to Output window (MSVC)0b7574bAdd compilation test scriptcc05ce1Add ServiceQueuee132aabUse boost for functional when the config is set026b926Fix is_continuation for boost versionc807a4eFix invoked_type type reference2ff781bRemove LockFreeStack::size3acb474Add SharedData::ConstAccess7e4c834Add LockFreeStack::empty9c61a6dAdded AbstractHandler, WrapHandler. HTTPClient Fixes.94e40dcFix unittest, by removing recursive call.38bf408Fix nonstandard C++ extension in getNullSink1ef044dBuild fixesd5d3746Fix missing <cmath> include for Gentoo5f231d3Update copyright notice and licenses7b89bf6Add FixedArray, IntrusiveArray, Crypto5c5de57Reorganize beast modules and files9e18bb3Merge commit '43deaaa5cf0d0178a4a6c3cb69c02a2a9a43ec7d' as 'src/beast/beast/http/impl/http-parser'57703acFix BeforeBoost.h includefbc247bAdd Stoppable to beast56496d8IPEndpoint comparisons9d9c822Migrate some headers and general tidying1a3cddcAdd SharedArg and AsyncObject373ca9cAdd HTTPRequest and improvements to HTTPMessage parsing9534516Add some thread classes and fix SharedData with a simple mutex adapter755ab36Make CallQueue unit test runManualc0ca037Remove Beast version printing on startup7efb6a3Reorganize some MPL and Utility classes and files69c26a1Fix missing BeastConfig.h include in Net.cpp40aa552Disable Beast version printing in Ripple BeastConfig.h7b1352dAdd InterruptibleThread unit test68cf759ThreadWithCallQueue unit test adjustment6501deaIPEndpoint parsing and tidying72fc42bMove and add some template metaprogramming classes2a164f0Change filname capitalization (end)6a14f25Change filename capitalization92fd417Move integer types to beast/CStdInt.hebbd9ffMove TargetPlatform.h to beast/Config.h874b524Add IPEndpoint14b34fcTidy up some zlib macro undefines34fffcaRename beast sources for consistency4e59ab2Add CallQueue unit test327d7a6Fixes for consolidated beast unity includesd5ece4eRemove unused and broken classes39f13beRemove unused ConcurrentObject37624a7Add ThreadWithCallQueue unit teste82ec68Remove obsolete beast_Function90551a6Temporarily leave sqlite3 in whatever threading mode it was already in.43ebbb1Fix SharedSingleton to use memoryBarrierf343941Tidy up SharedSingleton doc comments001997eFix leak on exit from Singleton dependency cycle83b9d22Rename to DeadlineTimer::cancel()77874eeUse new instead of ::new for placement2a04dccJournal improvements50965caSharedFunction improvements277e32bAdd LockFreeStack iteratorsd94e4c2Fix undefined behavior in UnsignedIntegerCalc (again)2dc25ceFix DeadlineTimer, callback while holding lock207ffdeFix undefined behavior in UnsignedIntegerCalc1ad8ff9Fix UnsignedInteger::isZero1dd2836Add support for multiprecision integer arithmetic and binary data encodinga45fc47Update .gitignore962a95dTidy up UnsignedIntegerca695faAdd Time::isNull()e96ce99Better random number facilities in UnitTest550b8e5Fine tune UnsignedInteger declaration8e7e3b7Allow negative relative expirations in DeadlineTimerf3dc7ceAdd generic Journal class for loggingbfdda32Make ChildProcess UnitTest manual since it malfunctions02acf7dGeneral refactoring of beast framework classes84ef06eFix ExitHook to derive from AtExitHookf0acc9cReduce the max threads in the Workers unit test55447b0New SharedSingleton, resolves destruction of objects with static storage duration.41eb8a1Remove deprecated SharedPtr::getObject9eda4bcMake SharedObject members const, the counter mutable6eda777Remove deprecated createOnDemandOnce SingletonLifetime option8c522aaFix off by one in pending i/o count on HTTPClient057344eAdd HTTPMessage::toString and familyee728e3Add UniformResourceLocator::emptyae324fbMove ./modules to ./src git-subtree-dir: src/beast git-subtree-split:0e7bac945f
890 lines
32 KiB
C++
890 lines
32 KiB
C++
//------------------------------------------------------------------------------
|
|
/*
|
|
This file is part of Beast: https://github.com/vinniefalco/Beast
|
|
Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
|
|
|
|
Portions of this file are from JUCE.
|
|
Copyright (c) 2013 - Raw Material Software Ltd.
|
|
Please visit http://www.juce.com
|
|
|
|
Permission to use, copy, modify, and/or distribute this software for any
|
|
purpose with or without fee is hereby granted, provided that the above
|
|
copyright notice and this permission notice appear in all copies.
|
|
|
|
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
|
ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
|
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
|
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
*/
|
|
//==============================================================================
|
|
|
|
#ifndef BEAST_OWNEDARRAY_H_INCLUDED
|
|
#define BEAST_OWNEDARRAY_H_INCLUDED
|
|
|
|
//==============================================================================
|
|
/** An array designed for holding objects.
|
|
|
|
This holds a list of pointers to objects, and will automatically
|
|
delete the objects when they are removed from the array, or when the
|
|
array is itself deleted.
|
|
|
|
Declare it in the form: OwnedArray<MyObjectClass>
|
|
|
|
..and then add new objects, e.g. myOwnedArray.add (new MyObjectClass());
|
|
|
|
After adding objects, they are 'owned' by the array and will be deleted when
|
|
removed or replaced.
|
|
|
|
To make all the array's methods thread-safe, pass in "CriticalSection" as the templated
|
|
TypeOfCriticalSectionToUse parameter, instead of the default DummyCriticalSection.
|
|
|
|
@see Array, SharedObjectArray, StringArray, CriticalSection
|
|
*/
|
|
template <class ObjectClass,
|
|
class TypeOfCriticalSectionToUse = DummyCriticalSection>
|
|
|
|
class OwnedArray
|
|
: LeakChecked <OwnedArray <ObjectClass, TypeOfCriticalSectionToUse> >
|
|
, public Uncopyable
|
|
{
|
|
public:
|
|
//==============================================================================
|
|
/** Creates an empty array. */
|
|
OwnedArray() noexcept
|
|
: numUsed (0)
|
|
{
|
|
}
|
|
|
|
/** Deletes the array and also deletes any objects inside it.
|
|
|
|
To get rid of the array without deleting its objects, use its
|
|
clear (false) method before deleting it.
|
|
*/
|
|
~OwnedArray()
|
|
{
|
|
deleteAllObjects();
|
|
}
|
|
|
|
#if BEAST_COMPILER_SUPPORTS_MOVE_SEMANTICS
|
|
OwnedArray (OwnedArray&& other) noexcept
|
|
: data (static_cast <ArrayAllocationBase <ObjectClass*, TypeOfCriticalSectionToUse>&&> (other.data)),
|
|
numUsed (other.numUsed)
|
|
{
|
|
other.numUsed = 0;
|
|
}
|
|
|
|
OwnedArray& operator= (OwnedArray&& other) noexcept
|
|
{
|
|
const ScopedLockType lock (getLock());
|
|
deleteAllObjects();
|
|
|
|
data = static_cast <ArrayAllocationBase <ObjectClass*, TypeOfCriticalSectionToUse>&&> (other.data);
|
|
numUsed = other.numUsed;
|
|
other.numUsed = 0;
|
|
return *this;
|
|
}
|
|
#endif
|
|
|
|
//==============================================================================
|
|
/** Clears the array, optionally deleting the objects inside it first. */
|
|
void clear (bool deleteObjects = true)
|
|
{
|
|
const ScopedLockType lock (getLock());
|
|
|
|
if (deleteObjects)
|
|
deleteAllObjects();
|
|
|
|
data.setAllocatedSize (0);
|
|
numUsed = 0;
|
|
}
|
|
|
|
/** Clears the array, optionally deleting the objects inside it first.
|
|
|
|
The array's allocated storage is preserved.
|
|
|
|
@see clear
|
|
*/
|
|
void clearQuick(bool deleteObjects = true)
|
|
{
|
|
const ScopedLockType lock (getLock());
|
|
|
|
if (deleteObjects)
|
|
deleteAllObjects();
|
|
|
|
numUsed = 0;
|
|
}
|
|
|
|
//==============================================================================
|
|
/** Returns the number of items currently in the array.
|
|
@see operator[]
|
|
*/
|
|
inline int size() const noexcept
|
|
{
|
|
return numUsed;
|
|
}
|
|
|
|
/** Returns a pointer to the object at this index in the array.
|
|
|
|
If the index is out-of-range, this will return a null pointer, (and
|
|
it could be null anyway, because it's ok for the array to hold null
|
|
pointers as well as objects).
|
|
|
|
@see getUnchecked
|
|
*/
|
|
inline ObjectClass* operator[] (const int index) const noexcept
|
|
{
|
|
const ScopedLockType lock (getLock());
|
|
if (isPositiveAndBelow (index, numUsed))
|
|
{
|
|
bassert (data.elements != nullptr);
|
|
return data.elements [index];
|
|
}
|
|
|
|
return nullptr;
|
|
}
|
|
|
|
/** Returns a pointer to the object at this index in the array, without checking whether the index is in-range.
|
|
|
|
This is a faster and less safe version of operator[] which doesn't check the index passed in, so
|
|
it can be used when you're sure the index is always going to be legal.
|
|
*/
|
|
inline ObjectClass* getUnchecked (const int index) const noexcept
|
|
{
|
|
const ScopedLockType lock (getLock());
|
|
bassert (isPositiveAndBelow (index, numUsed) && data.elements != nullptr);
|
|
return data.elements [index];
|
|
}
|
|
|
|
/** Returns a pointer to the first object in the array.
|
|
|
|
This will return a null pointer if the array's empty.
|
|
@see getLast
|
|
*/
|
|
inline ObjectClass* getFirst() const noexcept
|
|
{
|
|
const ScopedLockType lock (getLock());
|
|
return numUsed > 0 ? data.elements [0]
|
|
: static_cast <ObjectClass*> (nullptr);
|
|
}
|
|
|
|
/** Returns a pointer to the last object in the array.
|
|
|
|
This will return a null pointer if the array's empty.
|
|
@see getFirst
|
|
*/
|
|
inline ObjectClass* getLast() const noexcept
|
|
{
|
|
const ScopedLockType lock (getLock());
|
|
return numUsed > 0 ? data.elements [numUsed - 1]
|
|
: static_cast <ObjectClass*> (nullptr);
|
|
}
|
|
|
|
/** Returns a pointer to the actual array data.
|
|
This pointer will only be valid until the next time a non-const method
|
|
is called on the array.
|
|
*/
|
|
inline ObjectClass** getRawDataPointer() noexcept
|
|
{
|
|
return data.elements;
|
|
}
|
|
|
|
//==============================================================================
|
|
/** Returns a pointer to the first element in the array.
|
|
This method is provided for compatibility with standard C++ iteration mechanisms.
|
|
*/
|
|
inline ObjectClass** begin() const noexcept
|
|
{
|
|
return data.elements;
|
|
}
|
|
|
|
/** Returns a pointer to the element which follows the last element in the array.
|
|
This method is provided for compatibility with standard C++ iteration mechanisms.
|
|
*/
|
|
inline ObjectClass** end() const noexcept
|
|
{
|
|
return data.elements + numUsed;
|
|
}
|
|
|
|
//==============================================================================
|
|
/** Finds the index of an object which might be in the array.
|
|
|
|
@param objectToLookFor the object to look for
|
|
@returns the index at which the object was found, or -1 if it's not found
|
|
*/
|
|
int indexOf (const ObjectClass* const objectToLookFor) const noexcept
|
|
{
|
|
const ScopedLockType lock (getLock());
|
|
ObjectClass* const* e = data.elements.getData();
|
|
ObjectClass* const* const end_ = e + numUsed;
|
|
|
|
for (; e != end_; ++e)
|
|
if (objectToLookFor == *e)
|
|
return static_cast <int> (e - data.elements.getData());
|
|
|
|
return -1;
|
|
}
|
|
|
|
/** Returns true if the array contains a specified object.
|
|
|
|
@param objectToLookFor the object to look for
|
|
@returns true if the object is in the array
|
|
*/
|
|
bool contains (const ObjectClass* const objectToLookFor) const noexcept
|
|
{
|
|
const ScopedLockType lock (getLock());
|
|
ObjectClass* const* e = data.elements.getData();
|
|
ObjectClass* const* const end_ = e + numUsed;
|
|
|
|
for (; e != end_; ++e)
|
|
if (objectToLookFor == *e)
|
|
return true;
|
|
|
|
return false;
|
|
}
|
|
|
|
//==============================================================================
|
|
/** Appends a new object to the end of the array.
|
|
|
|
Note that the this object will be deleted by the OwnedArray when it
|
|
is removed, so be careful not to delete it somewhere else.
|
|
|
|
Also be careful not to add the same object to the array more than once,
|
|
as this will obviously cause deletion of dangling pointers.
|
|
|
|
@param newObject the new object to add to the array
|
|
@see set, insert, addIfNotAlreadyThere, addSorted
|
|
*/
|
|
ObjectClass* add (ObjectClass* const newObject) noexcept
|
|
{
|
|
const ScopedLockType lock (getLock());
|
|
data.ensureAllocatedSize (numUsed + 1);
|
|
bassert (data.elements != nullptr);
|
|
data.elements [numUsed++] = const_cast <ObjectClass*> (newObject);
|
|
return const_cast <ObjectClass*> (newObject);
|
|
}
|
|
|
|
/** Inserts a new object into the array at the given index.
|
|
|
|
Note that the this object will be deleted by the OwnedArray when it
|
|
is removed, so be careful not to delete it somewhere else.
|
|
|
|
If the index is less than 0 or greater than the size of the array, the
|
|
element will be added to the end of the array.
|
|
Otherwise, it will be inserted into the array, moving all the later elements
|
|
along to make room.
|
|
|
|
Be careful not to add the same object to the array more than once,
|
|
as this will obviously cause deletion of dangling pointers.
|
|
|
|
@param indexToInsertAt the index at which the new element should be inserted
|
|
@param newObject the new object to add to the array
|
|
@see add, addSorted, addIfNotAlreadyThere, set
|
|
*/
|
|
void insert (int indexToInsertAt,
|
|
ObjectClass* const newObject) noexcept
|
|
{
|
|
if (indexToInsertAt >= 0)
|
|
{
|
|
const ScopedLockType lock (getLock());
|
|
|
|
if (indexToInsertAt > numUsed)
|
|
indexToInsertAt = numUsed;
|
|
|
|
data.ensureAllocatedSize (numUsed + 1);
|
|
bassert (data.elements != nullptr);
|
|
|
|
ObjectClass** const e = data.elements + indexToInsertAt;
|
|
const int numToMove = numUsed - indexToInsertAt;
|
|
|
|
if (numToMove > 0)
|
|
memmove (e + 1, e, sizeof (ObjectClass*) * (size_t) numToMove);
|
|
|
|
*e = const_cast <ObjectClass*> (newObject);
|
|
++numUsed;
|
|
}
|
|
else
|
|
{
|
|
add (newObject);
|
|
}
|
|
}
|
|
|
|
/** Inserts an array of values into this array at a given position.
|
|
|
|
If the index is less than 0 or greater than the size of the array, the
|
|
new elements will be added to the end of the array.
|
|
Otherwise, they will be inserted into the array, moving all the later elements
|
|
along to make room.
|
|
|
|
@param indexToInsertAt the index at which the first new element should be inserted
|
|
@param newObjects the new values to add to the array
|
|
@param numberOfElements how many items are in the array
|
|
@see insert, add, addSorted, set
|
|
*/
|
|
void insertArray (int indexToInsertAt,
|
|
ObjectClass* const* newObjects,
|
|
int numberOfElements)
|
|
{
|
|
if (numberOfElements > 0)
|
|
{
|
|
const ScopedLockType lock (getLock());
|
|
data.ensureAllocatedSize (numUsed + numberOfElements);
|
|
ObjectClass** insertPos = data.elements;
|
|
|
|
if (isPositiveAndBelow (indexToInsertAt, numUsed))
|
|
{
|
|
insertPos += indexToInsertAt;
|
|
const size_t numberToMove = (size_t) (numUsed - indexToInsertAt);
|
|
memmove (insertPos + numberOfElements, insertPos, numberToMove * sizeof (ObjectClass*));
|
|
}
|
|
else
|
|
{
|
|
insertPos += numUsed;
|
|
}
|
|
|
|
numUsed += numberOfElements;
|
|
|
|
while (--numberOfElements >= 0)
|
|
*insertPos++ = *newObjects++;
|
|
}
|
|
}
|
|
|
|
/** Appends a new object at the end of the array as long as the array doesn't
|
|
already contain it.
|
|
|
|
If the array already contains a matching object, nothing will be done.
|
|
|
|
@param newObject the new object to add to the array
|
|
*/
|
|
void addIfNotAlreadyThere (ObjectClass* const newObject) noexcept
|
|
{
|
|
const ScopedLockType lock (getLock());
|
|
|
|
if (! contains (newObject))
|
|
add (newObject);
|
|
}
|
|
|
|
/** Replaces an object in the array with a different one.
|
|
|
|
If the index is less than zero, this method does nothing.
|
|
If the index is beyond the end of the array, the new object is added to the end of the array.
|
|
|
|
Be careful not to add the same object to the array more than once,
|
|
as this will obviously cause deletion of dangling pointers.
|
|
|
|
@param indexToChange the index whose value you want to change
|
|
@param newObject the new value to set for this index.
|
|
@param deleteOldElement whether to delete the object that's being replaced with the new one
|
|
@see add, insert, remove
|
|
*/
|
|
void set (const int indexToChange,
|
|
const ObjectClass* const newObject,
|
|
const bool deleteOldElement = true)
|
|
{
|
|
if (indexToChange >= 0)
|
|
{
|
|
ObjectClass* toDelete = nullptr;
|
|
|
|
{
|
|
const ScopedLockType lock (getLock());
|
|
|
|
if (indexToChange < numUsed)
|
|
{
|
|
if (deleteOldElement)
|
|
{
|
|
toDelete = data.elements [indexToChange];
|
|
|
|
if (toDelete == newObject)
|
|
toDelete = nullptr;
|
|
}
|
|
|
|
data.elements [indexToChange] = const_cast <ObjectClass*> (newObject);
|
|
}
|
|
else
|
|
{
|
|
data.ensureAllocatedSize (numUsed + 1);
|
|
data.elements [numUsed++] = const_cast <ObjectClass*> (newObject);
|
|
}
|
|
}
|
|
|
|
// don't want to use a ScopedPointer here because if the
|
|
// object has a private destructor, both OwnedArray and
|
|
// ScopedPointer would need to be friend classes..
|
|
ContainerDeletePolicy <ObjectClass>::destroy (toDelete);
|
|
}
|
|
else
|
|
{
|
|
bassertfalse; // you're trying to set an object at a negative index, which doesn't have
|
|
// any effect - but since the object is not being added, it may be leaking..
|
|
}
|
|
}
|
|
|
|
/** Adds elements from another array to the end of this array.
|
|
|
|
@param arrayToAddFrom the array from which to copy the elements
|
|
@param startIndex the first element of the other array to start copying from
|
|
@param numElementsToAdd how many elements to add from the other array. If this
|
|
value is negative or greater than the number of available elements,
|
|
all available elements will be copied.
|
|
@see add
|
|
*/
|
|
template <class OtherArrayType>
|
|
void addArray (const OtherArrayType& arrayToAddFrom,
|
|
int startIndex = 0,
|
|
int numElementsToAdd = -1)
|
|
{
|
|
const typename OtherArrayType::ScopedLockType lock1 (arrayToAddFrom.getLock());
|
|
const ScopedLockType lock2 (getLock());
|
|
|
|
if (startIndex < 0)
|
|
{
|
|
bassertfalse;
|
|
startIndex = 0;
|
|
}
|
|
|
|
if (numElementsToAdd < 0 || startIndex + numElementsToAdd > arrayToAddFrom.size())
|
|
numElementsToAdd = arrayToAddFrom.size() - startIndex;
|
|
|
|
data.ensureAllocatedSize (numUsed + numElementsToAdd);
|
|
bassert (numElementsToAdd <= 0 || data.elements != nullptr);
|
|
|
|
while (--numElementsToAdd >= 0)
|
|
{
|
|
data.elements [numUsed] = arrayToAddFrom.getUnchecked (startIndex++);
|
|
++numUsed;
|
|
}
|
|
}
|
|
|
|
/** Adds copies of the elements in another array to the end of this array.
|
|
|
|
The other array must be either an OwnedArray of a compatible type of object, or an Array
|
|
containing pointers to the same kind of object. The objects involved must provide
|
|
a copy constructor, and this will be used to create new copies of each element, and
|
|
add them to this array.
|
|
|
|
@param arrayToAddFrom the array from which to copy the elements
|
|
@param startIndex the first element of the other array to start copying from
|
|
@param numElementsToAdd how many elements to add from the other array. If this
|
|
value is negative or greater than the number of available elements,
|
|
all available elements will be copied.
|
|
@see add
|
|
*/
|
|
template <class OtherArrayType>
|
|
void addCopiesOf (const OtherArrayType& arrayToAddFrom,
|
|
int startIndex = 0,
|
|
int numElementsToAdd = -1)
|
|
{
|
|
const typename OtherArrayType::ScopedLockType lock1 (arrayToAddFrom.getLock());
|
|
const ScopedLockType lock2 (getLock());
|
|
|
|
if (startIndex < 0)
|
|
{
|
|
bassertfalse;
|
|
startIndex = 0;
|
|
}
|
|
|
|
if (numElementsToAdd < 0 || startIndex + numElementsToAdd > arrayToAddFrom.size())
|
|
numElementsToAdd = arrayToAddFrom.size() - startIndex;
|
|
|
|
data.ensureAllocatedSize (numUsed + numElementsToAdd);
|
|
bassert (numElementsToAdd <= 0 || data.elements != nullptr);
|
|
|
|
while (--numElementsToAdd >= 0)
|
|
{
|
|
data.elements [numUsed] = new ObjectClass (*arrayToAddFrom.getUnchecked (startIndex++));
|
|
++numUsed;
|
|
}
|
|
}
|
|
|
|
/** Inserts a new object into the array assuming that the array is sorted.
|
|
|
|
This will use a comparator to find the position at which the new object
|
|
should go. If the array isn't sorted, the behaviour of this
|
|
method will be unpredictable.
|
|
|
|
@param comparator the comparator to use to compare the elements - see the sort method
|
|
for details about this object's structure
|
|
@param newObject the new object to insert to the array
|
|
@returns the index at which the new object was added
|
|
@see add, sort, indexOfSorted
|
|
*/
|
|
template <class ElementComparator>
|
|
int addSorted (ElementComparator& comparator, ObjectClass* const newObject) noexcept
|
|
{
|
|
(void) comparator; // if you pass in an object with a static compareElements() method, this
|
|
// avoids getting warning messages about the parameter being unused
|
|
const ScopedLockType lock (getLock());
|
|
const int index = findInsertIndexInSortedArray (comparator, data.elements.getData(), newObject, 0, numUsed);
|
|
insert (index, newObject);
|
|
return index;
|
|
}
|
|
|
|
/** Finds the index of an object in the array, assuming that the array is sorted.
|
|
|
|
This will use a comparator to do a binary-chop to find the index of the given
|
|
element, if it exists. If the array isn't sorted, the behaviour of this
|
|
method will be unpredictable.
|
|
|
|
@param comparator the comparator to use to compare the elements - see the sort()
|
|
method for details about the form this object should take
|
|
@param objectToLookFor the object to search for
|
|
@returns the index of the element, or -1 if it's not found
|
|
@see addSorted, sort
|
|
*/
|
|
template <typename ElementComparator>
|
|
int indexOfSorted (ElementComparator& comparator, const ObjectClass* const objectToLookFor) const noexcept
|
|
{
|
|
(void) comparator;
|
|
const ScopedLockType lock (getLock());
|
|
int s = 0, e = numUsed;
|
|
|
|
while (s < e)
|
|
{
|
|
if (comparator.compareElements (objectToLookFor, data.elements [s]) == 0)
|
|
return s;
|
|
|
|
const int halfway = (s + e) / 2;
|
|
if (halfway == s)
|
|
break;
|
|
|
|
if (comparator.compareElements (objectToLookFor, data.elements [halfway]) >= 0)
|
|
s = halfway;
|
|
else
|
|
e = halfway;
|
|
}
|
|
|
|
return -1;
|
|
}
|
|
|
|
//==============================================================================
|
|
/** Removes an object from the array.
|
|
|
|
This will remove the object at a given index (optionally also
|
|
deleting it) and move back all the subsequent objects to close the gap.
|
|
If the index passed in is out-of-range, nothing will happen.
|
|
|
|
@param indexToRemove the index of the element to remove
|
|
@param deleteObject whether to delete the object that is removed
|
|
@see removeObject, removeRange
|
|
*/
|
|
void remove (const int indexToRemove,
|
|
const bool deleteObject = true)
|
|
{
|
|
ObjectClass* toDelete = nullptr;
|
|
|
|
{
|
|
const ScopedLockType lock (getLock());
|
|
|
|
if (isPositiveAndBelow (indexToRemove, numUsed))
|
|
{
|
|
ObjectClass** const e = data.elements + indexToRemove;
|
|
|
|
if (deleteObject)
|
|
toDelete = *e;
|
|
|
|
--numUsed;
|
|
const int numToShift = numUsed - indexToRemove;
|
|
|
|
if (numToShift > 0)
|
|
memmove (e, e + 1, sizeof (ObjectClass*) * (size_t) numToShift);
|
|
}
|
|
}
|
|
|
|
// don't want to use a ScopedPointer here because if the
|
|
// object has a private destructor, both OwnedArray and
|
|
// ScopedPointer would need to be friend classes..
|
|
ContainerDeletePolicy <ObjectClass>::destroy (toDelete);
|
|
|
|
if ((numUsed << 1) < data.numAllocated)
|
|
minimiseStorageOverheads();
|
|
}
|
|
|
|
/** Removes and returns an object from the array without deleting it.
|
|
|
|
This will remove the object at a given index and return it, moving back all
|
|
the subsequent objects to close the gap. If the index passed in is out-of-range,
|
|
nothing will happen.
|
|
|
|
@param indexToRemove the index of the element to remove
|
|
@see remove, removeObject, removeRange
|
|
*/
|
|
ObjectClass* removeAndReturn (const int indexToRemove)
|
|
{
|
|
ObjectClass* removedItem = nullptr;
|
|
const ScopedLockType lock (getLock());
|
|
|
|
if (isPositiveAndBelow (indexToRemove, numUsed))
|
|
{
|
|
ObjectClass** const e = data.elements + indexToRemove;
|
|
removedItem = *e;
|
|
|
|
--numUsed;
|
|
const int numToShift = numUsed - indexToRemove;
|
|
|
|
if (numToShift > 0)
|
|
memmove (e, e + 1, sizeof (ObjectClass*) * (size_t) numToShift);
|
|
|
|
if ((numUsed << 1) < data.numAllocated)
|
|
minimiseStorageOverheads();
|
|
}
|
|
|
|
return removedItem;
|
|
}
|
|
|
|
/** Removes a specified object from the array.
|
|
|
|
If the item isn't found, no action is taken.
|
|
|
|
@param objectToRemove the object to try to remove
|
|
@param deleteObject whether to delete the object (if it's found)
|
|
@see remove, removeRange
|
|
*/
|
|
void removeObject (const ObjectClass* const objectToRemove,
|
|
const bool deleteObject = true)
|
|
{
|
|
const ScopedLockType lock (getLock());
|
|
ObjectClass** const e = data.elements.getData();
|
|
|
|
for (int i = 0; i < numUsed; ++i)
|
|
{
|
|
if (objectToRemove == e[i])
|
|
{
|
|
remove (i, deleteObject);
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
/** Removes a range of objects from the array.
|
|
|
|
This will remove a set of objects, starting from the given index,
|
|
and move any subsequent elements down to close the gap.
|
|
|
|
If the range extends beyond the bounds of the array, it will
|
|
be safely clipped to the size of the array.
|
|
|
|
@param startIndex the index of the first object to remove
|
|
@param numberToRemove how many objects should be removed
|
|
@param deleteObjects whether to delete the objects that get removed
|
|
@see remove, removeObject
|
|
*/
|
|
void removeRange (int startIndex,
|
|
const int numberToRemove,
|
|
const bool deleteObjects = true)
|
|
{
|
|
const ScopedLockType lock (getLock());
|
|
const int endIndex = blimit (0, numUsed, startIndex + numberToRemove);
|
|
startIndex = blimit (0, numUsed, startIndex);
|
|
|
|
if (endIndex > startIndex)
|
|
{
|
|
if (deleteObjects)
|
|
{
|
|
for (int i = startIndex; i < endIndex; ++i)
|
|
{
|
|
ContainerDeletePolicy <ObjectClass>::destroy (data.elements [i]);
|
|
data.elements [i] = nullptr; // (in case one of the destructors accesses this array and hits a dangling pointer)
|
|
}
|
|
}
|
|
|
|
const int rangeSize = endIndex - startIndex;
|
|
ObjectClass** e = data.elements + startIndex;
|
|
int numToShift = numUsed - endIndex;
|
|
numUsed -= rangeSize;
|
|
|
|
while (--numToShift >= 0)
|
|
{
|
|
*e = e [rangeSize];
|
|
++e;
|
|
}
|
|
|
|
if ((numUsed << 1) < data.numAllocated)
|
|
minimiseStorageOverheads();
|
|
}
|
|
}
|
|
|
|
/** Removes the last n objects from the array.
|
|
|
|
@param howManyToRemove how many objects to remove from the end of the array
|
|
@param deleteObjects whether to also delete the objects that are removed
|
|
@see remove, removeObject, removeRange
|
|
*/
|
|
void removeLast (int howManyToRemove = 1,
|
|
const bool deleteObjects = true)
|
|
{
|
|
const ScopedLockType lock (getLock());
|
|
|
|
if (howManyToRemove >= numUsed)
|
|
clear (deleteObjects);
|
|
else
|
|
removeRange (numUsed - howManyToRemove, howManyToRemove, deleteObjects);
|
|
}
|
|
|
|
/** Swaps a pair of objects in the array.
|
|
|
|
If either of the indexes passed in is out-of-range, nothing will happen,
|
|
otherwise the two objects at these positions will be exchanged.
|
|
*/
|
|
void swap (const int index1,
|
|
const int index2) noexcept
|
|
{
|
|
const ScopedLockType lock (getLock());
|
|
|
|
if (isPositiveAndBelow (index1, numUsed)
|
|
&& isPositiveAndBelow (index2, numUsed))
|
|
{
|
|
std::swap (data.elements [index1],
|
|
data.elements [index2]);
|
|
}
|
|
}
|
|
|
|
/** Moves one of the objects to a different position.
|
|
|
|
This will move the object to a specified index, shuffling along
|
|
any intervening elements as required.
|
|
|
|
So for example, if you have the array { 0, 1, 2, 3, 4, 5 } then calling
|
|
move (2, 4) would result in { 0, 1, 3, 4, 2, 5 }.
|
|
|
|
@param currentIndex the index of the object to be moved. If this isn't a
|
|
valid index, then nothing will be done
|
|
@param newIndex the index at which you'd like this object to end up. If this
|
|
is less than zero, it will be moved to the end of the array
|
|
*/
|
|
void move (const int currentIndex,
|
|
int newIndex) noexcept
|
|
{
|
|
if (currentIndex != newIndex)
|
|
{
|
|
const ScopedLockType lock (getLock());
|
|
|
|
if (isPositiveAndBelow (currentIndex, numUsed))
|
|
{
|
|
if (! isPositiveAndBelow (newIndex, numUsed))
|
|
newIndex = numUsed - 1;
|
|
|
|
ObjectClass* const value = data.elements [currentIndex];
|
|
|
|
if (newIndex > currentIndex)
|
|
{
|
|
memmove (data.elements + currentIndex,
|
|
data.elements + currentIndex + 1,
|
|
sizeof (ObjectClass*) * (size_t) (newIndex - currentIndex));
|
|
}
|
|
else
|
|
{
|
|
memmove (data.elements + newIndex + 1,
|
|
data.elements + newIndex,
|
|
sizeof (ObjectClass*) * (size_t) (currentIndex - newIndex));
|
|
}
|
|
|
|
data.elements [newIndex] = value;
|
|
}
|
|
}
|
|
}
|
|
|
|
/** This swaps the contents of this array with those of another array.
|
|
|
|
If you need to exchange two arrays, this is vastly quicker than using copy-by-value
|
|
because it just swaps their internal pointers.
|
|
*/
|
|
template <class OtherArrayType>
|
|
void swapWith (OtherArrayType& otherArray) noexcept
|
|
{
|
|
const ScopedLockType lock1 (getLock());
|
|
const typename OtherArrayType::ScopedLockType lock2 (otherArray.getLock());
|
|
|
|
data.swapWith (otherArray.data);
|
|
std::swap (numUsed, otherArray.numUsed);
|
|
}
|
|
|
|
//==============================================================================
|
|
/** Reduces the amount of storage being used by the array.
|
|
|
|
Arrays typically allocate slightly more storage than they need, and after
|
|
removing elements, they may have quite a lot of unused space allocated.
|
|
This method will reduce the amount of allocated storage to a minimum.
|
|
*/
|
|
void minimiseStorageOverheads() noexcept
|
|
{
|
|
const ScopedLockType lock (getLock());
|
|
data.shrinkToNoMoreThan (numUsed);
|
|
}
|
|
|
|
/** Increases the array's internal storage to hold a minimum number of elements.
|
|
|
|
Calling this before adding a large known number of elements means that
|
|
the array won't have to keep dynamically resizing itself as the elements
|
|
are added, and it'll therefore be more efficient.
|
|
*/
|
|
void ensureStorageAllocated (const int minNumElements) noexcept
|
|
{
|
|
const ScopedLockType lock (getLock());
|
|
data.ensureAllocatedSize (minNumElements);
|
|
}
|
|
|
|
//==============================================================================
|
|
/** Sorts the elements in the array.
|
|
|
|
This will use a comparator object to sort the elements into order. The object
|
|
passed must have a method of the form:
|
|
@code
|
|
int compareElements (ElementType first, ElementType second);
|
|
@endcode
|
|
|
|
..and this method must return:
|
|
- a value of < 0 if the first comes before the second
|
|
- a value of 0 if the two objects are equivalent
|
|
- a value of > 0 if the second comes before the first
|
|
|
|
To improve performance, the compareElements() method can be declared as static or const.
|
|
|
|
@param comparator the comparator to use for comparing elements.
|
|
@param retainOrderOfEquivalentItems if this is true, then items
|
|
which the comparator says are equivalent will be
|
|
kept in the order in which they currently appear
|
|
in the array. This is slower to perform, but may
|
|
be important in some cases. If it's false, a faster
|
|
algorithm is used, but equivalent elements may be
|
|
rearranged.
|
|
@see sortArray, indexOfSorted
|
|
*/
|
|
template <class ElementComparator>
|
|
void sort (ElementComparator& comparator,
|
|
const bool retainOrderOfEquivalentItems = false) const noexcept
|
|
{
|
|
(void) comparator; // if you pass in an object with a static compareElements() method, this
|
|
// avoids getting warning messages about the parameter being unused
|
|
|
|
const ScopedLockType lock (getLock());
|
|
sortArray (comparator, data.elements.getData(), 0, size() - 1, retainOrderOfEquivalentItems);
|
|
}
|
|
|
|
//==============================================================================
|
|
/** Returns the CriticalSection that locks this array.
|
|
To lock, you can call getLock().enter() and getLock().exit(), or preferably use
|
|
an object of ScopedLockType as an RAII lock for it.
|
|
*/
|
|
inline const TypeOfCriticalSectionToUse& getLock() const noexcept { return data; }
|
|
|
|
/** Returns the type of scoped lock to use for locking this array */
|
|
typedef typename TypeOfCriticalSectionToUse::ScopedLockType ScopedLockType;
|
|
|
|
|
|
private:
|
|
//==============================================================================
|
|
ArrayAllocationBase <ObjectClass*, TypeOfCriticalSectionToUse> data;
|
|
int numUsed;
|
|
|
|
void deleteAllObjects()
|
|
{
|
|
while (numUsed > 0)
|
|
ContainerDeletePolicy <ObjectClass>::destroy (data.elements [--numUsed]);
|
|
}
|
|
};
|
|
|
|
|
|
#endif
|