924ac3d428
用户裁定「统一」。口径就是 AGENTS 铁律:字符串字面量必须纯 ASCII (无 BOM 文件里奇数个汉字会吞掉结束引号,偶数才侥幸通过),中文只写注释。 四名队友按目录分四组并行、写范围互斥:net_socket 418 行(6 文件)、 console_log/sys_log_mcu/soe_store/cfg_file_store_mcu 268 行(4 文件)、 11 个存量套件 404 行 + adc_input 89 行、iec104 与 lftpd 与 NET 四套等 356 行 (9 文件)。runner 的 .py 文档串不在口径内(Python 源不经 ARMCC 代码页)。 两套口径必须分清:粗口径(按行切引号)普查 = 34 文件 / 1,552 行;严格口径 (状态机剥掉块/行注释与字符常量后再取字符串字面量)= 30 文件 / 1,535 行。 差值那 4 个文件的命中全在注释里(ns_peers.c、net_socket/stub/ns_rtos.h、 common/ch395f_fake.h、common/fatfs_fake.c)——按口径一处都不该改,改了等于 把中文从注释里搬走、正好违背口径。粗口径绝不能当交付判据,否则要么白改 注释、要么留下「这行为什么没改」的悬案。 Lead 独立终检(不采信自报)五条硬判据,结果 30 文件漂移 0:① 每文件 TC 号 集合与 HEAD 逐字相同 ② 断言宏调用点数不变 ③ 行数与 HEAD 完全相等(专抓 整文件回写把尾部含 main() 吃掉的截断,第 1 轮真发生过两次)④ 剥注释后代码区 非 ASCII 字符 = 0 ⑤ 字节卫生(BOM 与 HEAD 一致、无 CR、无 U+FFFD、单尾换行)。 另用「逐行把字面量整体替换成空串后与 HEAD 必须逐行相等」机械证明只改了字面量; 各套 --module 覆盖率与断言数逐字不变(net_socket 887/889·53/53、console_log 199/200·16/16、sys_log_mcu 324/326·13/13、adc_input 103/103、sys_clock 100/100) → 生产码零改动,基线不需重登。 闸拦下一处真实回归(我的验收器没抓到):ns_s6_edges.c 翻译时把一个上一轮 已整改成平实描述的编号又写回了 CHECK 标签。原因很清楚:「只改字面量」并不 等于「只改无害内容」,标签里完全可以带进未登记族的编号形态;而 Lead 的自动 验收器只比对了 TC 形 id 集合,未覆盖 L/E/N/S/TRAP 等族。教训:批量改标签的 守卫必须加一条「新串不得出现任何已登记前缀族之外的编号形态」,且结构不变式 只覆盖自己想到的维度时不能替代真闸。 Lead 自查另清掉 126 处写坏的反斜杠(JS→Python 转义层数翻倍,把 markdown 反引号写成反斜杠+反引号),恰好发生在记录这条教训的那一节里。 文档:docs/测试说明/主机单测覆盖率口径.md §9 新增「第 2 轮」小节(两套口径对照 表、五条终检判据、六条手法含「转换说明符序列必须逐位相同」取代「禁止裸 %」、 三条协作纪律含先改板再派工与临时文件带组前缀、后续项 3 条)+ 变更记录一行。 后续项(本轮不做):把剥注释词法扫描器收进 scripts 当门禁(需用户点头并先定 test/ 是否纳入 coding-standard);iec104 的简写编号归族(牵 id_registry, 不能顺手做);替换器加「编号形态白名单」校验。 gate: pre-commit run --all-files -> 39 hooks, 37 Passed; failed = mem-numbers + mem-budget(受管快照与本树 .map 的漂移,属第 1 轮生产码改动的遗留,非本批 增量)。本批只碰 test/host/**,不进 Keil 编译面也不进模拟器 CMake,**RAM/Flash 增量 = 0**;实测水位 RW_IRAM1 57.4%、RW_CCM 87.9%,均低于 92% 红线。 id-check 0 台账外新账(可判定 84.63% > 基线 82.6%);test-coverage 33/33 全绿; cppcheck / coding-standard / bsp-err / layer-deps / doc-links 全 Passed。 按仓内分支约定 --no-verify 提交,台账 --write 回填留待主工作树合并后。
225 lines
9.4 KiB
C
225 lines
9.4 KiB
C
/*
|
||
* 模块名称:Volume Lock(卷锁)主机侧单元测试
|
||
* 模块功能:在 PC 上对 App/fs/vol_lock.c 做离线验证(3 个公开函数全覆盖)。
|
||
*
|
||
* 被测对象:真实源文件 ../../../App/fs/vol_lock.c(以 #include 原样纳入,
|
||
* 保证测的是生产代码而非副本)。平台依赖由本文件提供的**可注入桩**实现:
|
||
* - cmsis_os.h -> osMutexNew / osMutexWait / osMutexRelease
|
||
* (可注入 创建失败 / 等待超时 / 获取成功)
|
||
*
|
||
* 为什么要主机侧单测(而不是只用板端套件):
|
||
* 1. 本模块最要紧的语义是 **fail-open**(锁创建失败时 `vol_lock_wait` 必须返回 1
|
||
* 且**绝不阻塞**)——这是"defaultTask 喂狗点绝不能因等锁而停摆"的最后一道保险。
|
||
* 真机上 `osMutexNew` 失败几乎不可能复现(需堆耗尽),板端套件无法构造。
|
||
* 2. 幂等性(重复 `vol_lock_init` 不得重复创建)、等待超时透传、未创建时 release 无害,
|
||
* 都是纯状态逻辑,主机侧一次钉死。
|
||
* 3. 不占 MCU 的 RAM,毫秒级完成。
|
||
*
|
||
* 覆盖点:
|
||
* TC-VOLLOCK-001 init 首次调用创建互斥量并返回 0
|
||
* TC-VOLLOCK-002 init 幂等(重复调用不再创建)
|
||
* TC-VOLLOCK-003 init 在 osMutexNew 失败时返回 -1
|
||
* TC-VOLLOCK-004 init 失败后可重试成功(s_lock 未被污染)
|
||
* TC-VOLLOCK-005 wait 成功后返回 1,且把 timeout 原样透传给 osMutexWait
|
||
* TC-VOLLOCK-006 wait 超时(osMutexWait != osOK)返回 0
|
||
* TC-VOLLOCK-007 wait 在锁未创建时自动 init,再正常获取
|
||
* TC-VOLLOCK-008 ⭐ fail-open:锁未创建且创建失败 -> 返回 1 且**不调用** osMutexWait
|
||
* TC-VOLLOCK-009 fail-open 之后 release 无害(s_lock 仍为 NULL,不调用 osMutexRelease)
|
||
* TC-VOLLOCK-010 已创建时 wait 不再调用 osMutexNew
|
||
* TC-VOLLOCK-011 release 在已持锁时调用 osMutexRelease 一次
|
||
* TC-VOLLOCK-012 release 在锁未创建时静默返回(不崩溃、不调用)
|
||
* TC-VOLLOCK-013 完整周期 init -> wait -> release -> wait -> release
|
||
* TC-VOLLOCK-014 wait(0) 的 timeout 透传为 0(defaultTask 的 try 语义)
|
||
*
|
||
* 通过:全部 TC PASS(main 返回 0)。
|
||
* 入口:int main(void),返回 0=PASS / 1=FAIL(由 run 脚本判读)。
|
||
*
|
||
* 创建日期:2026-10-10
|
||
*/
|
||
|
||
#include <stddef.h>
|
||
#include <stdint.h>
|
||
#include <stdio.h>
|
||
|
||
/* ===================== 平台桩(先纳入,覆盖真实头) ===================== */
|
||
#include "cmsis_os.h"
|
||
|
||
/* ===================== CMSIS-RTOS 互斥量桩 =====================
|
||
* s_new_fail osMutexNew 返回 NULL(注入创建失败)
|
||
* s_wait_ok 0 -> osMutexWait 返回 osErrorTimeout(注入超时)
|
||
* s_fake_mutex 成功创建时返回的伪句柄(非 NULL 即可)
|
||
* s_last_timeout 记录 osMutexWait 收到的 millisec(断言透传)
|
||
*/
|
||
static int s_new_calls;
|
||
static int s_new_fail;
|
||
static int s_wait_calls;
|
||
static int s_wait_ok;
|
||
static int s_release_calls;
|
||
static uint32_t s_last_timeout;
|
||
static void *s_fake_mutex = (void *)0x1234;
|
||
|
||
osMutexId_t osMutexNew(const osMutexAttr_t *attr) {
|
||
(void)attr;
|
||
s_new_calls++;
|
||
return s_new_fail ? NULL : (osMutexId_t)s_fake_mutex;
|
||
}
|
||
|
||
osStatus_t osMutexWait(osMutexId_t mutex_id, uint32_t millisec) {
|
||
(void)mutex_id;
|
||
s_wait_calls++;
|
||
s_last_timeout = millisec;
|
||
return s_wait_ok ? osOK : osErrorTimeout;
|
||
}
|
||
|
||
osStatus_t osMutexRelease(osMutexId_t mutex_id) {
|
||
(void)mutex_id;
|
||
s_release_calls++;
|
||
return osOK;
|
||
}
|
||
|
||
/* ===================== 断言 ===================== */
|
||
static int s_total = 0, s_passed = 0, s_failed = 0;
|
||
|
||
#define CHECK(cond, name) do { \
|
||
s_total++; \
|
||
if (cond) { s_passed++; printf(" [PASS] %s\n", name); } \
|
||
else { s_failed++; printf(" [FAIL] %s (line %d)\n", name, __LINE__); } \
|
||
} while (0)
|
||
|
||
/* ===================== 被测代码(原样纳入生产源) ===================== */
|
||
#include "vol_lock.c"
|
||
|
||
/* ===================== 工具 ===================== */
|
||
|
||
/*
|
||
* 函数功能:把全部桩与模块静态态复位到"刚上电"初值
|
||
* 入口参数:无
|
||
* 返 回 值:无
|
||
* 限定条件:无
|
||
* 函数说明:`s_lock` 是 vol_lock.c 的文件静态量(源文件已被纳入同一编译单元),
|
||
* 直接置 NULL 等价于"未初始化过"——这是白盒单测的可接受代价。
|
||
*/
|
||
static void fakes_reset(void) {
|
||
s_new_calls = 0;
|
||
s_new_fail = 0;
|
||
s_wait_calls = 0;
|
||
s_wait_ok = 1;
|
||
s_release_calls = 0;
|
||
s_last_timeout = 0xFFFFFFFFu;
|
||
s_fake_mutex = (void *)0x1234;
|
||
s_lock = NULL;
|
||
}
|
||
|
||
/* ===================== TC-VOLLOCK-001..004:vol_lock_init ===================== */
|
||
|
||
static void tc_init(void) {
|
||
fakes_reset();
|
||
CHECK(vol_lock_init() == 0, "TC-VOLLOCK-001 first init call returns 0");
|
||
CHECK(s_new_calls == 1, "TC-VOLLOCK-001b init creates the mutex exactly once (osMutexNew)");
|
||
CHECK(s_lock != NULL, "TC-VOLLOCK-001c module static state holds the handle");
|
||
|
||
CHECK(vol_lock_init() == 0, "TC-VOLLOCK-002 repeated init still returns 0 (idempotent)");
|
||
CHECK(s_new_calls == 1, "TC-VOLLOCK-002b idempotent: no second mutex created");
|
||
|
||
fakes_reset();
|
||
s_new_fail = 1;
|
||
CHECK(vol_lock_init() == -1, "TC-VOLLOCK-003 osMutexNew failure -> init returns -1");
|
||
CHECK(s_lock == NULL, "TC-VOLLOCK-003b failure leaves no half-initialized handle");
|
||
|
||
s_new_fail = 0;
|
||
CHECK(vol_lock_init() == 0, "TC-VOLLOCK-004 retry after failure can succeed (returns 0)");
|
||
CHECK(s_new_calls == 2, "TC-VOLLOCK-004b retry really calls osMutexNew again");
|
||
}
|
||
|
||
/* ===================== TC-VOLLOCK-005..010:vol_lock_wait ===================== */
|
||
|
||
static void tc_wait(void) {
|
||
/* --- 已创建:超时值原样透传 --- */
|
||
fakes_reset();
|
||
(void)vol_lock_init();
|
||
CHECK(vol_lock_wait(100U) == 1, "TC-VOLLOCK-005 wait returns 1 on acquire success");
|
||
CHECK(s_wait_calls == 1, "TC-VOLLOCK-005b osMutexWait called once");
|
||
CHECK(s_last_timeout == 100U, "TC-VOLLOCK-005c timeout passed through to osMutexWait unchanged");
|
||
|
||
fakes_reset();
|
||
(void)vol_lock_init();
|
||
CHECK(vol_lock_wait(0U) == 1, "TC-VOLLOCK-014 wait(0) returns 1 on acquire (try semantics)");
|
||
CHECK(s_last_timeout == 0U, "TC-VOLLOCK-014b wait(0) timeout passes through as 0");
|
||
|
||
/* --- 超时:osMutexWait != osOK -> 返回 0 --- */
|
||
fakes_reset();
|
||
(void)vol_lock_init();
|
||
s_wait_ok = 0;
|
||
CHECK(vol_lock_wait(50U) == 0, "TC-VOLLOCK-006 osMutexWait not osOK -> wait returns 0");
|
||
CHECK(s_wait_calls == 1, "TC-VOLLOCK-006b timeout path really attempted the wait");
|
||
|
||
/* --- 锁未创建:自动 init 后正常获取 --- */
|
||
fakes_reset();
|
||
CHECK(vol_lock_wait(10U) == 1, "TC-VOLLOCK-007 wait auto-inits and acquires when no lock exists");
|
||
CHECK(s_new_calls == 1, "TC-VOLLOCK-007b auto init created the mutex");
|
||
CHECK(s_wait_calls == 1, "TC-VOLLOCK-007c then performed one wait");
|
||
|
||
/* --- ⭐ fail-open:创建失败必须返回 1 且绝不阻塞 --- */
|
||
fakes_reset();
|
||
s_new_fail = 1;
|
||
CHECK(vol_lock_wait(0U) == 1, "TC-VOLLOCK-008 fail-open: returns 1 even if lock creation fails (never blocks a feed point)");
|
||
CHECK(s_wait_calls == 0, "TC-VOLLOCK-008b fail-open **does not call** osMutexWait (zero blocking)");
|
||
CHECK(s_lock == NULL, "TC-VOLLOCK-008c still no handle after fail-open");
|
||
|
||
/* --- fail-open 之后 release 无害 --- */
|
||
vol_lock_release();
|
||
CHECK(s_release_calls == 0, "TC-VOLLOCK-009 after fail-open release does not call osMutexRelease (NULL guard, silent)");
|
||
|
||
/* --- 已创建时 wait 不再创建 --- */
|
||
fakes_reset();
|
||
(void)vol_lock_init();
|
||
(void)vol_lock_wait(0U);
|
||
(void)vol_lock_wait(0U);
|
||
CHECK(s_new_calls == 1, "TC-VOLLOCK-010 repeated wait does not recreate the mutex");
|
||
CHECK(s_wait_calls == 2, "TC-VOLLOCK-010b each wait performs one wait call");
|
||
}
|
||
|
||
/* ===================== TC-VOLLOCK-011..013:vol_lock_release ===================== */
|
||
|
||
static void tc_release(void) {
|
||
/* --- 已持锁:释放一次 --- */
|
||
fakes_reset();
|
||
(void)vol_lock_init();
|
||
(void)vol_lock_wait(0U);
|
||
vol_lock_release();
|
||
CHECK(s_release_calls == 1, "TC-VOLLOCK-011 release while holding the lock calls osMutexRelease once");
|
||
|
||
/* --- 锁未创建:静默返回 --- */
|
||
fakes_reset();
|
||
vol_lock_release();
|
||
CHECK(s_release_calls == 0, "TC-VOLLOCK-012 release with no lock returns silently (no call, no crash)");
|
||
|
||
/* --- 完整周期 --- */
|
||
fakes_reset();
|
||
CHECK(vol_lock_init() == 0, "TC-VOLLOCK-013 cycle: init -> 0");
|
||
CHECK(vol_lock_wait(0U) == 1, "TC-VOLLOCK-013b cycle: wait -> 1");
|
||
vol_lock_release();
|
||
CHECK(vol_lock_wait(100U) == 1, "TC-VOLLOCK-013c cycle: wait again -> 1 (re-acquirable)");
|
||
vol_lock_release();
|
||
CHECK(s_new_calls == 1, "TC-VOLLOCK-013d cycle: only one mutex created overall");
|
||
CHECK(s_release_calls == 2, "TC-VOLLOCK-013e cycle: released twice");
|
||
CHECK(s_last_timeout == 100U, "TC-VOLLOCK-013f cycle: second wait timeout passes through correctly");
|
||
}
|
||
|
||
/* ===================== main ===================== */
|
||
|
||
int main(void) {
|
||
printf("=== Volume Lock Tests ===\n");
|
||
|
||
printf("-- vol_lock_init --\n");
|
||
tc_init();
|
||
printf("-- vol_lock_wait (incl. fail-open) --\n");
|
||
tc_wait();
|
||
printf("-- vol_lock_release --\n");
|
||
tc_release();
|
||
|
||
printf("\n=== Volume Lock Tests: %d/%d PASSED (failed=%d) ===\n",
|
||
s_passed, s_total, s_failed);
|
||
return (s_failed == 0) ? 0 : 1;
|
||
}
|