laentropia/Arena
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor-xmake #2

Merged
laentropia merged 5 commits from refactor-xmake into main 2026-06-10 10:30:26 -06:00
Conversation 0 Commits 5 Files Changed 9 +142 -260
8 changed files with 142 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 203b60cf65 - Show all commits

6
.gitignore vendored
View File

@@ -7,6 +7,12 @@ out/
out/Debug/ out/Debug/
out/Release/ out/Release/
# xmake
xmake/
xmake/*
.xmake
.xmake/*
# Cmake files # Cmake files
CMakeCache.txt CMakeCache.txt
CMakeFiles/ CMakeFiles/

97
CMakeLists.txt
View File

@@ -1,97 +0,0 @@
cmake_minimum_required(VERSION 3.20)
project(
arena
VERSION 1.0
LANGUAGES C)
# ------------------------------------------------
# C standard — no compiler extensions
# ------------------------------------------------
set(CMAKE_C_STANDARD 11)
set(CMAKE_C_STANDARD_REQUIRED ON)
set(CMAKE_C_EXTENSIONS OFF)
# Export compile_commands.json (clangd / IDEs)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
# ------------------------------------------------
# Is this the root project or embedded (CPM / FetchContent)?
# ------------------------------------------------
if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
set(ARENA_IS_TOP_LEVEL ON)
else()
set(ARENA_IS_TOP_LEVEL OFF)
endif()
# ------------------------------------------------
# Options
# ------------------------------------------------
option(ARENA_BUILD_TESTS "Build arena tests" ${ARENA_IS_TOP_LEVEL})
option(ARENA_BUILD_EXAMPLE "Build arena example" ${ARENA_IS_TOP_LEVEL})
option(ARENA_ENABLE_INSTALL "Install arena" ${ARENA_IS_TOP_LEVEL})
option(ARENA_ENABLE_SANITIZERS "Enable Address Sanitizer in tests" ON)
# ------------------------------------------------
# Portable warning flags
# ------------------------------------------------
if(MSVC)
set(ARENA_WARNING_FLAGS /W4)
else()
set(ARENA_WARNING_FLAGS -Wall -Wextra -Wpedantic)
endif()
# ================================================================
# LIBRARY
# ================================================================
add_library(arena src/arena.c)
# Namespaced alias → consumers can write arena::arena
add_library(arena::arena ALIAS arena)
target_include_directories(
arena PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include>)
# Propagate C11 requirement to consumers
target_compile_features(arena PUBLIC c_std_11)
# Warnings only for the lib itself, not propagated
target_compile_options(arena PRIVATE ${ARENA_WARNING_FLAGS})
# ================================================================
# EXAMPLE (optional, only when top-level)
# ================================================================
if(ARENA_BUILD_EXAMPLE)
add_executable(arena_example src/main.c)
target_link_libraries(arena_example PRIVATE arena)
endif()
# ================================================================
# TESTS
# ================================================================
if(ARENA_BUILD_TESTS)
enable_testing()
add_subdirectory(test)
endif()
# ================================================================
# INSTALL
# ================================================================
if(ARENA_ENABLE_INSTALL)
include(GNUInstallDirs)
install(
TARGETS arena
EXPORT arenaTargets
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
install(
EXPORT arenaTargets
FILE arenaTargets.cmake
NAMESPACE arena::
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/arena)
endif()

6
include/arena.h → include/lae_arena.h
View File

@@ -1,5 +1,5 @@
#ifndef ARENA_H #ifndef LAE_ARENA_H
#define ARENA_H #define LAE_ARENA_H
#include <inttypes.h> #include <inttypes.h>
#include <stdbool.h> #include <stdbool.h>
@@ -61,4 +61,4 @@ ArenaSizeResult arena_get_align_padding(Arena* arena, size_t alignment);
// I shouldn't cover. // I shouldn't cover.
ArenaErr arena_ensure_capacity(Arena* arena, size_t size, size_t alignment); ArenaErr arena_ensure_capacity(Arena* arena, size_t size, size_t alignment);
#endif // !ARENA_H #endif // !RENA_H

27
src/arena.c → src/lae_arena.c
View File

@@ -1,4 +1,4 @@
#include "arena.h" #include "lae_arena.h"
#include <stdbool.h> #include <stdbool.h>
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
@@ -11,7 +11,6 @@ struct Arena {
size_t offset; size_t offset;
}; };
ArenaErr arena_init(Arena** arena, size_t capacity) { ArenaErr arena_init(Arena** arena, size_t capacity) {
if (arena == NULL) { if (arena == NULL) {
return ARENA_NULL_ARG; return ARENA_NULL_ARG;
@@ -85,13 +84,16 @@ ArenaPointer arena_alloc(Arena *arena, size_t size, size_t alignment) {
} }
if (arena->offset > SIZE_MAX - padding.val - size) { if (arena->offset > SIZE_MAX - padding.val - size) {
return (ArenaPointer) {.is_valid = false, .err = ARENA_CAPACITY_OVERFLOW}; return (ArenaPointer){.is_valid = false,
.err = ARENA_CAPACITY_OVERFLOW};
} }
size_t aligned_offset = arena->offset + padding.val; size_t aligned_offset = arena->offset + padding.val;
arena->offset = aligned_offset + size; arena->offset = aligned_offset + size;
return (ArenaPointer) {.is_valid = true, .offset = aligned_offset, .arena = arena}; return (ArenaPointer){.is_valid = true,
.offset = aligned_offset,
.arena = arena};
} }
ArenaErr arena_ensure_capacity(Arena* arena, size_t size, size_t alignment) { ArenaErr arena_ensure_capacity(Arena* arena, size_t size, size_t alignment) {
@@ -150,7 +152,8 @@ ArenaErr arena_ensure_capacity(Arena *arena, size_t size, size_t alignment) {
} }
} }
ArenaPointer arena_push(Arena *arena, void *data, size_t size, size_t alignment) { ArenaPointer
arena_push(Arena* arena, void* data, size_t size, size_t alignment) {
if (arena == NULL || data == NULL) { if (arena == NULL || data == NULL) {
return (ArenaPointer){.is_valid = false, .err = ARENA_NULL_ARG}; return (ArenaPointer){.is_valid = false, .err = ARENA_NULL_ARG};
} }
@@ -173,10 +176,7 @@ ArenaPointer arena_push(Arena *arena, void *data, size_t size, size_t alignment)
return pointer; return pointer;
} }
memcpy( memcpy(arena_unwrap_pointer(pointer), data, size);
arena_unwrap_pointer(pointer),
data,
size);
return pointer; return pointer;
} }
@@ -200,8 +200,6 @@ ArenaErr arena_realloc(Arena *arena, size_t new_capacity) {
return ARENA_OK; return ARENA_OK;
} }
ArenaSizeResult arena_get_align_padding(Arena* arena, size_t alignment) { ArenaSizeResult arena_get_align_padding(Arena* arena, size_t alignment) {
if (arena == NULL) { if (arena == NULL) {
return (ArenaSizeResult){.is_valid = false, .err = ARENA_NULL_ARG}; return (ArenaSizeResult){.is_valid = false, .err = ARENA_NULL_ARG};
@@ -216,10 +214,7 @@ ArenaSizeResult arena_get_align_padding(Arena *arena, size_t alignment) {
size_t mask = alignment - 1; size_t mask = alignment - 1;
size_t padding = (size_t)(-current_address) & mask; size_t padding = (size_t)(-current_address) & mask;
return (ArenaSizeResult){ return (ArenaSizeResult){.is_valid = true, .val = padding};
.is_valid = true,
.val = padding
};
} }
void* arena_unwrap_pointer(ArenaPointer p) { void* arena_unwrap_pointer(ArenaPointer p) {
@@ -228,5 +223,3 @@ void *arena_unwrap_pointer(ArenaPointer p) {
} }
return p.arena->buffer + p.offset; return p.arena->buffer + p.offset;
} }

2
src/main.c
View File

@@ -1,4 +1,4 @@
#include "arena.h" #include "lae_arena.h"
#include <stdlib.h> #include <stdlib.h>
int main(void) { int main(void) {

107
test/CMakeLists.txt
View File

@@ -1,107 +0,0 @@
# ================================================================
# FIND CMOCKA (system → FetchContent as fallback)
# ================================================================
find_package(cmocka QUIET)
if(NOT cmocka_FOUND)
message(
STATUS "[arena] cmocka not found on system — fetching with FetchContent...")
include(FetchContent)
FetchContent_Declare(
cmocka
GIT_REPOSITORY https://git.cryptomilk.org/projects/cmocka.git
GIT_TAG cmocka-1.1.7
GIT_SHALLOW TRUE)
# Static lib only, no cmocka examples or self-tests
set(WITH_STATIC_LIB
ON
CACHE BOOL "" FORCE)
set(WITH_SHARED_LIB
OFF
CACHE BOOL "" FORCE)
set(WITH_CMOCKERY_SUPPORT
OFF
CACHE BOOL "" FORCE)
set(WITH_EXAMPLES
OFF
CACHE BOOL "" FORCE)
set(UNIT_TESTING
OFF
CACHE BOOL "" FORCE)
set(PICKY_DEVELOPER
OFF
CACHE BOOL "" FORCE)
FetchContent_MakeAvailable(cmocka)
# Normalize the target name (varies across cmocka versions)
if(NOT TARGET cmocka::cmocka)
if(TARGET cmocka-static)
add_library(cmocka::cmocka ALIAS cmocka-static)
elseif(TARGET cmocka)
add_library(cmocka::cmocka ALIAS cmocka)
else()
message(
WARNING
"[arena] Could not create cmocka::cmocka target — skipping tests.")
return()
endif()
endif()
endif()
# ================================================================
# DETECT ADDRESS SANITIZER SUPPORT
# ================================================================
set(ARENA_USE_ASAN OFF)
if(ARENA_ENABLE_SANITIZERS)
if(MSVC)
if(MSVC_VERSION GREATER_EQUAL 1928)
set(ARENA_USE_ASAN ON)
else()
message(STATUS "[arena] MSVC < 16.9: ASAN not available.")
endif()
elseif(CMAKE_C_COMPILER_ID MATCHES "GNU|Clang" AND NOT WIN32)
include(CheckCCompilerFlag)
check_c_compiler_flag(-fsanitize=address ARENA_COMPILER_HAS_ASAN)
if(ARENA_COMPILER_HAS_ASAN)
set(ARENA_USE_ASAN ON)
else()
message(STATUS "[arena] Compiler does not support -fsanitize=address.")
endif()
else()
message(STATUS "[arena] Unknown platform/compiler — ASAN skipped.")
endif()
if(ARENA_USE_ASAN)
message(STATUS "[arena] Address Sanitizer enabled.")
endif()
endif()
# ================================================================
# TEST EXECUTABLE
# ================================================================
add_executable(test_arena test_arena.c)
target_link_libraries(test_arena PRIVATE arena cmocka::cmocka)
target_compile_features(test_arena PRIVATE c_std_11)
# Apply ASAN flags per compiler
if(ARENA_USE_ASAN)
if(MSVC)
target_compile_options(test_arena PRIVATE /fsanitize=address)
else()
target_compile_options(test_arena PRIVATE -fsanitize=address
-fno-omit-frame-pointer)
target_link_options(test_arena PRIVATE -fsanitize=address)
endif()
endif()
# ================================================================
# CTEST REGISTRATION
# ================================================================
add_test(NAME arena_tests COMMAND test_arena)
set_tests_properties(arena_tests PROPERTIES TIMEOUT 30)

2
test/test_arena.c
View File

@@ -9,7 +9,7 @@
#include <string.h> #include <string.h>
#include <limits.h> #include <limits.h>
#include "arena.h" #include "lae_arena.h"
static void test_push_3_ints(void **state) { static void test_push_3_ints(void **state) {
(void) state; (void) state;

87
xmake.lua Normal file
View File

@@ -0,0 +1,87 @@
set_project("lae_arena")
set_version("1.0.0")
set_languages("c11")
add_rules("mode.debug", "mode.release")
-- clang compile commands
add_rules("plugin.compile_commands.autoupdate")
-- =========================================================
-- Options
-- =========================================================
option("tests")
set_default(false)
set_showmenu(true)
option_end()
option("example")
set_default(false)
set_showmenu(true)
option_end()
option("asan")
set_default(false)
set_showmenu(true)
option_end()
-- =========================================================
-- Packages
-- =========================================================
add_requires("cmocka", { optional = true }) -- For tests
-- =========================================================
-- Library
-- =========================================================
target("lae_arena")
set_kind("static")
add_files("src/lae_arena.c")
add_headerfiles("include/*.h")
add_includedirs("include", { public = true })
if is_mode("debug") then
add_cflags("-Wall", "-Wextra", "-Wpedantic")
end
-- =========================================================
-- Example executable
-- =========================================================
if has_config("example") then
target("example")
set_kind("binary")
add_files("src/main.c")
add_deps("lae_arena")
end
-- =========================================================
-- Tests
-- =========================================================
if has_config("tests") then
target("test_arena")
set_kind("binary")
add_files("test/test_arena.c")
add_deps("lae_arena")
add_packages("cmocka")
add_tests("default")
if has_config("asan") then
add_cflags("-fsanitize=address", "-fno-omit-frame-pointer", { force = true })
add_ldflags("-fsanitize=address", { force = true })
end
end