Embedded/lwmem
1
0
Fork 0
mirror of https://github.com/MaJerle/lwmem.git synced 2025-01-13 21:42:53 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/MaJerle/lwmem into develop

Browse Source
This commit is contained in:
Tilen Majerle 2020-10-12 19:53:29 +02:00
commit 8e8cf0489e
2 changed files with 43 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lwmem/src/include/lwmem/lwmem.h
View File

@ -99,9 +99,11 @@ void* lwmem_realloc_ex(lwmem_t* const lw, const lwmem_region_t* region
unsigned char lwmem_realloc_s_ex(lwmem_t* const lw, const lwmem_region_t* region, void** const ptr, const size_t size);
void lwmem_free_ex(lwmem_t* const lw, void* const ptr);
void lwmem_free_s_ex(lwmem_t* const lw, void** const ptr);
size_t lwmem_get_size_ex(lwmem_t* const lw, void* ptr);
/**
* \note This is a wrapper for \ref lwmem_assignmem_ex function
* \note This is a wrapper for \ref lwmem_assignmem_ex function.
* It operates in default LwMEM instance and uses first available region for memory operations
* \param[in] regions: Array of regions with address and its size.
* Regions must be in increasing order (start address) and must not overlap in-between
* \param[in] len: Number of regions in array
@ -124,7 +126,8 @@ void lwmem_free_s_ex(lwmem_t* const lw, void** const ptr);
#define lwmem_calloc(nitems, size) lwmem_calloc_ex(NULL, NULL, (nitems), (size))
/**
* \note This is a wrapper for \ref lwmem_realloc_ex function
* \note This is a wrapper for \ref lwmem_realloc_ex function.
* It operates in default LwMEM instance and uses first available region for memory operations
* \param[in] ptr: Memory block previously allocated with one of allocation functions.
* It may be set to `NULL` to create new clean allocation
* \param[in] size: Size of new memory to reallocate
@ -132,7 +135,8 @@ void lwmem_free_s_ex(lwmem_t* const lw, void** const ptr);
#define lwmem_realloc(ptr, size) lwmem_realloc_ex(NULL, NULL, (ptr), (size))
/**
* \note This is a wrapper for \ref lwmem_realloc_s_ex function
* \note This is a wrapper for \ref lwmem_realloc_s_ex function.
* It operates in default LwMEM instance and uses first available region for memory operations
* \param[in] ptrptr: Pointer to pointer to allocated memory. Must not be set to `NULL`.
* If reallocation is successful, it modified where pointer points to,
* or sets it to `NULL` in case of `free` operation
@ -141,18 +145,28 @@ void lwmem_free_s_ex(lwmem_t* const lw, void** const ptr);
#define lwmem_realloc_s(ptrptr, size) lwmem_realloc_s_ex(NULL, NULL, (ptrptr), (size))
/**
* \note This is a wrapper for \ref lwmem_free_ex function
* \note This is a wrapper for \ref lwmem_free_ex function.
* It operates in default LwMEM instance and uses first available region for memory operations
* \param[in] ptr: Memory to free. `NULL` pointer is valid input
*/
#define lwmem_free(ptr) lwmem_free_ex(NULL, (ptr))
/**
* \note This is a wrapper for \ref lwmem_free_s_ex function
* \note This is a wrapper for \ref lwmem_free_s_ex function.
* It operates in default LwMEM instance and uses first available region for memory operations
* \param[in] ptrptr: Pointer to pointer to allocated memory.
* When set to non `NULL`, pointer is freed and set to `NULL`
*/
#define lwmem_free_s(ptrptr) lwmem_free_s_ex(NULL, (ptrptr))
/**
* \note This is a wrapper for \ref lwmem_get_size_ex function.
* It operates in default LwMEM instance and uses first available region for memory operations
* \param[in] ptr: Pointer to allocated memory
* \return Block size for user in units of bytes
*/
#define lwmem_get_size(ptr) lwmem_get_size(NULL, (ptr))
#if defined(LWMEM_DEV) && !__DOXYGEN__
unsigned char lwmem_debug_create_regions(lwmem_region_t** regs_out, size_t count, size_t size);
void lwmem_debug_save_state(void);
@ -169,4 +183,4 @@ void lwmem_debug_print(unsigned char print_alloc, unsigned char print_free);
}
#endif /* __cplusplus */
#endif /* LWMEM_HDR_H */
#endif /* LWMEM_HDR_H */

23
lwmem/src/lwmem/lwmem.c
View File

@ -902,6 +902,29 @@ lwmem_free_s_ex(lwmem_t* const lw, void** const ptr) {
}
}
/**
* \brief Get user size of allocated memory
* \param[in] lw: LwMEM instance. Set to `NULL` to use default instance.
* Instance must be the same as used during allocation procedure
* \param[in] ptr: Pointer to allocated memory
* \return Block size for user in units of bytes
*/
size_t
lwmem_get_size_ex(lwmem_t* const lw, void* ptr) {
lwmem_block_t* block;
uint32_t len = 0;
if (ptr != NULL) {
LWMEM_PROTECT(lw);
block = LWMEM_GET_BLOCK_FROM_PTR(ptr);
if (LWMEM_BLOCK_IS_ALLOC(block)) {
len = (block->size & ~LWMEM_ALLOC_BIT) - LWMEM_BLOCK_META_SIZE;
}
LWMEM_UNPROTECT(lw);
}
return len;
}
/* Part of library used ONLY for LWMEM_DEV purposes */
/* To validate and test library */