michaelh/zephyr
1
0
Fork 0
Code Releases Activity

kernel: memslab: Add maximum mem_slab utilization trace

Browse source 
Add new function to mem_slab API that enables user
to get maximum number of slabs used so far.

Signed-off-by: Kamil Lazowski <Kamil.Lazowski@nordicsemi.no>
This commit is contained in:
Kamil Lazowski 2020-09-11 14:27:55 +02:00 • committed by Anas Nashif
commit 104f100749
4 changed files with 40 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/reference/kernel/memory/slabs.rst
View file

@ -139,7 +139,7 @@ Configuration Options
Related configuration options: Related configuration options:
* None * :option:`CONFIG_MEM_SLAB_TRACE_MAX_UTILIZATION`
API Reference API Reference
************* *************

23
include/kernel.h
View file

@ -4260,6 +4260,9 @@ struct k_mem_slab {
char *buffer; char *buffer;
char *free_list; char *free_list;
uint32_t num_used; uint32_t num_used;
#ifdef CONFIG_MEM_SLAB_TRACE_MAX_UTILIZATION
uint32_t max_used;
#endif
_OBJECT_TRACING_NEXT_PTR(k_mem_slab) _OBJECT_TRACING_NEXT_PTR(k_mem_slab)
_OBJECT_TRACING_LINKED_FLAG _OBJECT_TRACING_LINKED_FLAG
@ -4388,6 +4391,26 @@ static inline uint32_t k_mem_slab_num_used_get(struct k_mem_slab *slab)
return slab->num_used; return slab->num_used;
} }
/**
* @brief Get the number of maximum used blocks so far in a memory slab.
*
* This routine gets the maximum number of memory blocks that were
* allocated in @a slab.
*
* @param slab Address of the memory slab.
*
* @return Maximum number of allocated memory blocks.
*/
static inline uint32_t k_mem_slab_max_used_get(struct k_mem_slab *slab)
{
#ifdef CONFIG_MEM_SLAB_TRACE_MAX_UTILIZATION
return slab->max_used;
#else
ARG_UNUSED(slab);
return 0;
#endif
}
/** /**
* @brief Get the number of unused blocks in a memory slab. * @brief Get the number of unused blocks in a memory slab.
* *

6
kernel/Kconfig
View file

@ -464,6 +464,12 @@ endmenu
menu "Other Kernel Object Options" menu "Other Kernel Object Options"
config MEM_SLAB_TRACE_MAX_UTILIZATION
bool "Enable getting maximum slab utilization"
help
This adds variable to the k_mem_slab structure to hold
maximum utilization of the slab.
config NUM_MBOX_ASYNC_MSGS config NUM_MBOX_ASYNC_MSGS
int "Maximum number of in-flight asynchronous mailbox messages" int "Maximum number of in-flight asynchronous mailbox messages"
default 10 default 10

10
kernel/mem_slab.c
View file

@ -88,6 +88,11 @@ int k_mem_slab_init(struct k_mem_slab *slab, void *buffer,
slab->block_size = block_size; slab->block_size = block_size;
slab->buffer = buffer; slab->buffer = buffer;
slab->num_used = 0U; slab->num_used = 0U;
#ifdef CONFIG_MEM_SLAB_TRACE_MAX_UTILIZATION
slab->max_used = 0U;
#endif
rc = create_free_list(slab); rc = create_free_list(slab);
if (rc < 0) { if (rc < 0) {
goto out; goto out;
@ -111,6 +116,11 @@ int k_mem_slab_alloc(struct k_mem_slab *slab, void **mem, k_timeout_t timeout)
*mem = slab->free_list; *mem = slab->free_list;
slab->free_list = *(char **)(slab->free_list); slab->free_list = *(char **)(slab->free_list);
slab->num_used++; slab->num_used++;
#ifdef CONFIG_MEM_SLAB_TRACE_MAX_UTILIZATION
slab->max_used = MAX(slab->num_used, slab->max_used);
#endif
result = 0; result = 0;
} else if (K_TIMEOUT_EQ(timeout, K_NO_WAIT)) { } else if (K_TIMEOUT_EQ(timeout, K_NO_WAIT)) {
/* don't wait for a free block to become available */ /* don't wait for a free block to become available */