abdelrahman/wizapp-stdlib
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: abdelrahman:23886f40e8494c20171fc87a43954b4acdcc57c5
Branches Tags
abdelrahman:main
abdelrahman:preserve_cpp
abdelrahman:generic
abdelrahman:growing_arena
abdelrahman:mem_context_and_allocator
..
compare: abdelrahman:9807334ac915442c266526122615dfab8973dbcd
Branches Tags
abdelrahman:main
abdelrahman:preserve_cpp
abdelrahman:generic
abdelrahman:growing_arena
abdelrahman:mem_context_and_allocator

No commits in common. "23886f40e8494c20171fc87a43954b4acdcc57c5" and "9807334ac915442c266526122615dfab8973dbcd" have entirely different histories.
23886f40e8 ... 9807334ac9

4 changed files with 6 additions and 25 deletions
Show Stats Expand all files Collapse all files

10
src/mem/arena/mem_arena.c
View File

@ -21,8 +21,7 @@ struct arena {
// PUBLIC API
bool wapp_mem_arena_init(Arena **arena, u64 base_capacity, MemAllocFlags flags,
bool zero_buffer) {
bool wapp_mem_arena_init(Arena **arena, u64 base_capacity) {
if (!arena || *arena || base_capacity == 0) {
return false;
}
@ -37,10 +36,7 @@ bool wapp_mem_arena_init(Arena **arena, u64 base_capacity, MemAllocFlags flags,
? base_capacity
: ARENA_MINIMUM_CAPACITY;
arena_ptr->buf = (u8 *)wapp_mem_util_alloc(
arena_capacity, WAPP_MEM_ACCESS_READ_WRITE, flags,
zero_buffer ? WAPP_MEM_INIT_INITIALISED : WAPP_MEM_INIT_UNINITIALISED);
arena_ptr->buf = (u8 *)calloc(arena_capacity, sizeof(u8));
if (!(arena_ptr->buf)) {
wapp_mem_arena_destroy(arena);
return false;
@ -91,7 +87,7 @@ void wapp_mem_arena_destroy(Arena **arena) {
Arena *arena_ptr = *arena;
if (arena_ptr->buf) {
wapp_mem_util_free(arena_ptr->buf, arena_ptr->capacity);
free(arena_ptr->buf);
}
arena_ptr->buf = arena_ptr->offset = NULL;

4
src/mem/arena/mem_arena.h
View File

@ -2,7 +2,6 @@
#define MEM_ARENA_H
#include "aliases.h"
#include "mem_utils.h"
#include <stdbool.h>
#ifdef __cplusplus
@ -11,8 +10,7 @@ extern "C" {
typedef struct arena Arena;
bool wapp_mem_arena_init(Arena **arena, u64 base_capacity, MemAllocFlags flags,
bool zero_buffer);
bool wapp_mem_arena_init(Arena **arena, u64 base_capacity);
void *wapp_mem_arena_alloc(Arena *arena, u64 size);
void *wapp_mem_arena_alloc_aligned(Arena *arena, u64 size, u64 alignment);
void wapp_mem_arena_clear(Arena *arena);

8
src/mem/util/mem_utils.c
View File

@ -65,11 +65,6 @@ void *wapp_mem_util_align_forward(void *ptr, u64 alignment) {
void *wapp_mem_util_alloc(u64 size, MemAccess access, MemAllocFlags flags,
MemInitType type) {
#if defined(WAPP_PLATFORM_WINDOWS)
// Ensure memory is committed if it's meant to be initialised
if (type == WAPP_MEM_INIT_INITIALISED) {
flags |= WAPP_MEM_ALLOC_COMMIT;
}
void *output = alloc_windows(size, access, flags);
#elif defined(WAPP_PLATFORM_POSIX)
void *output = alloc_posix(size, access, flags);
@ -104,8 +99,7 @@ internal inline void *alloc_posix(u64 size, MemAccess access,
MemAllocFlags flags) {
i32 alloc_flags = flags | MAP_ANON | MAP_PRIVATE;
#if defined(WAPP_PLATFORM_LINUX) || defined(WAPP_PLATFORM_GNU) || \
defined(WAPP_PLATFORM_NET_BSD)
#ifdef WAPP_PLATFORM_LINUX
alloc_flags |= MAP_NORESERVE;
#endif

9
src/mem/util/mem_utils.h
View File

@ -30,16 +30,9 @@ typedef enum mem_alloc_flags {
#if defined(WAPP_PLATFORM_WINDOWS)
WAPP_MEM_ALLOC_RESERVE = MEM_RESERVE,
WAPP_MEM_ALLOC_COMMIT = MEM_COMMIT,
#elif defined(WAPP_PLATFORM_LINUX) || defined(WAPP_PLATFORM_GNU)
#elif defined(WAPP_PLATFORM_POSIX)
WAPP_MEM_ALLOC_RESERVE = 0,
WAPP_MEM_ALLOC_COMMIT = MAP_POPULATE,
#elif defined(WAPP_PLATFORM_FREE_BSD)
WAPP_MEM_ALLOC_RESERVE = 0,
WAPP_MEM_ALLOC_COMMIT = MAP_PREFAULT_READ,
#elif defined(WAPP_PLATFORM_BSD) || defined(WAPP_PLATFORM_UNIX) || \
defined(WAPP_PLATFORM_APPLE)
WAPP_MEM_ALLOC_RESERVE = 0,
WAPP_MEM_ALLOC_COMMIT = 0,
#endif
} MemAllocFlags;