From baa75999b6da2e49922f368cf3f03913449f673e Mon Sep 17 00:00:00 2001 From: blueloveTH Date: Sat, 15 Jun 2024 16:27:06 +0800 Subject: [PATCH] fix CI --- include/pocketpy/common/str.hpp | 1 + src/common/memorypool.c | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/include/pocketpy/common/str.hpp b/include/pocketpy/common/str.hpp index 9faa35f8..59ccccd7 100644 --- a/include/pocketpy/common/str.hpp +++ b/include/pocketpy/common/str.hpp @@ -9,6 +9,7 @@ #include #include +#include #include namespace pkpy { diff --git a/src/common/memorypool.c b/src/common/memorypool.c index ab5ef885..3a608a40 100644 --- a/src/common/memorypool.c +++ b/src/common/memorypool.c @@ -109,7 +109,7 @@ static bool MemoryPoolArena__full(MemoryPoolArena* self) { } static int MemoryPoolArena__total_bytes(MemoryPoolArena* self) { - return kPoolObjectBlockSize * kPoolObjectMaxBlocks; + return kPoolObjectArenaSize; } static int MemoryPoolArena__used_bytes(MemoryPoolArena* self) { @@ -241,56 +241,56 @@ static int FixedMemoryPool__total_bytes(FixedMemoryPool* self) { PK_THREAD_LOCAL FixedMemoryPool PoolExpr; PK_THREAD_LOCAL FixedMemoryPool PoolFrame; PK_THREAD_LOCAL MemoryPool PoolObject; -PK_THREAD_LOCAL bool initialized = false; +PK_THREAD_LOCAL bool _Pools_initialized = false; void Pools_initialize(){ - if(initialized) return; + if(_Pools_initialized) return; FixedMemoryPool__ctor(&PoolExpr, kPoolExprBlockSize, 64); FixedMemoryPool__ctor(&PoolFrame, kPoolFrameBlockSize, 128); MemoryPool__ctor(&PoolObject); - initialized = true; + _Pools_initialized = true; } void Pools_finalize(){ - if(!initialized) return; + if(!_Pools_initialized) return; FixedMemoryPool__dtor(&PoolExpr); FixedMemoryPool__dtor(&PoolFrame); MemoryPool__dtor(&PoolObject); - initialized = false; + _Pools_initialized = false; } void* PoolExpr_alloc() { - assert(initialized); + assert(_Pools_initialized); return FixedMemoryPool__alloc(&PoolExpr); } void PoolExpr_dealloc(void* p) { - assert(initialized); + assert(_Pools_initialized); FixedMemoryPool__dealloc(&PoolExpr, p); } void* PoolFrame_alloc() { - assert(initialized); + assert(_Pools_initialized); return FixedMemoryPool__alloc(&PoolFrame); } void PoolFrame_dealloc(void* p) { - assert(initialized); + assert(_Pools_initialized); FixedMemoryPool__dealloc(&PoolFrame, p); } void* PoolObject_alloc() { - assert(initialized); + assert(_Pools_initialized); return MemoryPool__alloc(&PoolObject); } void PoolObject_dealloc(void* p) { - assert(initialized); + assert(_Pools_initialized); MemoryPool__dealloc(&PoolObject, p); } void PoolObject_shrink_to_fit() { - assert(initialized); + assert(_Pools_initialized); MemoryPool__shrink_to_fit(&PoolObject); }