Imagelibrary/tlsf
1
0
Fork 0
mirror of https://github.com/espressif/tlsf.git synced 2025-12-26 01:07:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/block_allocation_size' into 'idf'

Browse Source 
Fix block allocation size

See merge request espressif/tlsf!12
This commit is contained in:
Guillaume Souchere
2024-08-09 15:56:53 +08:00
parent 36e304a5d4 c499512eed
commit ea82911f4c
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tlsf.c
View File

@@ -280,14 +280,14 @@ static inline __attribute__((always_inline)) void mapping_insert(control_t* cont
} }
/* This version rounds up to the next block size (for allocations) */ /* This version rounds up to the next block size (for allocations) */
static inline __attribute__((always_inline)) void mapping_search(control_t* control, size_t size, int* fli, int* sli) static inline __attribute__((always_inline)) void mapping_search(control_t* control, size_t* size, int* fli, int* sli)
{ {
if (size >= control->small_block_size) if (*size >= control->small_block_size)
{ {
const size_t round = (1 << (tlsf_fls_sizet(size) - control->sl_index_count_log2)) - 1; const size_t round = (1 << (tlsf_fls_sizet(*size) - control->sl_index_count_log2));
size += round; *size = align_up(*size, round);
} }
mapping_insert(control, size, fli, sli); mapping_insert(control, *size, fli, sli);
} }
static inline __attribute__((always_inline)) block_header_t* search_suitable_block(control_t* control, int* fli, int* sli) static inline __attribute__((always_inline)) block_header_t* search_suitable_block(control_t* control, int* fli, int* sli)
@@ -540,12 +540,12 @@ static inline __attribute__((always_inline)) block_header_t* block_trim_free_lea
return remaining_block; return remaining_block;
} }
static inline __attribute__((always_inline)) block_header_t* block_locate_free(control_t* control, size_t size) static inline __attribute__((always_inline)) block_header_t* block_locate_free(control_t* control, size_t* size)
{ {
int fl = 0, sl = 0; int fl = 0, sl = 0;
block_header_t* block = 0; block_header_t* block = 0;
if (size) if (*size)
{ {
mapping_search(control, size, &fl, &sl); mapping_search(control, size, &fl, &sl);
@@ -563,7 +563,7 @@ static inline __attribute__((always_inline)) block_header_t* block_locate_free(c
if (block) if (block)
{ {
tlsf_assert(block_size(block) >= size); tlsf_assert(block_size(block) >= *size);
remove_free_block(control, block, fl, sl); remove_free_block(control, block, fl, sl);
} }
@@ -1011,8 +1011,14 @@ pool_t tlsf_get_pool(tlsf_t tlsf)
void* tlsf_malloc(tlsf_t tlsf, size_t size) void* tlsf_malloc(tlsf_t tlsf, size_t size)
{ {
control_t* control = tlsf_cast(control_t*, tlsf); control_t* control = tlsf_cast(control_t*, tlsf);
const size_t adjust = adjust_request_size(tlsf, size, ALIGN_SIZE); size_t adjust = adjust_request_size(tlsf, size, ALIGN_SIZE);
block_header_t* block = block_locate_free(control, adjust); // Returned size is 0 when the requested size is larger than the max block
// size.
if (adjust == 0) {
return NULL;
}
// block_locate_free() may adjust our allocated size further.
block_header_t* block = block_locate_free(control, &adjust);
return block_prepare_used(control, block, adjust); return block_prepare_used(control, block, adjust);
} }
@@ -1138,9 +1144,9 @@ void* tlsf_memalign_offs(tlsf_t tlsf, size_t align, size_t size, size_t data_off
** alignment constraint. Thus, the gap is not required. ** alignment constraint. Thus, the gap is not required.
** If we requested 0 bytes, return null, as tlsf_malloc(0) does. ** If we requested 0 bytes, return null, as tlsf_malloc(0) does.
*/ */
const size_t aligned_size = (adjust && align > ALIGN_SIZE) ? size_with_gap : adjust; size_t aligned_size = (adjust && align > ALIGN_SIZE) ? size_with_gap : adjust;
block_header_t* block = block_locate_free(control, aligned_size); block_header_t* block = block_locate_free(control, &aligned_size);
/* This can't be a static assert. */ /* This can't be a static assert. */
tlsf_assert(sizeof(block_header_t) == block_size_min + block_header_overhead); tlsf_assert(sizeof(block_header_t) == block_size_min + block_header_overhead);