Commit 5e09d4b

kravantokh <kravantokh@noreply.codeberg.org>
2026-03-13 18:26:19
Rename MemArena to Arena.
main
1 parent 3bd866f
Changed files (5)
io
file.h
stream.h
memory
arenas.h
tests
main.c
types
string.h
io/file.h
@@ -20,7 +20,7 @@ enum FileOption {
 
 };
 
-status File_open( File* fout, const string *path, u64 file_options, MemArena scratch );
+status File_open( File* fout, const string *path, u64 file_options, Arena scratch );
 status File_close( File* f );
 
 status File_read( File *f, u64 *amount, u8 *out);
@@ -49,7 +49,7 @@ status File_write( File *f, u64 *amount, const u8 *in);
 			i32 fd;
 		};
 
-		status File_open( File *fout, const string *path, u64 file_options, MemArena scratch ) {
+		status File_open( File *fout, const string *path, u64 file_options, Arena scratch ) {
 			u8* path_c = 0;
 			PROPAGATE_ERROR( string_to_cstring( path, &scratch, &path_c ) );
io/stream.h
@@ -19,23 +19,23 @@ typedef struct _SinkGeneric{
 	status (*close)(void *self);
 } SinkGeneric;
 
-status Stream_into_arena( SourceGeneric *s, MemArena *a, u64 blocksize, u64 *amount_out );
+status Stream_into_arena( SourceGeneric *s, Arena *a, u64 blocksize, u64 *amount_out );
 
 
 #ifdef KC_IMPLEMENT
 
-	status Stream_into_arena( SourceGeneric *s, MemArena *a, u64 blocksize, u64 *amount_out ) {
+	status Stream_into_arena( SourceGeneric *s, Arena *a, u64 blocksize, u64 *amount_out ) {
 		*amount_out = 0;
 		u8* block = 0;
 		u64 read = blocksize;
 		status state;
 
-		PROPAGATE_ERROR( MemArena_take_amount( a, blocksize, &block ) );
+		PROPAGATE_ERROR( Arena_take_amount( a, blocksize, &block ) );
 
 		read = blocksize;
 		while( (state = s->consume(s->self, &read, block)) == STATUS_SUCCESS ) {
 			read = blocksize;
-			PROPAGATE_ERROR( MemArena_take_amount( a, blocksize, &block ) );
+			PROPAGATE_ERROR( Arena_take_amount( a, blocksize, &block ) );
 			*amount_out += read;
 		}
memory/arenas.h
@@ -10,26 +10,26 @@
 
 #define MEM_ARENA_ALIGNMENT (sizeof(void*))
 
-typedef struct _MemArena {
+typedef struct _Arena {
 	u8* start;
 	u8* end;
 	u8* top;
 	u8* last_commited;
-} MemArena;
+} Arena;
 
 
-status MemArena_create( MemArena *arena, u64 virtual_size );
-status MemArena_destroy( MemArena *arena );
+status Arena_create( Arena *arena, u64 virtual_size );
+status Arena_destroy( Arena *arena );
 
-MemArena MemArena_from( MemArena *arena ); /* Get a sub arena, with a new arena "frame" */
+Arena Arena_from( Arena *arena ); /* Get a sub arena, with a new arena "frame" */
 
-status MemArena_take_amount( MemArena *arena, u64 size, u8** out );
-#define MemArena_take( arena, type, count, out ) MemArena_take_amount( arena, (sizeof(type))*(count), out )
-status MemArena_give_amount( MemArena *arena, u64 size );
-#define MemArena_give( arena, type, count ) MemArena_give_amount( arena, (sizeof(type))*(count) )
+status Arena_take_amount( Arena *arena, u64 size, u8** out );
+#define Arena_take( arena, type, count, out ) Arena_take_amount( arena, (sizeof(type))*(count), out )
+status Arena_give_amount( Arena *arena, u64 size );
+#define Arena_give( arena, type, count ) Arena_give_amount( arena, (sizeof(type))*(count) )
 
-void MemArena_clear( MemArena *arena );
-status MemArena_uncommit_unused( MemArena *arena );
+void Arena_clear( Arena *arena );
+status Arena_uncommit_unused( Arena *arena );
 
 
 #ifdef KC_IMPLEMENT
@@ -41,7 +41,7 @@ status MemArena_uncommit_unused( MemArena *arena );
 		assert(arena->top <= arena->end); \
 		
 
-	status MemArena_create( MemArena *arena, u64 virtual_size ) {
+	status Arena_create( Arena *arena, u64 virtual_size ) {
 		status ret = STATUS_SUCCESS;
 
 		PROPAGATE_ERROR(kc_platform_mem_va_reserve( (void**)&arena->start, virtual_size ));
@@ -53,7 +53,7 @@ status MemArena_uncommit_unused( MemArena *arena );
 		return ret;
 	}
 
-	status MemArena_destroy( MemArena *arena ) {
+	status Arena_destroy( Arena *arena ) {
 		ASSERT_MEM_ARENA_IS_SANE(arena);
 
 		PROPAGATE_ERROR(kc_platform_mem_va_release( arena->start, arena->end - arena->start ));
@@ -63,9 +63,9 @@ status MemArena_uncommit_unused( MemArena *arena );
 		return STATUS_SUCCESS;
 	}
 
-	MemArena MemArena_from( MemArena *arena ) {
+	Arena Arena_from( Arena *arena ) {
 		ASSERT_MEM_ARENA_IS_SANE(arena);
-		return (MemArena) { 
+		return (Arena) { 
 			.start = arena->top,
 			.top = arena->top,
 			.end = arena->end,
@@ -73,7 +73,7 @@ status MemArena_uncommit_unused( MemArena *arena );
 		};
 	}
 
-	status MemArena_take_amount( MemArena *arena, u64 size, u8 **outptr ) {
+	status Arena_take_amount( Arena *arena, u64 size, u8 **outptr ) {
 		ASSERT_MEM_ARENA_IS_SANE(arena);
 		assert(size);
 
@@ -109,7 +109,7 @@ status MemArena_uncommit_unused( MemArena *arena );
 		return STATUS_SUCCESS;
 	}
 
-	status MemArena_give_amount( MemArena *arena, u64 size ) {
+	status Arena_give_amount( Arena *arena, u64 size ) {
 		ASSERT_MEM_ARENA_IS_SANE(arena);
 		assert(size);
 
@@ -127,7 +127,7 @@ status MemArena_uncommit_unused( MemArena *arena );
 		return STATUS_SUCCESS;
 	}
 
-	void MemArena_clear( MemArena *arena ) {
+	void Arena_clear( Arena *arena ) {
 		ASSERT_MEM_ARENA_IS_SANE(arena);
 
 		#if defined(KC_ZERO_MEMORY_STRICT)
@@ -137,7 +137,7 @@ status MemArena_uncommit_unused( MemArena *arena );
 		arena->top = arena->start;
 	}
 
-	status MemArena_uncommit_unused( MemArena *arena ) {
+	status Arena_uncommit_unused( Arena *arena ) {
 		ASSERT_MEM_ARENA_IS_SANE(arena);
tests/main.c
@@ -17,17 +17,17 @@ KC_TESTFUNC( test0,
 )
 
 int main(void) {
-	MemArena a;
-	MemArena scratch;
+	Arena a;
+	Arena scratch;
 
-	assert(OK( MemArena_create( &a, GiB(4) )) );
-	assert(OK( MemArena_create( &scratch, MiB(1) )) );
+	assert(OK( Arena_create( &a, GiB(4) )) );
+	assert(OK( Arena_create( &scratch, MiB(1) )) );
 
 	File f = {0};
 
 	STATIC_STRING( testfile_name, "./testfile" );
 
-	assert(OK( File_open( &f, (string*)&testfile_name, FILEOPTION_READ, MemArena_from( &scratch ) ) ));
+	assert(OK( File_open( &f, (string*)&testfile_name, FILEOPTION_READ, Arena_from( &scratch ) ) ));
 
 	SourceGeneric s = {0};
 
@@ -43,5 +43,5 @@ int main(void) {
 
 	assert(OK( File_close( &f ) ));
 
-	assert(OK(MemArena_destroy(&a)));
+	assert(OK(Arena_destroy(&a)));
 }
types/string.h
@@ -16,15 +16,15 @@ typedef struct _string {
 		u8  data[sizeof( str ) - 1] __attribute__( ( nonstring ) );          \
 	} varname = { .len = sizeof( str ) - 1, .data = str }
 
-status string_to_cstring( const string *str, MemArena *a, u8** out );
+status string_to_cstring( const string *str, Arena *a, u8** out );
 
 #ifdef KC_IMPLEMENT
 
-status string_to_cstring( const string *str, MemArena *a, u8** out ) {
+status string_to_cstring( const string *str, Arena *a, u8** out ) {
 	u8* c_str;
 	u64 l = str->len;
 
-	PROPAGATE_ERROR(MemArena_take( a, u8, l + 1, &c_str ));
+	PROPAGATE_ERROR(Arena_take( a, u8, l + 1, &c_str ));
 	mem_copy( &str->data[0], c_str, l );
 	c_str[l] = '\0';