mirror of
https://github.com/odin-lang/Odin.git
synced 2026-01-06 21:17:40 +00:00
Remove need for BlockingMutex in Arena
This commit is contained in:
@@ -45,7 +45,7 @@ struct MemoryBlock {
|
||||
struct Arena {
|
||||
MemoryBlock * curr_block;
|
||||
isize minimum_block_size;
|
||||
BlockingMutex mutex;
|
||||
// BlockingMutex mutex;
|
||||
isize temp_count;
|
||||
Thread * parent_thread;
|
||||
};
|
||||
@@ -82,12 +82,7 @@ gb_internal void thread_init_arenas(Thread *t) {
|
||||
|
||||
gb_internal void *arena_alloc(Arena *arena, isize min_size, isize alignment) {
|
||||
GB_ASSERT(gb_is_power_of_two(alignment));
|
||||
|
||||
if (arena->parent_thread == nullptr) {
|
||||
mutex_lock(&arena->mutex);
|
||||
} else {
|
||||
GB_ASSERT(arena->parent_thread == get_current_thread());
|
||||
}
|
||||
GB_ASSERT(arena->parent_thread == get_current_thread());
|
||||
|
||||
isize size = 0;
|
||||
if (arena->curr_block != nullptr) {
|
||||
@@ -113,11 +108,7 @@ gb_internal void *arena_alloc(Arena *arena, isize min_size, isize alignment) {
|
||||
|
||||
curr_block->used += size;
|
||||
GB_ASSERT(curr_block->used <= curr_block->size);
|
||||
|
||||
if (arena->parent_thread == nullptr) {
|
||||
mutex_unlock(&arena->mutex);
|
||||
}
|
||||
|
||||
|
||||
// NOTE(bill): memory will be zeroed by default due to virtual memory
|
||||
return ptr;
|
||||
}
|
||||
|
||||
@@ -118,7 +118,7 @@ gb_internal isize ast_node_size(AstKind kind) {
|
||||
gb_internal Ast *alloc_ast_node(AstFile *f, AstKind kind) {
|
||||
isize size = ast_node_size(kind);
|
||||
|
||||
Ast *node = cast(Ast *)arena_alloc(&global_thread_local_ast_arena, size, 16);
|
||||
Ast *node = cast(Ast *)arena_alloc(get_arena(ThreadArena_Permanent), size, 16);
|
||||
node->kind = kind;
|
||||
node->file_id = f ? f->id : 0;
|
||||
|
||||
|
||||
@@ -878,10 +878,8 @@ gb_internal gb_inline bool is_ast_when_stmt(Ast *node) {
|
||||
return node->kind == Ast_WhenStmt;
|
||||
}
|
||||
|
||||
gb_global gb_thread_local Arena global_thread_local_ast_arena = {};
|
||||
|
||||
gb_internal gb_inline gbAllocator ast_allocator(AstFile *f) {
|
||||
return arena_allocator(&global_thread_local_ast_arena);
|
||||
return permanent_allocator();
|
||||
}
|
||||
|
||||
gb_internal Ast *alloc_ast_node(AstFile *f, AstKind kind);
|
||||
|
||||
Reference in New Issue
Block a user