From 9428f792ed598485add6aaf110fed56a9a63b540 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Thu, 12 Jan 2023 01:09:36 +0000 Subject: [PATCH] Comment out allocator guards for the time being --- src/common_memory.cpp | 7 +++++-- src/main.cpp | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/common_memory.cpp b/src/common_memory.cpp index c7382d6ff..7d5d1f27a 100644 --- a/src/common_memory.cpp +++ b/src/common_memory.cpp @@ -359,8 +359,11 @@ gb_internal gbAllocator temporary_allocator() { return arena_allocator(&temporary_arena); } -#define TEMPORARY_ALLOCATOR_GUARD() ArenaTempGuard GB_DEFER_3(_arena_guard_){&temporary_arena} -#define PERMANENT_ALLOCATOR_GUARD() ArenaTempGuard GB_DEFER_3(_arena_guard_){&permanent_arena} +#define TEMPORARY_ALLOCATOR_GUARD() +#define PERMANENT_ALLOCATOR_GUARD() + +// #define TEMPORARY_ALLOCATOR_GUARD() ArenaTempGuard GB_DEFER_3(_arena_guard_){&temporary_arena} +// #define PERMANENT_ALLOCATOR_GUARD() ArenaTempGuard GB_DEFER_3(_arena_guard_){&permanent_arena} diff --git a/src/main.cpp b/src/main.cpp index eacce253d..60f27a5a7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -16,7 +16,7 @@ gb_global ThreadPool global_thread_pool; gb_internal void init_global_thread_pool(void) { isize thread_count = gb_max(build_context.thread_count, 1); - isize worker_count = thread_count-1; + isize worker_count = thread_count; // +1 thread_pool_init(&global_thread_pool, permanent_allocator(), worker_count, "ThreadPoolWorker"); } gb_internal bool thread_pool_add_task(WorkerTaskProc *proc, void *data) {