pdxx
/
libfastcommon
mirror of https://github.com/happyfish100/libfastcommon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fast_allocator.c adapt fast_mblock_malloc_trunk_notify_func

fstore_storage_engine
YuQing 2023-05-15 15:10:01 +08:00
parent c00a159fd3
commit 0806435fcc
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HISTORY
View File

@ -1,9 +1,10 @@
Version 1.66 2023-05-08 Version 1.66 2023-05-15
* struct fast_task_info add field: notify_next for nio notify queue * struct fast_task_info add field: notify_next for nio notify queue
* lc_pair in struct fc_queue change to lcp * lc_pair in struct fc_queue change to lcp
* sorted queue use double link chain for quick push * sorted queue use double link chain for quick push
* add function uniq_skiplist_clear * add function uniq_skiplist_clear
* fast_mblock_malloc_trunk_notify_func prototype changed
Version 1.65 2023-01-09 Version 1.65 2023-01-09
* locked_list.h: add functions locked_list_move and locked_list_move_tail * locked_list.h: add functions locked_list_move and locked_list_move_tail

24
src/fast_allocator.c
View File

@ -55,17 +55,19 @@ static int fast_allocator_malloc_trunk_check(const int alloc_bytes, void *args)
acontext->allocator_array.malloc_bytes_limit ? 0 : EOVERFLOW; acontext->allocator_array.malloc_bytes_limit ? 0 : EOVERFLOW;
} }
static void fast_allocator_malloc_trunk_notify_func(const int alloc_bytes, void *args) static void fast_allocator_malloc_trunk_notify_func(
const enum fast_mblock_notify_type type,
const struct fast_mblock_malloc *node, void *args)
{ {
if (alloc_bytes > 0) if (type == fast_mblock_notify_type_alloc)
{ {
__sync_add_and_fetch(&((struct fast_allocator_context *)args)-> __sync_add_and_fetch(&((struct fast_allocator_context *)args)->
allocator_array.malloc_bytes, alloc_bytes); allocator_array.malloc_bytes, node->trunk_size);
} }
else else
{ {
__sync_sub_and_fetch(&((struct fast_allocator_context *)args)-> __sync_sub_and_fetch(&((struct fast_allocator_context *)args)->
allocator_array.malloc_bytes, -1 * alloc_bytes); allocator_array.malloc_bytes, node->trunk_size);
} }
} }
@ -459,6 +461,15 @@ int fast_allocator_retry_reclaim(struct fast_allocator_context *acontext,
return *total_reclaim_bytes > 0 ? 0 : EAGAIN; return *total_reclaim_bytes > 0 ? 0 : EAGAIN;
} }
static inline void malloc_trunk_notify(
const enum fast_mblock_notify_type type,
const int alloc_bytes, void *args)
{
struct fast_mblock_malloc node;
node.trunk_size = alloc_bytes;
fast_allocator_malloc_trunk_notify_func(type, &node, args);
}
void *fast_allocator_alloc(struct fast_allocator_context *acontext, void *fast_allocator_alloc(struct fast_allocator_context *acontext,
const int bytes) const int bytes)
{ {
@ -512,7 +523,8 @@ void *fast_allocator_alloc(struct fast_allocator_context *acontext,
{ {
return NULL; return NULL;
} }
fast_allocator_malloc_trunk_notify_func(alloc_bytes, acontext); malloc_trunk_notify(fast_mblock_notify_type_alloc,
alloc_bytes, acontext);
obj = (char *)ptr + sizeof(struct fast_allocator_wrapper); obj = (char *)ptr + sizeof(struct fast_allocator_wrapper);
if (acontext->allocator_array.allocators[0]->mblock. if (acontext->allocator_array.allocators[0]->mblock.
@ -576,7 +588,7 @@ void fast_allocator_free(struct fast_allocator_context *acontext, void *obj)
} }
else else
{ {
fast_allocator_malloc_trunk_notify_func(-1 * malloc_trunk_notify(fast_mblock_notify_type_reclaim,
pWrapper->alloc_bytes, acontext); pWrapper->alloc_bytes, acontext);
if (acontext->allocator_array.allocators[0]->mblock. if (acontext->allocator_array.allocators[0]->mblock.