From d724eed9fc09269c3c6e921c1f8b2df573508419 Mon Sep 17 00:00:00 2001
From: Tangyuxin <462747508@qq.com>
Date: Thu, 16 Dec 2021 16:23:58 +0800
Subject: 分离内存分配接口与内存分配算法 (#5175)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

* [kernel][mem] Change small memory management algorithm memory header flag

* [kernel][mem] Fix assertion problem

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

* [kernel][memheap] Remove rt_malloc/rt_free/rt_realloc and other related memory interfaces

* [kernel][mem] Clean up memory space of small memory management objects

* [kernel][kservice] Add memory application interface and thread protection interface

* [kernel][kservice] Fix function return value problem

* [kernel][memheap] Optimize memheaptrace print

* [kernel][memheap] Support best mode

* [kernel][memory] Remove semaphore lock

* [kernel][memheap] Add locked flag

* [kernel][memory] Support malloc memory in interrupt

* [kernel][memheap] Add 'memheapcheck' cmd

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

* [kernel][memheap] Fix compilation warning

* [kernel][mem] Fix mem realloc ASSERT

* [examples][testcases] Add small mem testcase

* [examples][mem_tc] Modify test memory size

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

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

* [kernel][memory] Adjusting memory allocation algorithm object definition and interface

* [kernel][memory] Fix compilation warning

* [examples][utest] Fix mem test case

* [examples][utest] fix slab test case

* [utest][testcases] Shorten test time

* [kernel][memory] Formatting code

* [examples][utest] Adjust test run time

* [examples][utest] Formatting code

* [bsp] update all rtconfig.h
---
 src/SConscript | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'src/SConscript')

diff --git a/src/SConscript b/src/SConscript
index 68523978d6..3f014551f0 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -6,10 +6,10 @@ src = Glob('*.c')
 
 CPPPATH = [RTT_ROOT + '/include']
 
-if GetDepend('RT_USING_HEAP') == False or GetDepend('RT_USING_SMALL_MEM') == False:
+if GetDepend('RT_USING_SMALL_MEM') == False:
     SrcRemove(src, ['mem.c'])
 
-if GetDepend('RT_USING_HEAP') == False or GetDepend('RT_USING_SLAB') == False:
+if GetDepend('RT_USING_SLAB') == False:
     SrcRemove(src, ['slab.c'])
 
 if GetDepend('RT_USING_MEMPOOL') == False:
@@ -17,11 +17,6 @@ if GetDepend('RT_USING_MEMPOOL') == False:
 
 if GetDepend('RT_USING_MEMHEAP') == False:
     SrcRemove(src, ['memheap.c'])
-    if GetDepend('RT_USING_MEMHEAP_AS_HEAP'):
-        SrcRemove(src, ['mem.c'])
-
-if GetDepend('RT_USING_USERHEAP'):
-    SrcRemove(src, ['mem.c', 'slab.c'])
 
 if GetDepend('RT_USING_SIGNALS') == False:
     SrcRemove(src, ['signal.c'])
-- 
cgit v1.3.1