From 042e85820ce330d458700c0cca24dc5248e70b9f Mon Sep 17 00:00:00 2001 From: Wanderingss <1624155937@qq.com> Date: Sun, 25 Oct 2026 09:29:55 +0800 Subject: [PATCH] =?UTF-8?q?chore(ledger):=20n22=20=E5=90=88=E5=85=A5?= =?UTF-8?q?=E5=90=8E=E5=9B=9E=E5=A1=AB=E5=8F=B0=E8=B4=A6/=E5=87=AD?= =?UTF-8?q?=E8=AF=81/=E8=A6=86=E7=9B=96=E7=8E=87=E5=9F=BA=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit task/n22-flush 合入（merge 6f99dea）：vol_idle_sync 空闲 flush 兜底。 Code 215,744→215,932（+188 B）、RW 1,224→1,232（+8 B）、ZI 不变； RW_IRAM1 75,792 B（57.8%）、CCM 57,376 B（87.9%）不变——lane-f 分支侧 --no-verify 欠账清。覆盖率基线登记 vol_idle_sync.c（36/36 套件）。 凭证重盖（L0c 恢复序列）。 --- docs/内存管理/RAM使用分析与优化方案.md | 6 ++-- docs/内存管理/RAM预算台账.md | 6 ++-- scripts/ram_baseline.tsv | 2 +- scripts/size_attestation.json | 20 ++++++------ scripts/test_coverage_baseline.json | 42 +++++++++++++++++++------- 5 files changed, 48 insertions(+), 28 deletions(-) diff --git a/docs/内存管理/RAM使用分析与优化方案.md b/docs/内存管理/RAM使用分析与优化方案.md index 4e9b2e93..4cd11d32 100644 --- a/docs/内存管理/RAM使用分析与优化方案.md +++ b/docs/内存管理/RAM使用分析与优化方案.md @@ -47,10 +47,10 @@ C2 dhara 失败类 +84；RO 另 +208，全是 C2 的失败类名表）→ `ER_IR | 区域 | 用量 | 容量 | 占比 | |---|---|---|---| -| ER_IROM1 | 237,140 B (231.58 KB) | 1,048,576 B (1024 KB) | 22.6% | -| RW_IRAM1 | 75,784 B (74.01 KB) | 131,072 B (128 KB) | 57.8% | +| ER_IROM1 | 237,328 B (231.77 KB) | 1,048,576 B (1024 KB) | 22.6% | +| RW_IRAM1 | 75,792 B (74.02 KB) | 131,072 B (128 KB) | 57.8% | | RW_CCM | 57,376 B (56.03 KB) | 65,280 B (64 KB) | 87.9% | -| **Flash (ROM 合计)** | **238,364 B (232.8 KB)** | 1,048,576 B (1024 KB) | **22.7%** | +| **Flash (ROM 合计)** | **238,560 B (233.0 KB)** | 1,048,576 B (1024 KB) | **22.8%** | 各区的容量与常量来源： diff --git a/docs/内存管理/RAM预算台账.md b/docs/内存管理/RAM预算台账.md index 8b953270..95599c6f 100644 --- a/docs/内存管理/RAM预算台账.md +++ b/docs/内存管理/RAM预算台账.md @@ -15,10 +15,10 @@ | 区域 | 用量 | 容量 | 占比 | 门禁（≤92%） | |---|---|---|---|---| -| ER_IROM1 (Flash) | 237,140 B | 1,048,576 B | 22.6% | 参考 | +| ER_IROM1 (Flash) | 237,328 B | 1,048,576 B | 22.6% | 参考 | | RW_CCM | 57,376 B | 65,280 B | 87.9% | PASS | | UNINIT_CCM | 48 B | 256 B | 18.8% | 参考 | -| RW_IRAM1 | 75,784 B | 131,072 B | 57.8% | PASS | +| RW_IRAM1 | 75,792 B | 131,072 B | 57.8% | PASS | | 子系统（静态 RW+ZI；除 RTOS 堆在 CCM 外均在 SRAM1） | 现值 | 配额 | 状态 | |---|---|---|---| @@ -27,7 +27,7 @@ | UI | 30,426 B | 16 KB | ⚠ 超 13.7 KB | | RTOS 堆 | 57,376 B | 56 KB | 堆=配额 | | 应用 | 15,406 B | 8 KB | ⚠ 超 7.0 KB | -| 其它 | 9,208 B | — | 参考 | +| 其它 | 9,216 B | — | 参考 | - **门禁**：pre-commit `mem-budget` 钩子（`scripts/ram_baseline.py --gate`）—— diff --git a/scripts/ram_baseline.tsv b/scripts/ram_baseline.tsv index 5752ba3a..d7a055ca 100644 --- a/scripts/ram_baseline.tsv +++ b/scripts/ram_baseline.tsv @@ -7,4 +7,4 @@ date code ro rw zi er_irom1 er_pct iram1 iram1_pct ccm ccm_pct top_rwzi 2026-10-22 213436 18652 1188 131500 232088 22.1 75264 57.4 57376 87.9 heap_4.o=57376;lv_mem_core_builtin.o=16384;lftpd.o=7884;ui_net_sink.o=6766;ui_port.o=6420;nand_ftl.o=6216;ch395f.o=4162;console_log.o=4120;sys_log_mcu.o=3588;default_task.o=2736 2026-10-23 213676 18860 1188 131500 232536 22.2 75264 57.4 57376 87.9 heap_4.o=57376;lv_mem_core_builtin.o=16384;lftpd.o=7884;ui_net_sink.o=6766;ui_port.o=6420;nand_ftl.o=6216;ch395f.o=4162;console_log.o=4120;sys_log_mcu.o=3588;default_task.o=2736 2026-10-24 213780 18860 1204 131852 232640 22.2 75632 57.7 57376 87.9 heap_4.o=57376;lv_mem_core_builtin.o=16384;lftpd.o=7884;ui_net_sink.o=6766;ui_port.o=6420;nand_ftl.o=6216;ch395f.o=4162;console_log.o=4128;sys_log_mcu.o=3944;default_task.o=2736 -2026-10-25 215744 21396 1224 131984 237140 22.6 75784 57.8 57376 87.9 heap_4.o=57376;lv_mem_core_builtin.o=16384;lftpd.o=7884;ui_net_sink.o=6766;ui_port.o=6420;nand_ftl.o=6216;ch395f.o=4162;console_log.o=4128;sys_log_mcu.o=3944;default_task.o=2736 +2026-10-25 215932 21396 1232 131984 237328 22.6 75792 57.8 57376 87.9 heap_4.o=57376;lv_mem_core_builtin.o=16384;lftpd.o=7884;ui_net_sink.o=6766;ui_port.o=6420;nand_ftl.o=6216;ch395f.o=4162;console_log.o=4128;sys_log_mcu.o=3944;default_task.o=2736 diff --git a/scripts/size_attestation.json b/scripts/size_attestation.json index 0bccf130..388ae4a8 100644 --- a/scripts/size_attestation.json +++ b/scripts/size_attestation.json @@ -1,17 +1,17 @@ { - "built_at": "2026-10-25T06:07:53+08:00", - "fingerprint": "9b2b3b209d19275aea4744529bdb7d3b14087c27765e40fb7e25ccdafe0e721d", - "fingerprint_files": 1396, + "built_at": "2026-10-25T09:28:21+08:00", + "fingerprint": "f326336d2f469fedf1be8db3538a2a47e83105d36abed7b1bc549cd0ab75147f", + "fingerprint_files": 1398, "fingerprint_source": "git-index", "gated_regions": [ "RW_IRAM1", "RW_CCM" ], - "git_head": "73f9e104928472db3084e7d03acdd3e6ac68cd89", + "git_head": "6f99dea3a9d8638bff7e1371839cd23b31403b50", "map": "MDK-ARM/STM32F407-Demo/STM32F407-Demo.map", - "map_mtime": 1792879590, + "map_mtime": 1792891670, "pct": { - "ER_IROM1": 22.62, + "ER_IROM1": 22.63, "RW_CCM": 87.89, "RW_IRAM1": 57.82, "UNINIT_CCM": 18.75 @@ -19,7 +19,7 @@ "regions": { "ER_IROM1": { "max": 1048576, - "size": 237140 + "size": 237328 }, "RW_CCM": { "max": 65280, @@ -27,7 +27,7 @@ }, "RW_IRAM1": { "max": 131072, - "size": 75784 + "size": 75792 }, "UNINIT_CCM": { "max": 256, @@ -37,9 +37,9 @@ "schema": 2, "scope_note": "\u540c\u7801\u51ed\u8bc1\uff1a\u6307\u7eb9\u8986\u76d6\u56fa\u4ef6\u4f53\u79ef\u76f8\u5173\u6e90\u7801\uff0c\u53e3\u5f84\u89c1\u672c\u811a\u672c docstring", "sizes": { - "code": 215744, + "code": 215932, "ro_data": 21396, - "rw_data": 1224, + "rw_data": 1232, "zi_data": 131984 }, "threshold_pct": 92.0, diff --git a/scripts/test_coverage_baseline.json b/scripts/test_coverage_baseline.json index bc8ada4e..3c69e386 100644 --- a/scripts/test_coverage_baseline.json +++ b/scripts/test_coverage_baseline.json @@ -88,6 +88,14 @@ "lines_covered": 27, "lines_valid": 29 }, + "App/fs/vol_idle_sync.c": { + "func_rate": 1.0, + "funcs_covered": 1, + "funcs_valid": 1, + "line_rate": 1.0, + "lines_covered": 21, + "lines_valid": 21 + }, "App/fs/vol_lock.c": { "func_rate": 1.0, "funcs_covered": 3, @@ -564,6 +572,13 @@ "lines_total": 99, "ok": true }, + "vol_idle_sync": { + "files": { + "App/fs/vol_idle_sync.c": 21 + }, + "lines_total": 21, + "ok": true + }, "vol_lock": { "files": { "App/fs/vol_lock.c": 17 @@ -593,6 +608,7 @@ "App/cfg/cfg_file.c", "App/cfg/cfg_file_store_mcu.c", "App/cfg/prot_set_store.c", + "App/fs/vol_idle_sync.c", "App/fs/vol_lock.c", "App/log/console_log.c", "App/log/soe_rec.c", @@ -623,16 +639,16 @@ ], "totals": { "files_generated_excluded": 5, - "files_tested": 38, - "files_untested": 115, - "func_rate": 0.9258, - "funcs_covered": 412, - "funcs_valid": 445, - "line_rate": 0.8965, - "lines_covered": 5802, - "lines_valid": 6472, - "modules_ok": 35, - "modules_total": 35 + "files_tested": 39, + "files_untested": 116, + "func_rate": 0.926, + "funcs_covered": 413, + "funcs_valid": 446, + "line_rate": 0.8968, + "lines_covered": 5823, + "lines_valid": 6493, + "modules_ok": 36, + "modules_total": 36 }, "untested_sources": [ { @@ -656,7 +672,7 @@ "path": "Drivers/BSP/UI/ui_content_page.c" }, { - "code_lines": 281, + "code_lines": 282, "path": "App/task/default_task.c" }, { @@ -1039,6 +1055,10 @@ "code_lines": 11, "path": "Drivers/BSP/dbg_cfg.h" }, + { + "code_lines": 10, + "path": "App/fs/vol_idle_sync.h" + }, { "code_lines": 10, "path": "App/task/default_task.h"