[mem]When using SLAB, calls to memcheck and memtrace will be abnormal (#8862)

* [mem]When using SLAB, calls to memcheck and memtrace will be abnormal

* [mem]The memtrace printing system does not match the display
This commit is contained in:
wdfk-prog 2024-04-27 18:27:33 +08:00 committed by GitHub
parent d30c8b340e
commit 52ebdf6bdb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 17 additions and 4 deletions

View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2006-2022, RT-Thread Development Team * Copyright (c) 2006-2024, RT-Thread Development Team
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
* *
@ -565,9 +565,16 @@ static int memcheck(int argc, char *argv[])
object = rt_list_entry(node, struct rt_object, list); object = rt_list_entry(node, struct rt_object, list);
/* find the specified object */ /* find the specified object */
if (name != RT_NULL && rt_strncmp(name, object->name, RT_NAME_MAX) != 0) if (name != RT_NULL && rt_strncmp(name, object->name, RT_NAME_MAX) != 0)
{
continue; continue;
}
/* mem object */ /* mem object */
m = (struct rt_small_mem *)object; m = (struct rt_small_mem *)object;
if(rt_strncmp(m->parent.algorithm, "small", RT_NAME_MAX) != 0)
{
continue;
}
/* check mem */ /* check mem */
for (mem = (struct rt_small_mem_item *)m->heap_ptr; mem != m->heap_end; mem = (struct rt_small_mem_item *)&m->heap_ptr[mem->next]) for (mem = (struct rt_small_mem_item *)m->heap_ptr; mem != m->heap_end; mem = (struct rt_small_mem_item *)&m->heap_ptr[mem->next])
{ {
@ -611,15 +618,21 @@ static int memtrace(int argc, char **argv)
object = rt_list_entry(node, struct rt_object, list); object = rt_list_entry(node, struct rt_object, list);
/* find the specified object */ /* find the specified object */
if (name != RT_NULL && rt_strncmp(name, object->name, RT_NAME_MAX) != 0) if (name != RT_NULL && rt_strncmp(name, object->name, RT_NAME_MAX) != 0)
{
continue; continue;
}
/* mem object */ /* mem object */
m = (struct rt_small_mem *)object; m = (struct rt_small_mem *)object;
if(rt_strncmp(m->parent.algorithm, "small", RT_NAME_MAX) != 0)
{
continue;
}
/* show memory information */ /* show memory information */
rt_kprintf("\nmemory heap address:\n"); rt_kprintf("\nmemory heap address:\n");
rt_kprintf("name : %s\n", m->parent.parent.name); rt_kprintf("name : %s\n", m->parent.parent.name);
rt_kprintf("total : 0x%d\n", m->parent.total); rt_kprintf("total : %d\n", m->parent.total);
rt_kprintf("used : 0x%d\n", m->parent.used); rt_kprintf("used : %d\n", m->parent.used);
rt_kprintf("max_used: 0x%d\n", m->parent.max); rt_kprintf("max_used: %d\n", m->parent.max);
rt_kprintf("heap_ptr: 0x%08x\n", m->heap_ptr); rt_kprintf("heap_ptr: 0x%08x\n", m->heap_ptr);
rt_kprintf("lfree : 0x%08x\n", m->lfree); rt_kprintf("lfree : 0x%08x\n", m->lfree);
rt_kprintf("heap_end: 0x%08x\n", m->heap_end); rt_kprintf("heap_end: 0x%08x\n", m->heap_end);