分离内存分配接口与内存分配算法 #5175

enkiller · 2021-10-14T03:37:35Z

拉取/合并请求描述：(PR description)

[

改动的原因

实际使用中，存在使用多种算法管理不同内存的情况，需要将算法分离出来单独使用
内存接口中使用信号量作为线程锁不好，修改锁的类型可配置

核心改动

mem/slab 全局定义改成结构体，放到 rtdef.h 中
mem/slab 内存分配算法的接口更名，放到 rtthread.h 公共使用
移除 memheap 中 rt_malloc/rt_free 等相关接口
rt_malloc/rt_free 相关接口放到 kservice.c 中实现
memheap 分配算法支持最佳分配模式

影响

rtconfig.h 需要全部更新
单实例更改为多实例，改动较大，可能改出问题

测试用例

编写中...

mem.c
memheap.c
slab.c

]

以下的内容不应该在提交PR时的message修改，修改下述message，PR会被直接关闭。请在提交PR后，浏览器查看PR并对以下检查项逐项check，没问题后逐条在页面上打钩。
The following content must not be changed in the submitted PR message. Otherwise, the PR will be closed immediately. After submitted PR, please use a web browser to visit PR, and check items one by one, and ticked them if no problem.

当前拉取/合并请求的状态 Intent for your PR

必须选择一项 Choose one (Mandatory):

本拉取/合并请求是一个草稿版本 This PR is for a code-review and is intended to get feedback
本拉取/合并请求是一个成熟版本 This PR is mature, and ready to be integrated into the repo

代码质量 Code Quality：

我在这个拉取/合并请求中已经考虑了 As part of this pull request, I've considered the following:

已经仔细查看过代码改动的对比 Already check the difference between PR and old code
代码风格正确，包括缩进空格，命名及其他风格 Style guide is adhered to, including spacing, naming and other styles
没有垃圾代码，代码尽量精简，不包含#if 0代码，不包含已经被注释了的代码 All redundant code is removed and cleaned up
所有变更均有原因及合理的，并且不会影响到其他软件组件代码或BSP All modifications are justified and not affect other components or BSP
对难懂代码均提供对应的注释 I've commented appropriately where code is tricky
本拉取/合并请求代码是高质量的 Code in this PR is of high quality
本拉取/合并使用formatting等源码格式化工具确保格式符合RT-Thread代码规范 This PR complies with RT-Thread code specification

CLAassistant · 2021-10-14T03:37:39Z

All committers have signed the CLA.

enkiller · 2021-11-29T07:16:42Z

@BernardXiong 在 拉取/合并请求描述 有描述改动的原因及改动的方式。有时间帮忙看下这样子改动是否可行。会不会出现不兼容等情况。

enkiller · 2021-12-01T05:46:54Z

@Guozhanxin 这个方案能合入不？改动比较大，兼容性上估计没啥问题。

Guozhanxin · 2021-12-01T06:06:47Z

examples/utest/testcases/kernel/mem_tc.c

+    begin = (rt_uint8_t *)&heap[1];
+    buf_size = buf + TEST_MEM_SIZE - begin;
+    rt_memset(buf, 0xAA, TEST_MEM_SIZE);
+    // small heap init


注释不太规范，/* */

好的，注释我修改下

最好是先评估下这个方案能不能合并，免得白费功夫....

Guozhanxin · 2021-12-01T06:09:02Z

include/rtdef.h

    RT_Object_Class_Module        = 0x0b,      /**< The object is a module. */
-    RT_Object_Class_Unknown       = 0x0c,      /**< The object is unknown. */
+    RT_Object_Class_Mem           = 0x0c,      /**< The object is a small memory. */
+    RT_Object_Class_Slab          = 0x0d,      /**< The object is a slab memory. */


这样搞的话，是不是每加一个内存算法都要加一个类型？

是的，类型该加的加嘛，我觉得这个没啥影响吧。

还是说搞一个类型？在通过某种方式区分子类型？

Guozhanxin · 2021-12-01T06:18:21Z

src/kservice.c

+ *
+ * @param end_addr the end address of system page.
+ */
+RT_WEAK void rt_system_heap_init(void *begin_addr, void *end_addr)


看起来这么改，对用户自己实现的内存算法影响不大。可以开下这个软件包试试。http://packages.rt-thread.org/detail.html?package=tlsf

Guozhanxin · 2021-12-01T06:20:49Z

src/kservice.c

+    /* Enter critical zone */
+    level = _heap_lock();
+    /* Change the size of previously allocated memory block */
+    nptr = _MEM_REALLOC(&system_heap, rmem, newsize);


realloc 没有hook吗

realloc 原本也没有 hook

Guozhanxin · 2021-12-01T06:27:11Z

include/rtthread.h

+                     const char    *name,
+                     void          *begin_addr,
+                     rt_size_t      size);
+rt_err_t rt_mem_detach(struct rt_mem *m);


这些api和结构体定义，一定要加到 rt-thread 头文件里面吗？这群其实用户都用不到的。

修改成多实例，就需要用到了

修改成多实例的原因：一个项目中，内存会被化成多个块供不同的组件使用，不同的内存块使用不同的管理算法。当前 rtt 不支持一个系统中使用多种内存管理算法，就只能魔改

所以就把内存管理算法做成多实例了

Guozhanxin · 2021-12-01T06:28:41Z

src/kservice.c

+    level = _heap_lock();
+    /* allocate memory block from system heap */
+    ptr = _MEM_MALLOC(&system_heap, size);
+#if defined(RT_USING_MEMHEAP_AS_HEAP) && defined(RT_USING_MEMHEAP_AUTO_BINDING)


这部分的逻辑，应该是某一个具体的内存算法的功能，应该放到具体的内存算法内部吧？

这部分逻辑就很尴尬，在现有的 memheap 中，rt_malloc 是在内部实现的。现在把 rt_malloc 拿出来了。这部分代码就得跟着拿出来。

enkiller · 2021-12-01T07:29:25Z

如沟通，调整方式如下：

添加通用 Mem 类型，内存管理算法从通用类型上继承
small 及 slab 内存管理算法结构体移动到算法内部，对外暴露接口。初始化管理算法，返回通用的 Mem 类型
原先 memheap 实现的 rt_malloc 接口更改一个名字，跨内存块查找功能封装在 memheap 内部

cndabai · 2021-12-09T07:59:43Z

…flag

…ed memory interfaces

…ion and interface

mysterywolf · 2021-12-15T11:57:45Z

@Guozhanxin 郭老师看一下吧，合并的时候选择squash一下，commits数量太多了

yulincoder

请问一下给rt_memheap添加locked这个flag，这个修改作者是遇到什么问题从而进行的修复吗？我这边遇到了踩内存问题，发现厂商给我的代码和仓库缺少这个补丁 @enkiller

enkiller · 2022-01-18T02:42:20Z

请问一下给rt_memheap添加locked这个flag，这个修改作者是遇到什么问题从而进行的修复吗？我这边遇到了踩内存问题，发现厂商给我的代码和仓库缺少这个补丁 @enkiller

与这个修改没关系

Rbb666 · 2022-01-18T02:47:47Z

你好，free的命令是不是有点问题?
我在ARI-PI上使能动态内存内存管理算法free出来的只有heap，没有sdram

mysterywolf added the v4.0.4 label Oct 14, 2021

Guozhanxin added v4.0.5 and removed v4.0.4 labels Oct 14, 2021

chenyingchun0312 mentioned this pull request Oct 14, 2021

【内存管理】内存管理算法研究 supperthomas/bluetoothlover_doc#218

Open

mysterywolf added the crucial label Oct 14, 2021

enkiller force-pushed the 1013 branch from ea63c9e to e9794e9 Compare November 6, 2021 08:19

enkiller force-pushed the 1013 branch 3 times, most recently from c1db306 to 6f09461 Compare December 1, 2021 06:02

Guozhanxin reviewed Dec 1, 2021

View reviewed changes

mysterywolf added the in progress PR/issue in progress. label Dec 2, 2021

Guozhanxin mentioned this pull request Dec 7, 2021

v4.1.0 特性征集与讨论 | v4.1.0 discussion #5342

Closed

24 tasks

enkiller force-pushed the 1013 branch 2 times, most recently from 8edcc80 to 0095153 Compare December 8, 2021 02:17

enkiller force-pushed the 1013 branch from e4bf8b7 to 45b167d Compare December 13, 2021 05:36

enkiller added 5 commits December 15, 2021 09:51

[kernel][mem] Multiple instances of small memory allocation algorithm

1d178fc

[kernel][mem] Change small memory management algorithm memory header …

33d5ca8

…flag

[kernel][mem] Fix assertion problem

0c97fc2

[kernel][slab] Multiple instances of slab memory management algorithm

6a23b2f

[kernel][memheap] Remove rt_malloc/rt_free/rt_realloc and other relat…

0ea1a8c

…ed memory interfaces

enkiller added 16 commits December 15, 2021 09:51

[kernel][memheap] Add 'memheapcheck' cmd

2696190

[kernel][mem] Fix failure to request full memory

7e6b22e

[kernel][memheap] Fix compilation warning

a034475

[kernel][mem] Fix mem realloc ASSERT

7a998c7

[examples][testcases] Add small mem testcase

8e51c2f

[examples][mem_tc] Modify test memory size

dd0d1fa

[examples][testcases] Add slab memory management algorithm test case

57beae9

[examples][testcases] fix small memory management algorithm test case

6b17fec

[kernel][memory] Adjusting memory allocation algorithm object definit…

8796c07

…ion and interface

[kernel][memory] Fix compilation warning

6cd894c

[examples][utest] Fix mem test case

5079630

[examples][utest] fix slab test case

c1a0361

[utest][testcases] Shorten test time

7d658a9

[kernel][memory] Formatting code

a155079

[examples][utest] Adjust test run time

dea0f11

[examples][utest] Formatting code

d2d22c6

enkiller force-pushed the 1013 branch from 59563a5 to 3c1e97a Compare December 15, 2021 02:37

[bsp] update all rtconfig.h

a8bc66f

enkiller force-pushed the 1013 branch from 3c1e97a to a8bc66f Compare December 15, 2021 02:57

mysterywolf removed the in progress PR/issue in progress. label Dec 15, 2021

mysterywolf approved these changes Dec 15, 2021

View reviewed changes

mysterywolf added the +1 Agree +1 label Dec 15, 2021

Guozhanxin added the +2 Agree +2 label Dec 16, 2021

Guozhanxin merged commit d724eed into RT-Thread:master Dec 16, 2021

enkiller deleted the 1013 branch December 17, 2021 06:03

yulincoder reviewed Jan 6, 2022

View reviewed changes

wdfk-prog mentioned this pull request Apr 10, 2024

[mem]MIN_SIZE宏定义不易于理解 #8761

Closed

分离内存分配接口与内存分配算法 #5175

分离内存分配接口与内存分配算法 #5175

Uh oh!

Conversation

enkiller commented Oct 14, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

拉取/合并请求描述：(PR description)

改动的原因

核心改动

影响

测试用例

当前拉取/合并请求的状态 Intent for your PR

代码质量 Code Quality：

Uh oh!

CLAassistant commented Oct 14, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

enkiller commented Nov 29, 2021

Uh oh!

enkiller commented Dec 1, 2021

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Guozhanxin Dec 1, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

enkiller commented Dec 1, 2021

Uh oh!

cndabai commented Dec 9, 2021

Uh oh!

mysterywolf commented Dec 15, 2021

Uh oh!

yulincoder left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

enkiller commented Jan 18, 2022

Uh oh!

Rbb666 commented Jan 18, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

enkiller commented Oct 14, 2021 •

edited

Loading

CLAassistant commented Oct 14, 2021 •

edited

Loading

Guozhanxin Dec 1, 2021 •

edited

Loading

yulincoder left a comment •

edited

Loading