This commit is contained in:
1 parent
1a00f82823
commit
ae7a0806df
7 files changed
+81
-36
No files matched your search
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||||||
|
|
||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
|
|
||||||
|
## [3.6.0] - 2026-11-22
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- Functionality to query memory allocator usage
|
||||||
|
|
||||||
## [3.5.0] - 2026-11-16
|
## [3.5.0] - 2026-11-16
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|||||||
@@ -76,6 +76,16 @@ void wpMemAllocatorTempEnd(const WpAllocator *allocator) {
|
|||||||
allocator->temp_end(allocator->obj);
|
allocator->temp_end(allocator->obj);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
WpAllocatorUsage wpMemAllocatorQueryUsage(const WpAllocator *allocator) {
|
||||||
|
wpDebugAssert(allocator != NULL, "`allocator` should not be NULL");
|
||||||
|
|
||||||
|
if (!wpMemAllocatorOpSupported(allocator, WP_MEM_OP_QUERY_USAGE)) {
|
||||||
|
return (WpAllocatorUsage){0};
|
||||||
|
}
|
||||||
|
|
||||||
|
return allocator->query_usage(allocator->obj);
|
||||||
|
}
|
||||||
|
|
||||||
b8 wpMemAllocatorOpSupported(const WpAllocator *allocator, WpMemOp op) {
|
b8 wpMemAllocatorOpSupported(const WpAllocator *allocator, WpMemOp op) {
|
||||||
wpDebugAssert(allocator != NULL, "`allocator` should not be NULL");
|
wpDebugAssert(allocator != NULL, "`allocator` should not be NULL");
|
||||||
|
|
||||||
@@ -94,6 +104,8 @@ b8 wpMemAllocatorOpSupported(const WpAllocator *allocator, WpMemOp op) {
|
|||||||
return allocator->temp_begin != NULL;
|
return allocator->temp_begin != NULL;
|
||||||
case WP_MEM_OP_TEMP_END:
|
case WP_MEM_OP_TEMP_END:
|
||||||
return allocator->temp_end != NULL;
|
return allocator->temp_end != NULL;
|
||||||
|
case WP_MEM_OP_QUERY_USAGE:
|
||||||
|
return allocator->query_usage != NULL;
|
||||||
case COUNT_MEM_OPS:
|
case COUNT_MEM_OPS:
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -19,17 +19,24 @@ typedef enum WpMemOp {
|
|||||||
WP_MEM_OP_FREE,
|
WP_MEM_OP_FREE,
|
||||||
WP_MEM_OP_TEMP_BEGIN,
|
WP_MEM_OP_TEMP_BEGIN,
|
||||||
WP_MEM_OP_TEMP_END,
|
WP_MEM_OP_TEMP_END,
|
||||||
|
WP_MEM_OP_QUERY_USAGE,
|
||||||
|
|
||||||
COUNT_MEM_OPS
|
COUNT_MEM_OPS
|
||||||
} WpMemOp;
|
} WpMemOp;
|
||||||
|
|
||||||
typedef void *(WpMemAllocFunc)(u64 size, void *alloc_obj);
|
typedef struct WpAllocatorUsage {
|
||||||
typedef void *(WpMemAllocAlignedFunc)(u64 size, u64 alignment, void *alloc_obj);
|
u64 capacity;
|
||||||
typedef void *(WpMemReallocFunc)(void *ptr, u64 old_size, u64 new_size, void *alloc_obj);
|
u64 used;
|
||||||
typedef void *(WpMemReallocAlignedFunc)(void *ptr, u64 old_size, u64 new_size, u64 alignment, void *alloc_obj);
|
} WpAllocatorUsage;
|
||||||
typedef void (WpMemFreeFunc)(void **ptr, u64 size, void *alloc_obj);
|
|
||||||
typedef void (WpMemTempBeginFunc)(void *alloc_obj);
|
typedef void *(WpMemAllocFunc)(u64 size, void *alloc_obj);
|
||||||
typedef void (WpMemTempEndFunc)(void *alloc_obj);
|
typedef void *(WpMemAllocAlignedFunc)(u64 size, u64 alignment, void *alloc_obj);
|
||||||
|
typedef void *(WpMemReallocFunc)(void *ptr, u64 old_size, u64 new_size, void *alloc_obj);
|
||||||
|
typedef void *(WpMemReallocAlignedFunc)(void *ptr, u64 old_size, u64 new_size, u64 alignment, void *alloc_obj);
|
||||||
|
typedef void (WpMemFreeFunc)(void **ptr, u64 size, void *alloc_obj);
|
||||||
|
typedef void (WpMemTempBeginFunc)(void *alloc_obj);
|
||||||
|
typedef void (WpMemTempEndFunc)(void *alloc_obj);
|
||||||
|
typedef WpAllocatorUsage (WpMemQueryUsageFunc)(void *alloc_obj);
|
||||||
|
|
||||||
typedef struct WpAllocator WpAllocator;
|
typedef struct WpAllocator WpAllocator;
|
||||||
struct WpAllocator {
|
struct WpAllocator {
|
||||||
@@ -41,6 +48,7 @@ struct WpAllocator {
|
|||||||
WpMemFreeFunc *free;
|
WpMemFreeFunc *free;
|
||||||
WpMemTempBeginFunc *temp_begin;
|
WpMemTempBeginFunc *temp_begin;
|
||||||
WpMemTempEndFunc *temp_end;
|
WpMemTempEndFunc *temp_end;
|
||||||
|
WpMemQueryUsageFunc *query_usage;
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifdef WP_PLATFORM_CPP
|
#ifdef WP_PLATFORM_CPP
|
||||||
@@ -52,15 +60,16 @@ struct WpAllocator {
|
|||||||
#define wpMemAllocatorInvalid(ALLOCATOR) (memcmp(ALLOCATOR, &((WpAllocator){0}), sizeof(WpAllocator)) == 0)
|
#define wpMemAllocatorInvalid(ALLOCATOR) (memcmp(ALLOCATOR, &((WpAllocator){0}), sizeof(WpAllocator)) == 0)
|
||||||
#endif // !WP_PLATFORM_CPP
|
#endif // !WP_PLATFORM_CPP
|
||||||
|
|
||||||
void *wpMemAllocatorAlloc(const WpAllocator *allocator, u64 size);
|
void *wpMemAllocatorAlloc(const WpAllocator *allocator, u64 size);
|
||||||
void *wpMemAllocatorAllocAligned(const WpAllocator *allocator, u64 size, u64 alignment);
|
void *wpMemAllocatorAllocAligned(const WpAllocator *allocator, u64 size, u64 alignment);
|
||||||
void *wpMemAllocatorRealloc(const WpAllocator *allocator, void *ptr, u64 old_size, u64 new_size);
|
void *wpMemAllocatorRealloc(const WpAllocator *allocator, void *ptr, u64 old_size, u64 new_size);
|
||||||
void *wpMemAllocatorReallocAligned(const WpAllocator *allocator, void *ptr, u64 old_size,
|
void *wpMemAllocatorReallocAligned(const WpAllocator *allocator, void *ptr, u64 old_size,
|
||||||
u64 new_size, u64 alignment);
|
u64 new_size, u64 alignment);
|
||||||
void wpMemAllocatorFree(const WpAllocator *allocator, void **ptr, u64 size);
|
void wpMemAllocatorFree(const WpAllocator *allocator, void **ptr, u64 size);
|
||||||
void wpMemAllocatorTempBegin(const WpAllocator *allocator);
|
void wpMemAllocatorTempBegin(const WpAllocator *allocator);
|
||||||
void wpMemAllocatorTempEnd(const WpAllocator *allocator);
|
void wpMemAllocatorTempEnd(const WpAllocator *allocator);
|
||||||
b8 wpMemAllocatorOpSupported(const WpAllocator *allocator, WpMemOp op);
|
WpAllocatorUsage wpMemAllocatorQueryUsage(const WpAllocator *allocator);
|
||||||
|
b8 wpMemAllocatorOpSupported(const WpAllocator *allocator, WpMemOp op);
|
||||||
|
|
||||||
#ifdef WP_PLATFORM_CPP
|
#ifdef WP_PLATFORM_CPP
|
||||||
END_C_LINKAGE
|
END_C_LINKAGE
|
||||||
|
|||||||
@@ -172,6 +172,15 @@ void wpMemArenaTempEnd(WpArena *arena) {
|
|||||||
arena->prev_offset = NULL;
|
arena->prev_offset = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
WpAllocatorUsage wpMemArenaQueryUsage(WpArena *arena) {
|
||||||
|
wpDebugAssert(arena != NULL, "`arena` should not be NULL");
|
||||||
|
|
||||||
|
return (WpAllocatorUsage){
|
||||||
|
.capacity = arena->capacity,
|
||||||
|
.used = arena->offset - arena->buf,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
void wpMemArenaClear(WpArena *arena) {
|
void wpMemArenaClear(WpArena *arena) {
|
||||||
wpDebugAssert(arena != NULL, "`arena` should not be NULL");
|
wpDebugAssert(arena != NULL, "`arena` should not be NULL");
|
||||||
|
|
||||||
|
|||||||
@@ -6,6 +6,7 @@
|
|||||||
#include "../../mem/mem_os.h"
|
#include "../../mem/mem_os.h"
|
||||||
#include "../../../common/aliases/aliases.h"
|
#include "../../../common/aliases/aliases.h"
|
||||||
#include "../../../common/platform/platform.h"
|
#include "../../../common/platform/platform.h"
|
||||||
|
#include "../../../base/mem/allocator/mem_allocator.h"
|
||||||
|
|
||||||
#ifdef WP_PLATFORM_CPP
|
#ifdef WP_PLATFORM_CPP
|
||||||
BEGIN_C_LINKAGE
|
BEGIN_C_LINKAGE
|
||||||
@@ -27,16 +28,17 @@ typedef struct WpArena WpArena;
|
|||||||
* control over how the WpArena is initialised. Wrapper macros are provided for
|
* control over how the WpArena is initialised. Wrapper macros are provided for
|
||||||
* easier use.
|
* easier use.
|
||||||
*/
|
*/
|
||||||
b8 wpMemArenaInitAllocatedCustom(WpArena **arena, u64 base_capacity, WpMemAllocFlags flags, b8 zero_buffer);
|
b8 wpMemArenaInitAllocatedCustom(WpArena **arena, u64 base_capacity, WpMemAllocFlags flags, b8 zero_buffer);
|
||||||
b8 wpMemArenaInitBuffer(WpArena **arena, u8 *buffer, u64 buffer_size);
|
b8 wpMemArenaInitBuffer(WpArena **arena, u8 *buffer, u64 buffer_size);
|
||||||
void *wpMemArenaAlloc(WpArena *arena, u64 size);
|
void *wpMemArenaAlloc(WpArena *arena, u64 size);
|
||||||
void *wpMemArenaAllocAligned(WpArena *arena, u64 size, u64 alignment);
|
void *wpMemArenaAllocAligned(WpArena *arena, u64 size, u64 alignment);
|
||||||
void *wpMemArenaRealloc(WpArena *arena, void *ptr, u64 old_size, u64 new_size);
|
void *wpMemArenaRealloc(WpArena *arena, void *ptr, u64 old_size, u64 new_size);
|
||||||
void *wpMemArenaReallocAligned(WpArena *arena, void *ptr, u64 old_size, u64 new_size, u64 alignment);
|
void *wpMemArenaReallocAligned(WpArena *arena, void *ptr, u64 old_size, u64 new_size, u64 alignment);
|
||||||
void wpMemArenaTempBegin(WpArena *arena);
|
void wpMemArenaTempBegin(WpArena *arena);
|
||||||
void wpMemArenaTempEnd(WpArena *arena);
|
void wpMemArenaTempEnd(WpArena *arena);
|
||||||
void wpMemArenaClear(WpArena *arena);
|
WpAllocatorUsage wpMemArenaQueryUsage(WpArena *arena);
|
||||||
void wpMemArenaDestroy(WpArena **arena);
|
void wpMemArenaClear(WpArena *arena);
|
||||||
|
void wpMemArenaDestroy(WpArena **arena);
|
||||||
|
|
||||||
#ifdef WP_PLATFORM_CPP
|
#ifdef WP_PLATFORM_CPP
|
||||||
END_C_LINKAGE
|
END_C_LINKAGE
|
||||||
|
|||||||
@@ -5,14 +5,15 @@
|
|||||||
#include "../../../common/aliases/aliases.h"
|
#include "../../../common/aliases/aliases.h"
|
||||||
#include "../../../common/assert/assert.h"
|
#include "../../../common/assert/assert.h"
|
||||||
|
|
||||||
wp_intern void initialiseArenaAllocator(WpAllocator *allocator);
|
wp_intern void initialiseArenaAllocator(WpAllocator *allocator);
|
||||||
wp_intern void *memArenaAlloc(u64 size, void *alloc_obj);
|
wp_intern void *memArenaAlloc(u64 size, void *alloc_obj);
|
||||||
wp_intern void *memArenaAllocAligned(u64 size, u64 alignment, void *alloc_obj);
|
wp_intern void *memArenaAllocAligned(u64 size, u64 alignment, void *alloc_obj);
|
||||||
wp_intern void *memArenaRealloc(void *ptr, u64 old_size, u64 new_size, void *alloc_obj);
|
wp_intern void *memArenaRealloc(void *ptr, u64 old_size, u64 new_size, void *alloc_obj);
|
||||||
wp_intern void *memArenaReallocAligned(void *ptr, u64 old_size, u64 new_size, u64 alignment,
|
wp_intern void *memArenaReallocAligned(void *ptr, u64 old_size, u64 new_size, u64 alignment,
|
||||||
void *alloc_obj);
|
void *alloc_obj);
|
||||||
wp_intern void memArenaTempBegin(void *alloc_obj);
|
wp_intern void memArenaTempBegin(void *alloc_obj);
|
||||||
wp_intern void memArenaTempEnd(void *alloc_obj);
|
wp_intern void memArenaTempEnd(void *alloc_obj);
|
||||||
|
wp_intern WpAllocatorUsage memArenaQueryUsage(void *alloc_obj);
|
||||||
|
|
||||||
WpAllocator wpMemArenaAllocatorInitWithBuffer(u8 *buffer, u64 buffer_size) {
|
WpAllocator wpMemArenaAllocatorInitWithBuffer(u8 *buffer, u64 buffer_size) {
|
||||||
WpAllocator allocator = {0};
|
WpAllocator allocator = {0};
|
||||||
@@ -56,6 +57,7 @@ wp_intern void initialiseArenaAllocator(WpAllocator *allocator) {
|
|||||||
allocator->realloc_aligned = memArenaReallocAligned;
|
allocator->realloc_aligned = memArenaReallocAligned;
|
||||||
allocator->temp_begin = memArenaTempBegin;
|
allocator->temp_begin = memArenaTempBegin;
|
||||||
allocator->temp_end = memArenaTempEnd;
|
allocator->temp_end = memArenaTempEnd;
|
||||||
|
allocator->query_usage = memArenaQueryUsage;
|
||||||
}
|
}
|
||||||
|
|
||||||
wp_intern void *memArenaAlloc(u64 size, void *alloc_obj) {
|
wp_intern void *memArenaAlloc(u64 size, void *alloc_obj) {
|
||||||
@@ -74,7 +76,7 @@ wp_intern void *memArenaRealloc(void *ptr, u64 old_size, u64 new_size, void *all
|
|||||||
}
|
}
|
||||||
|
|
||||||
wp_intern void *memArenaReallocAligned(void *ptr, u64 old_size, u64 new_size, u64 alignment,
|
wp_intern void *memArenaReallocAligned(void *ptr, u64 old_size, u64 new_size, u64 alignment,
|
||||||
void *alloc_obj) {
|
void *alloc_obj) {
|
||||||
WpArena *arena = (WpArena *)alloc_obj;
|
WpArena *arena = (WpArena *)alloc_obj;
|
||||||
return wpMemArenaReallocAligned(arena, ptr, old_size, new_size, alignment);
|
return wpMemArenaReallocAligned(arena, ptr, old_size, new_size, alignment);
|
||||||
}
|
}
|
||||||
@@ -88,3 +90,8 @@ wp_intern void memArenaTempEnd(void *alloc_obj) {
|
|||||||
WpArena *arena = (WpArena *)alloc_obj;
|
WpArena *arena = (WpArena *)alloc_obj;
|
||||||
wpMemArenaTempEnd(arena);
|
wpMemArenaTempEnd(arena);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
wp_intern WpAllocatorUsage memArenaQueryUsage(void *alloc_obj) {
|
||||||
|
WpArena *arena = (WpArena *)alloc_obj;
|
||||||
|
return wpMemArenaQueryUsage(arena);
|
||||||
|
}
|
||||||
Reference in new issue
Block a user