Skip to content

Commit a719be5

Browse files
RaelrRaelr
committed
Ran format
1 parent c49728a commit a719be5

File tree

4 files changed

+55
-36
lines changed

4 files changed

+55
-36
lines changed

‎engine/utils/allocators/Tlsf.cpp‎

Lines changed: 30 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
//
99

1010
#include "Tlsf.h"
11+
1112
#include <memory>
13+
1214
#include "../Logging.h"
1315

1416
#define TO_BYTES(val) reinterpret_cast<uint8_t*>(val)
@@ -35,7 +37,8 @@ template<typename T>
3537
uint8_t TlsfAllocator<T>::MIN_SIZE_INDEX = 4;
3638

3739
template<typename T>
38-
TlsfAllocator<T>::TlsfAllocator() {}
40+
TlsfAllocator<T>::TlsfAllocator()
41+
{}
3942

4043
template<typename T>
4144
TlsfAllocator<T>::TlsfAllocator(const T size)
@@ -139,8 +142,9 @@ void TlsfAllocator<T>::Deallocate(void** ptr)
139142
}
140143

141144
template<typename T>
142-
typename TlsfAllocator<T>::BlockHeader* TlsfAllocator<T>::TrySplitBlock(TlsfAllocator<T>::FreeBlockNode* node,
143-
T& allocatedSize)
145+
typename TlsfAllocator<T>::BlockHeader* TlsfAllocator<T>::TrySplitBlock(
146+
TlsfAllocator<T>::FreeBlockNode* node,
147+
T& allocatedSize)
144148
{
145149
if (!node) return nullptr;
146150

@@ -182,7 +186,8 @@ void TlsfAllocator<T>::AddNewBlock(const T size, BlockHeader* header)
182186
}
183187

184188
template<typename T>
185-
typename TlsfAllocator<T>::BlockHeader* TlsfAllocator<T>::TryCoalesce(BlockHeader* header, OUT T& size)
189+
typename TlsfAllocator<T>::BlockHeader* TlsfAllocator<T>::TryCoalesce(BlockHeader* header,
190+
OUT T& size)
186191
{
187192
BlockHeader* start = header;
188193
BlockHeader* prev = GetPrevHeader(start);
@@ -284,7 +289,8 @@ void TlsfAllocator<T>::CreateFooter(uint8_t* ptr, const T size)
284289
}
285290

286291
template<typename T>
287-
typename TlsfAllocator<T>::BlockHeader* TlsfAllocator<T>::GetHeader(TlsfAllocator::FreeBlockNode* node)
292+
typename TlsfAllocator<T>::BlockHeader* TlsfAllocator<T>::GetHeader(
293+
TlsfAllocator::FreeBlockNode* node)
288294
{
289295
if (!node) return nullptr;
290296
uint8_t* rawHeader = TO_BYTES(node) - HEADER_SIZE;
@@ -302,7 +308,8 @@ typename TlsfAllocator<T>::BlockHeader* TlsfAllocator<T>::GetHeader(uint8_t* ptr
302308
}
303309

304310
template<typename T>
305-
typename TlsfAllocator<T>::BlockHeader* TlsfAllocator<T>::GetPrevHeader(TlsfAllocator::BlockHeader* header)
311+
typename TlsfAllocator<T>::BlockHeader* TlsfAllocator<T>::GetPrevHeader(
312+
TlsfAllocator::BlockHeader* header)
306313
{
307314
if (!header) return nullptr;
308315
uint8_t* rawPrevFooter = TO_BYTES(GetPrevFooter(header));
@@ -313,7 +320,8 @@ typename TlsfAllocator<T>::BlockHeader* TlsfAllocator<T>::GetPrevHeader(TlsfAllo
313320
}
314321

315322
template<typename T>
316-
typename TlsfAllocator<T>::BlockHeader* TlsfAllocator<T>::GetNextHeader(TlsfAllocator::BlockHeader* header)
323+
typename TlsfAllocator<T>::BlockHeader* TlsfAllocator<T>::GetNextHeader(
324+
TlsfAllocator::BlockHeader* header)
317325
{
318326
if (!header) return nullptr;
319327
uint8_t* rawHeader = TO_BYTES(header);
@@ -323,9 +331,10 @@ typename TlsfAllocator<T>::BlockHeader* TlsfAllocator<T>::GetNextHeader(TlsfAllo
323331
}
324332

325333
template<typename T>
326-
typename TlsfAllocator<T>::FreeBlockNode* TlsfAllocator<T>::CreateFreeBlock(uint8_t* ptr,
327-
TlsfAllocator::FreeBlockNode* prev,
328-
TlsfAllocator::FreeBlockNode* next)
334+
typename TlsfAllocator<T>::FreeBlockNode* TlsfAllocator<T>::CreateFreeBlock(
335+
uint8_t* ptr,
336+
TlsfAllocator::FreeBlockNode* prev,
337+
TlsfAllocator::FreeBlockNode* next)
329338
{
330339
if (!IsValid(ptr)) return nullptr;
331340

@@ -351,7 +360,8 @@ typename TlsfAllocator<T>::FreeBlockNode* TlsfAllocator<T>::GetFreeBlock(const T
351360
}
352361

353362
template<typename T>
354-
typename TlsfAllocator<T>::BlockFooter* TlsfAllocator<T>::GetFooter(TlsfAllocator::BlockHeader* header)
363+
typename TlsfAllocator<T>::BlockFooter* TlsfAllocator<T>::GetFooter(
364+
TlsfAllocator::BlockHeader* header)
355365
{
356366
if (!header) return nullptr;
357367
T size = GetHeaderSize(header);
@@ -361,7 +371,8 @@ typename TlsfAllocator<T>::BlockFooter* TlsfAllocator<T>::GetFooter(TlsfAllocato
361371
}
362372

363373
template<typename T>
364-
typename TlsfAllocator<T>::BlockFooter* TlsfAllocator<T>::GetPrevFooter(TlsfAllocator::BlockHeader* header)
374+
typename TlsfAllocator<T>::BlockFooter* TlsfAllocator<T>::GetPrevFooter(
375+
TlsfAllocator::BlockHeader* header)
365376
{
366377
if (!header) return nullptr;
367378
uint8_t* rawFooter = TO_BYTES(header) - FOOTER_SIZE;
@@ -393,6 +404,12 @@ bool TlsfAllocator<T>::IsFree(T fl, T sl)
393404
return slBitmasks[fl] & (1 << sl);
394405
}
395406

407+
template<typename T>
408+
bool TlsfAllocator<T>::IsFull()
409+
{
410+
return totalBytesRemaining == 0;
411+
}
412+
396413
template<typename T>
397414
bool TlsfAllocator<T>::PrevBlockIsFree(BlockHeader* header)
398415
{
@@ -429,5 +446,4 @@ const T TlsfAllocator<T>::BytesRemaining()
429446
template class TlsfAllocator<uint16_t>;
430447
template class TlsfAllocator<uint32_t>;
431448
template class TlsfAllocator<uint64_t>;
432-
}
433-
449+
} // namespace Siege

‎engine/utils/allocators/Tlsf.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,15 @@
1414

1515
#include "../Macros.h"
1616

17-
#define FREE(ptr) Deallocate((void**)&ptr)
17+
#define FREE(ptr) Deallocate((void**) &ptr)
1818

1919
namespace Siege
2020
{
2121
template<typename T>
2222
class TlsfAllocator
2323
{
2424
public:
25+
2526
enum HeaderFlags
2627
{
2728
FULL = 0,
@@ -65,6 +66,7 @@ class TlsfAllocator
6566
const T GetNextFreeSlotIndex(T& fl, T& sl);
6667
bool IsFree(BlockHeader* header);
6768
bool IsFree(T fl, T sl);
69+
bool IsFull();
6870
bool PrevBlockIsFree(BlockHeader* header);
6971
T CalculateFreeBlockIndices(T size, OUT T& fl, OUT T& sl);
7072

@@ -141,6 +143,6 @@ typedef TlsfAllocator<uint16_t> SmallTlsfAllocator;
141143
typedef TlsfAllocator<uint32_t> MediumTlsfAllocator;
142144
// Maximum buffer possible here is around 2,147,483.6GB.
143145
typedef TlsfAllocator<uint64_t> LargeTlsfAllocator;
144-
}
146+
} // namespace Siege
145147

146148
#endif // SIEGE_ENGINE_TLSF_H

‎tests/src/resources/test_ResourceSystem.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
#include <resources/Texture2DData.h>
1818
#include <utest.h>
1919

20-
#include <random>
21-
2220
using namespace Siege;
2321

2422
// Define test fixture

‎tests/src/utils/test_TlsfAllocator.cpp‎

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,9 @@ UTEST(test_MediumTlsfAllocator, TestAllocateFunction)
113113

114114
ASSERT_EQ(192, strHeader->sizeAndFlags);
115115
ASSERT_EQ(strData, str);
116-
ASSERT_EQ(
117-
sizeof(MediumTlsfAllocator::BlockHeader) + sizeof(String) + sizeof(MediumTlsfAllocator::BlockFooter),
118-
strFooter->totalBlockSize);
116+
ASSERT_EQ(sizeof(MediumTlsfAllocator::BlockHeader) + sizeof(String) +
117+
sizeof(MediumTlsfAllocator::BlockFooter),
118+
strFooter->totalBlockSize);
119119
ASSERT_EQ(32, a.BytesRemaining());
120120

121121
// Edge cases
@@ -258,9 +258,9 @@ UTEST(Test_MediumTlsfAllocator, TestDeallocateFunction)
258258

259259
ASSERT_EQ(192, strHeader->sizeAndFlags);
260260
ASSERT_EQ(strData, str);
261-
ASSERT_EQ(
262-
sizeof(MediumTlsfAllocator::BlockHeader) + sizeof(String) + sizeof(MediumTlsfAllocator::BlockFooter),
263-
strFooter->totalBlockSize);
261+
ASSERT_EQ(sizeof(MediumTlsfAllocator::BlockHeader) + sizeof(String) +
262+
sizeof(MediumTlsfAllocator::BlockFooter),
263+
strFooter->totalBlockSize);
264264
ASSERT_EQ(32, a.BytesRemaining());
265265

266266
a.FREE(p);
@@ -425,6 +425,7 @@ UTEST(Test_MediumTlsfAllocator, TestAllocationWhenNoAppropriateFragmentExists)
425425
void* p2 = a.Allocate(16);
426426
void* p3 = a.Allocate(32);
427427
ASSERT_EQ(0, a.TotalBytesRemaining());
428+
ASSERT_TRUE(a.IsFull());
428429

429430
a.FREE(p0);
430431
a.FREE(p2);
@@ -581,9 +582,9 @@ UTEST(Test_SmallTlsfAllocator, TestAllocateFunction)
581582

582583
ASSERT_EQ(160, strHeader->sizeAndFlags);
583584
ASSERT_EQ(strData, str);
584-
ASSERT_EQ(
585-
sizeof(SmallTlsfAllocator::BlockHeader) + sizeof(String) + sizeof(SmallTlsfAllocator::BlockFooter),
586-
strFooter->totalBlockSize);
585+
ASSERT_EQ(sizeof(SmallTlsfAllocator::BlockHeader) + sizeof(String) +
586+
sizeof(SmallTlsfAllocator::BlockFooter),
587+
strFooter->totalBlockSize);
587588
ASSERT_EQ(32, a.BytesRemaining());
588589

589590
// Edge cases
@@ -726,9 +727,9 @@ UTEST(Test_SmallTlsfAllocator, TestDeallocateFunction)
726727

727728
ASSERT_EQ(160, strHeader->sizeAndFlags);
728729
ASSERT_EQ(strData, str);
729-
ASSERT_EQ(
730-
sizeof(SmallTlsfAllocator::BlockHeader) + sizeof(String) + sizeof(SmallTlsfAllocator::BlockFooter),
731-
strFooter->totalBlockSize);
730+
ASSERT_EQ(sizeof(SmallTlsfAllocator::BlockHeader) + sizeof(String) +
731+
sizeof(SmallTlsfAllocator::BlockFooter),
732+
strFooter->totalBlockSize);
732733
ASSERT_EQ(32, a.BytesRemaining());
733734

734735
a.FREE(p);
@@ -893,6 +894,7 @@ UTEST(Test_SmallTlsfAllocator, TestAllocationWhenNoAppropriateFragmentExists)
893894
void* p2 = a.Allocate(20);
894895
void* p3 = a.Allocate(36);
895896
ASSERT_EQ(0, a.TotalBytesRemaining());
897+
ASSERT_TRUE(a.IsFull());
896898

897899
a.FREE(p0);
898900
a.FREE(p2);
@@ -1049,9 +1051,9 @@ UTEST(Test_LargeTlsfAllocator, TestAllocateFunction)
10491051

10501052
ASSERT_EQ(256, strHeader->sizeAndFlags);
10511053
ASSERT_EQ(strData, str);
1052-
ASSERT_EQ(
1053-
sizeof(LargeTlsfAllocator::BlockHeader) + sizeof(String) + sizeof(LargeTlsfAllocator::BlockFooter),
1054-
strFooter->totalBlockSize);
1054+
ASSERT_EQ(sizeof(LargeTlsfAllocator::BlockHeader) + sizeof(String) +
1055+
sizeof(LargeTlsfAllocator::BlockFooter),
1056+
strFooter->totalBlockSize);
10551057
ASSERT_EQ(224, a.BytesRemaining());
10561058

10571059
// Edge cases
@@ -1191,9 +1193,9 @@ UTEST(Test_LargeTlsfAllocator, TestDeallocateFunction)
11911193

11921194
ASSERT_EQ(256, strHeader->sizeAndFlags);
11931195
ASSERT_EQ(strData, str);
1194-
ASSERT_EQ(
1195-
sizeof(LargeTlsfAllocator::BlockHeader) + sizeof(String) + sizeof(LargeTlsfAllocator::BlockFooter),
1196-
strFooter->totalBlockSize);
1196+
ASSERT_EQ(sizeof(LargeTlsfAllocator::BlockHeader) + sizeof(String) +
1197+
sizeof(LargeTlsfAllocator::BlockFooter),
1198+
strFooter->totalBlockSize);
11971199
ASSERT_EQ(224, a.BytesRemaining());
11981200

11991201
a.FREE(p);
@@ -1358,6 +1360,7 @@ UTEST(Test_LargeTlsfAllocator, TestAllocationWhenNoAppropriateFragmentExists)
13581360
void* p2 = a.Allocate(32);
13591361
void* p3 = a.Allocate(64);
13601362
ASSERT_EQ(0, a.TotalBytesRemaining());
1363+
ASSERT_TRUE(a.IsFull());
13611364

13621365
a.FREE(p0);
13631366
a.FREE(p2);

0 commit comments

Comments
 (0)