Compare commits
	
		
			8 Commits
		
	
	
		
			df4315cdcc
			...
			0c07437ef2
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					0c07437ef2 | ||
| 
						 | 
					063bc03974 | ||
| 
						 | 
					09af7ec734 | ||
| 
						 | 
					04e86d355d | ||
| 
						 | 
					7bfaf53d4e | ||
| 
						 | 
					958df4b55a | ||
| 
						 | 
					9179f9beaa | ||
| 
						 | 
					7aaeb91fe1 | 
							
								
								
									
										3
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							@@ -1,3 +1,4 @@
 | 
			
		||||
.cache
 | 
			
		||||
.vscode
 | 
			
		||||
compile_commands.json
 | 
			
		||||
libwizapp.so
 | 
			
		||||
libwapp.so
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										4
									
								
								compile
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								compile
									
									
									
									
									
								
							@@ -5,7 +5,7 @@ INCLUDE="\
 | 
			
		||||
	-Ialiases \
 | 
			
		||||
	-Icpath/include \
 | 
			
		||||
	-Idstr/include \
 | 
			
		||||
	$(find mem/include/ -type d | xargs -I{} echo -n "-I{} ") \
 | 
			
		||||
	$(find mem/include -type d | xargs -I{} echo -n "-I{} ") \
 | 
			
		||||
"
 | 
			
		||||
SRC="\
 | 
			
		||||
	cpath/src/*.c \
 | 
			
		||||
@@ -13,6 +13,6 @@ SRC="\
 | 
			
		||||
	mem/src/*/*.c \
 | 
			
		||||
"
 | 
			
		||||
CFLAGS="-shared -fPIC -Wall -Werror -pedantic"
 | 
			
		||||
OUT="libwizapp.so"
 | 
			
		||||
OUT="libwapp.so"
 | 
			
		||||
 | 
			
		||||
(set -x ; $CC $CFLAGS $INCLUDE $SRC -o $OUT)
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										27
									
								
								mem/include/ctx/mem_ctx.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										27
									
								
								mem/include/ctx/mem_ctx.h
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,27 @@
 | 
			
		||||
#ifndef MEM_CTX_H
 | 
			
		||||
#define MEM_CTX_H
 | 
			
		||||
 | 
			
		||||
#include "mem_arena.h"
 | 
			
		||||
 | 
			
		||||
#ifdef __cplusplus
 | 
			
		||||
extern "C" {
 | 
			
		||||
#endif // __cplusplus
 | 
			
		||||
 | 
			
		||||
typedef enum {
 | 
			
		||||
  CTX_DEST_BUFFER_MAIN,
 | 
			
		||||
  CTX_DEST_BUFFER_TEMP,
 | 
			
		||||
 | 
			
		||||
  COUNT_CTX_DEST_BUFFER,
 | 
			
		||||
} CTXDestBuffer;
 | 
			
		||||
 | 
			
		||||
void wapp_mem_ctx_init(u64 main_buf_capacity, u64 temp_buf_capacity);
 | 
			
		||||
void *wapp_mem_ctx_alloc(CTXDestBuffer buffer, u64 size);
 | 
			
		||||
void *wapp_mem_ctx_alloc_aligned(CTXDestBuffer buffer, u64 size, u64 alignment);
 | 
			
		||||
void wapp_mem_ctx_clear(CTXDestBuffer buffer);
 | 
			
		||||
void wapp_mem_ctx_free(void);
 | 
			
		||||
 | 
			
		||||
#ifdef __cplusplus
 | 
			
		||||
}
 | 
			
		||||
#endif // __cplusplus
 | 
			
		||||
 | 
			
		||||
#endif // !MEM_CTX_H
 | 
			
		||||
@@ -35,7 +35,7 @@ internal void base_arena_free(BaseArena *arena);
 | 
			
		||||
// PUBLIC API
 | 
			
		||||
 | 
			
		||||
bool wapp_mem_arena_init(Arena **arena, u64 base_capacity) {
 | 
			
		||||
  if (!arena || *arena) {
 | 
			
		||||
  if (!arena || *arena || base_capacity == 0) {
 | 
			
		||||
    return false;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
@@ -115,18 +115,16 @@ void wapp_mem_arena_clear(Arena *arena) {
 | 
			
		||||
    return;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  BaseArena *new_active = NULL;
 | 
			
		||||
  BaseArena *last_active = NULL;
 | 
			
		||||
  while (arena->active_arena) {
 | 
			
		||||
    base_arena_clear(arena->active_arena);
 | 
			
		||||
 | 
			
		||||
    arena->active_arena = arena->active_arena->prev;
 | 
			
		||||
		last_active = arena->active_arena;
 | 
			
		||||
 | 
			
		||||
    if (arena->active_arena) {
 | 
			
		||||
      new_active = arena->active_arena;
 | 
			
		||||
    }
 | 
			
		||||
    arena->active_arena = arena->active_arena->prev;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  arena->active_arena = new_active;
 | 
			
		||||
  arena->active_arena = last_active;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void wapp_mem_arena_free(Arena **arena) {
 | 
			
		||||
@@ -135,6 +133,9 @@ void wapp_mem_arena_free(Arena **arena) {
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  Arena *arena_ptr = *arena;
 | 
			
		||||
  if (!arena_ptr) {
 | 
			
		||||
    return;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  BaseArena *current;
 | 
			
		||||
  BaseArena *next;
 | 
			
		||||
@@ -175,7 +176,7 @@ void wapp_mem_arena_free(Arena **arena) {
 | 
			
		||||
// INTERNAL FUNCTIONS
 | 
			
		||||
 | 
			
		||||
internal bool base_arena_init(BaseArena *arena, u64 capacity) {
 | 
			
		||||
  if (!arena || arena->buf) {
 | 
			
		||||
  if (!arena || arena->buf || capacity == 0) {
 | 
			
		||||
    return false;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										82
									
								
								mem/src/ctx/mem_ctx.c
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										82
									
								
								mem/src/ctx/mem_ctx.c
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,82 @@
 | 
			
		||||
#include "mem_ctx.h"
 | 
			
		||||
#include "aliases.h"
 | 
			
		||||
#include "mem_arena.h"
 | 
			
		||||
#include <assert.h>
 | 
			
		||||
#include <stdlib.h>
 | 
			
		||||
 | 
			
		||||
typedef struct mem_ctx MemCTX;
 | 
			
		||||
struct mem_ctx {
 | 
			
		||||
  Arena *main;
 | 
			
		||||
  Arena *temp;
 | 
			
		||||
  bool main_initialised;
 | 
			
		||||
  bool temp_initialised;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
internal MemCTX g_context = {0};
 | 
			
		||||
 | 
			
		||||
internal Arena *get_arena(CTXDestBuffer buffer);
 | 
			
		||||
 | 
			
		||||
void wapp_mem_ctx_init(u64 main_buf_capacity, u64 temp_buf_capacity) {
 | 
			
		||||
  g_context.main_initialised =
 | 
			
		||||
      wapp_mem_arena_init(&g_context.main, main_buf_capacity);
 | 
			
		||||
  g_context.temp_initialised =
 | 
			
		||||
      wapp_mem_arena_init(&g_context.temp, temp_buf_capacity);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void *wapp_mem_ctx_alloc(CTXDestBuffer buffer, u64 size) {
 | 
			
		||||
  Arena *arena = get_arena(buffer);
 | 
			
		||||
  if (!arena) {
 | 
			
		||||
    return NULL;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  return wapp_mem_arena_alloc(arena, size);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void *wapp_mem_ctx_alloc_aligned(CTXDestBuffer buffer, u64 size,
 | 
			
		||||
                                 u64 alignment) {
 | 
			
		||||
  Arena *arena = get_arena(buffer);
 | 
			
		||||
  if (!arena) {
 | 
			
		||||
    return NULL;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  return wapp_mem_arena_alloc_aligned(arena, size, alignment);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void wapp_mem_ctx_clear(CTXDestBuffer buffer) {
 | 
			
		||||
  Arena *arena = get_arena(buffer);
 | 
			
		||||
  if (!arena) {
 | 
			
		||||
    return;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  wapp_mem_arena_clear(arena);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void wapp_mem_ctx_free(void) {
 | 
			
		||||
  wapp_mem_arena_free(&(g_context.main));
 | 
			
		||||
  g_context.main_initialised = false;
 | 
			
		||||
 | 
			
		||||
  wapp_mem_arena_free(&(g_context.temp));
 | 
			
		||||
  g_context.temp_initialised = false;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
internal Arena *get_arena(CTXDestBuffer buffer) {
 | 
			
		||||
  Arena *output = NULL;
 | 
			
		||||
 | 
			
		||||
  switch (buffer) {
 | 
			
		||||
  case CTX_DEST_BUFFER_MAIN:
 | 
			
		||||
    if (g_context.main_initialised) {
 | 
			
		||||
      output = g_context.main;
 | 
			
		||||
    }
 | 
			
		||||
    break;
 | 
			
		||||
  case CTX_DEST_BUFFER_TEMP:
 | 
			
		||||
    if (g_context.temp_initialised) {
 | 
			
		||||
      output = g_context.temp;
 | 
			
		||||
    }
 | 
			
		||||
    break;
 | 
			
		||||
  default:
 | 
			
		||||
    assert(false && "Not all context destination buffers are handled");
 | 
			
		||||
    break;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  return output;
 | 
			
		||||
}
 | 
			
		||||
		Reference in New Issue
	
	Block a user