From 9e281ac636c84b0ea191bbe5959b27335ad9e2f3 Mon Sep 17 00:00:00 2001
From: a1012112796 <1012112796@qq.com>
Date: Tue, 21 May 2024 11:29:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=AF=E7=94=A8=20MEMTRACE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: a1012112796 <1012112796@qq.com>
---
 .config         |  2 +-
 project.uvoptx  | 20 ++++++++++----------
 project.uvprojx | 18 +++++++++---------
 rtconfig.h      |  1 +
 4 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/.config b/.config
index c7d656e..07d4803 100644
--- a/.config
+++ b/.config
@@ -66,7 +66,7 @@ CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y
 # CONFIG_RT_USING_SLAB_AS_HEAP is not set
 # CONFIG_RT_USING_USERHEAP is not set
 # CONFIG_RT_USING_NOHEAP is not set
-# CONFIG_RT_USING_MEMTRACE is not set
+CONFIG_RT_USING_MEMTRACE=y
 # CONFIG_RT_USING_HEAP_ISR is not set
 CONFIG_RT_USING_HEAP=y
 
diff --git a/project.uvoptx b/project.uvoptx
index 7788362..569950b 100644
--- a/project.uvoptx
+++ b/project.uvoptx
@@ -303,8 +303,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>rt-thread\components\libc\cplusplus\cxx_Semaphore.cpp</PathWithFileName>
-      <FilenameWithoutPath>cxx_Semaphore.cpp</FilenameWithoutPath>
+      <PathWithFileName>rt-thread\components\libc\cplusplus\cxx_Thread.cpp</PathWithFileName>
+      <FilenameWithoutPath>cxx_Thread.cpp</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -351,8 +351,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>rt-thread\components\libc\cplusplus\cxx_Thread.cpp</PathWithFileName>
-      <FilenameWithoutPath>cxx_Thread.cpp</FilenameWithoutPath>
+      <PathWithFileName>rt-thread\components\libc\cplusplus\cxx_Semaphore.cpp</PathWithFileName>
+      <FilenameWithoutPath>cxx_Semaphore.cpp</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -604,7 +604,7 @@
 
   <Group>
     <GroupName>Drivers</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -767,8 +767,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>rt-thread\components\fal\src\fal_flash.c</PathWithFileName>
-      <FilenameWithoutPath>fal_flash.c</FilenameWithoutPath>
+      <PathWithFileName>rt-thread\components\fal\src\fal_partition.c</PathWithFileName>
+      <FilenameWithoutPath>fal_partition.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -779,8 +779,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>rt-thread\components\fal\src\fal_partition.c</PathWithFileName>
-      <FilenameWithoutPath>fal_partition.c</FilenameWithoutPath>
+      <PathWithFileName>rt-thread\components\fal\src\fal_flash.c</PathWithFileName>
+      <FilenameWithoutPath>fal_flash.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -888,7 +888,7 @@
 
   <Group>
     <GroupName>Kernel</GroupName>
-    <tvExp>0</tvExp>
+    <tvExp>1</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
diff --git a/project.uvprojx b/project.uvprojx
index a71763d..e9416db 100644
--- a/project.uvprojx
+++ b/project.uvprojx
@@ -429,9 +429,9 @@
           <GroupName>CPlusPlus</GroupName>
           <Files>
             <File>
-              <FileName>cxx_Semaphore.cpp</FileName>
+              <FileName>cxx_Thread.cpp</FileName>
               <FileType>8</FileType>
-              <FilePath>rt-thread\components\libc\cplusplus\cxx_Semaphore.cpp</FilePath>
+              <FilePath>rt-thread\components\libc\cplusplus\cxx_Thread.cpp</FilePath>
             </File>
             <File>
               <FileName>cxx_crt.cpp</FileName>
@@ -449,9 +449,9 @@
               <FilePath>rt-thread\components\libc\cplusplus\cxx_crt_init.c</FilePath>
             </File>
             <File>
-              <FileName>cxx_Thread.cpp</FileName>
+              <FileName>cxx_Semaphore.cpp</FileName>
               <FileType>8</FileType>
-              <FilePath>rt-thread\components\libc\cplusplus\cxx_Thread.cpp</FilePath>
+              <FilePath>rt-thread\components\libc\cplusplus\cxx_Semaphore.cpp</FilePath>
             </File>
           </Files>
         </Group>
@@ -628,16 +628,16 @@
         <Group>
           <GroupName>Fal</GroupName>
           <Files>
-            <File>
-              <FileName>fal_flash.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>rt-thread\components\fal\src\fal_flash.c</FilePath>
-            </File>
             <File>
               <FileName>fal_partition.c</FileName>
               <FileType>1</FileType>
               <FilePath>rt-thread\components\fal\src\fal_partition.c</FilePath>
             </File>
+            <File>
+              <FileName>fal_flash.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>rt-thread\components\fal\src\fal_flash.c</FilePath>
+            </File>
             <File>
               <FileName>fal_rtt.c</FileName>
               <FileType>1</FileType>
diff --git a/rtconfig.h b/rtconfig.h
index 14e5fb7..1efed12 100644
--- a/rtconfig.h
+++ b/rtconfig.h
@@ -38,6 +38,7 @@
 #define RT_USING_MEMPOOL
 #define RT_USING_SMALL_MEM
 #define RT_USING_SMALL_MEM_AS_HEAP
+#define RT_USING_MEMTRACE
 #define RT_USING_HEAP
 
 /* Kernel Device Object */