wandering1/STM32F4-Base
1
0
Fork 0
Code Issues 29 Pull Requests 1 Actions Packages Projects 2 Releases Wiki Activity

fix(编号): 批 6 追溯器分档 + 板级 NET 用例号标注归一

Browse Source 
步骤 1：追溯器分两档（不改数据，改判据）
- BENCH：文档**定义行**（标题行或表格首格）带「（硬件层）」或其所属章节带的号 →
  人工台架用例，不期望有 C 代码载体；NOTIMPL：定义行标了未实现/待补/暂缓/已取消
- 两档**单列示数恒打印**、明细进 --verbose，不是静默豁免；也不等于"已验证"
- 两个实测坑写在脚本注释里：① 按"任意行出现即算"实现时 BENCH 收 14 个号却只消掉
  1 处差异（同一号被别处引用一次就复活）→ 改为只认定义行 + 从文档全集整体减档；
  ② 载体类型必须由定义处决定，引用行不影响判断
- 另把 has_intent() 收窄到同号所在行（原先整文件任意位置有人话就算过关）

步骤 2：板级 NET 用例标注归一（真债，改名 109 处 / 5 文件）
- 取证发现"文档声明却无载体"绝大多数是**标注形态烂**：实现体里写的是
  TC204 / TC-201 / TC 703 / TC1501 / TC1502b（三种畸形），文档写 TC-NET-204 等
- 序号一位不改、只补模块码（§7.1）；作用域限定 5 个真载体文件：
  test/board/ch395f_test_task.c(67) net_test_task.c(37) net_test_task.h(1)
  test/host/ch395f_socket_test.py(3) Drivers/BSP/CH395F/ch395f.c(1)
- 审计轨迹 scripts/rename_maps/batch6-net-annotate.json；别名自动登记（scoped）

实测
- DOC-ONLY 29 → 15：701~704 的 NET 层实现体一直存在（net_test_task.c），
  此前因裸形标注被误判成"未实现"；1501~1503 属硬件层人工 + 同样裸形
- 交集 260 不变、代码侧 578 不减（识别面没缩）；BENCH 14 个号 / NOTIMPL 1 个
- 台账 --prune-backlog 还清 6 条（只减不增）；@build 0 错误 0 警告
  （Program Size 与改前逐字节相同：Code=213356 RO=18580 RW=1184 ZI=131480
   → 证实只动了注释与日志串）；7 个改动文件 BOM/CR/U+FFFD 与 HEAD 逐项一致

剩余 15 处 DOC-ONLY 的组成（步骤 3 未完，下轮处理）
- 4 处文档侧无模块码形态（TC-1003/206/501/704）→ 属 ② 大批
- TC-NET-607 一条是历史指称（原文"原 607/608/609，现 701/702/703"）
- 真未实现 10 条：TC-NET-101/102/601/606/801/802/901/902/1006/1101
  ——其中 801/802/901/902 曾在 2026-08 的代码里有载体、后被重构丢掉，最值得补
This commit is contained in:
Wanderingss
2026-10-21 13:53:06 +08:00
parent 43fbfa140b
commit fca414102e
9 changed files with 478 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/board/net_test_task.c
+34 -34
View File
@@ -118,8 +118,8 @@ static void phase6_run(int32_t sockfd) {
* 4. 连接超时负向用例（PC 服务关闭时 connect 不应成功）
*
* 入口条件：PC 运行 `python test/ch395f_socket_test.py tcp_server --port 8081`
* （TC 703 需先关闭该服务）。
* TC 映射：TC 701（连接 + 回显）/ TC 702（关闭重连）/ TC 703（连接超时）。
* （TC-NET-703 需先关闭该服务）。
* TC 映射：TC-NET-701（连接 + 回显）/ TC-NET-702（关闭重连）/ TC-NET-703（连接超时）。
* 通过：回显逐字节一致且 32 位 checksum 匹配；重连全部成功；超时用例未建连。
* 失败：连接失败 / 回显不一致 / 重连中断 / 超时用例误建连。
* =================================================================== */
@@ -146,7 +146,7 @@ static void phase6_run(int32_t sockfd) {
#define PHASE7_CONN_TIMEOUT_MS 10000
#endif
#ifndef PHASE7_TIMEOUT_TEST_MS
#define PHASE7_TIMEOUT_TEST_MS 30000 /* TC 703 连接超时窗（指南规定 30s） */
#define PHASE7_TIMEOUT_TEST_MS 30000 /* TC-NET-703 连接超时窗（指南规定 30s） */
#endif
/* 32 位累加和：足以发现丢字节/错位，比 CRC32 便宜 */
@@ -156,14 +156,14 @@ static uint32_t phase7_cksum(const uint8_t *p, uint32_t n) {
return s;
}
/* 单次 TCP Client 会话：对应 TC 701 主体 / TC 702 单轮。
/* 单次 TCP Client 会话：对应 TC-NET-701 主体 / TC-NET-702 单轮。
* 每轮使用不同本地端口 local_port 规避 TIME_WAIT。
* 返回 1 表示全流程通过，0 表示中途失败（已记录 TEST_CHECK）。 */
static int32_t phase7_session(uint16_t local_port)
{
int32_t sockfd = net_socket(NET_AF_INET, NET_SOCK_STREAM);
if (sockfd < 0) {
TEST_CHECK(0, "TC701 socket create");
TEST_CHECK(0, "TC-NET-701 socket create");
return 0;
}
@@ -174,7 +174,7 @@ static int32_t phase7_session(uint16_t local_port)
laddr.sin_family = NET_AF_INET;
laddr.sin_port = net_htons(local_port);
if (net_bind(sockfd, (struct net_sockaddr *)&laddr, sizeof(laddr)) < 0) {
TEST_CHECK(0, "TC701 bind port %d", local_port);
TEST_CHECK(0, "TC-NET-701 bind port %d", local_port);
net_close(sockfd);
return 0;
}
@@ -187,10 +187,10 @@ static int32_t phase7_session(uint16_t local_port)
raddr.sin_port = net_htons((uint16_t)PHASE7_REMOTE_PORT);
raddr.sin_addr.s_addr = net_inet_addr(PHASE7_REMOTE_IP);
DBG_INFO("TC701 connecting %s:%d (local port %d)",
DBG_INFO("TC-NET-701 connecting %s:%d (local port %d)",
PHASE7_REMOTE_IP, PHASE7_REMOTE_PORT, local_port);
int32_t rc = net_connect(sockfd, (struct net_sockaddr *)&raddr, sizeof(raddr));
TEST_CHECK(rc == 0, "TC701 connect issued (ret=%d)", rc);
TEST_CHECK(rc == 0, "TC-NET-701 connect issued (ret=%d)", rc);
if (rc != 0) { net_close(sockfd); return 0; }
/* 等待连接建立：轮询 socket 状态（ESTABLISHED）。
@@ -208,7 +208,7 @@ static int32_t phase7_session(uint16_t local_port)
}
osDelay(100); /* 仅作等待/让出 CPU；连接状态由 netTask 的 net_poll 每 10ms 刷新 */
}
TEST_CHECK(connected, "TC701 connected within %dms", PHASE7_CONN_TIMEOUT_MS);
TEST_CHECK(connected, "TC-NET-701 connected within %dms", PHASE7_CONN_TIMEOUT_MS);
if (!connected) { net_close(sockfd); return 0; }
}
@@ -218,7 +218,7 @@ static int32_t phase7_session(uint16_t local_port)
for (int32_t i = 0; i < PHASE7_EXCH_SIZE; i++) tx[i] = (uint8_t)i;
int32_t sent = net_send(sockfd, tx, PHASE7_EXCH_SIZE, 0);
TEST_CHECK(sent == PHASE7_EXCH_SIZE, "TC701 send %dB (sent=%d)", PHASE7_EXCH_SIZE, sent);
TEST_CHECK(sent == PHASE7_EXCH_SIZE, "TC-NET-701 send %dB (sent=%d)", PHASE7_EXCH_SIZE, sent);
if (sent != PHASE7_EXCH_SIZE) { net_close(sockfd); return 0; }
int32_t recvd = 0;
@@ -245,23 +245,23 @@ static int32_t phase7_session(uint16_t local_port)
for (int32_t i = 0; i < PHASE7_EXCH_SIZE; i++) {
if (rx[i] != (uint8_t)i) { bad = 1; break; }
}
TEST_CHECK(!bad, "TC701 byte-compare %dB", PHASE7_EXCH_SIZE);
TEST_CHECK(1, "TC701 recv %dB, cksum=0x%08X", recvd, phase7_cksum(rx, PHASE7_EXCH_SIZE));
TEST_CHECK(!bad, "TC-NET-701 byte-compare %dB", PHASE7_EXCH_SIZE);
TEST_CHECK(1, "TC-NET-701 recv %dB, cksum=0x%08X", recvd, phase7_cksum(rx, PHASE7_EXCH_SIZE));
} else {
TEST_CHECK(0, "TC701 recv %dB (expect %d)", recvd, PHASE7_EXCH_SIZE);
TEST_CHECK(0, "TC-NET-701 recv %dB (expect %d)", recvd, PHASE7_EXCH_SIZE);
}
net_close(sockfd);
return ok;
}
/* TC 703（负向）：连接超时。PC 未在 REMOTE_IP:REMOTE_PORT 提供服务时，
* connect 不应成功建立。本用例需先关闭 PC 端 tcp_server（与 TC 701/702 互斥环境：
/* TC-NET-703（负向）：连接超时。PC 未在 REMOTE_IP:REMOTE_PORT 提供服务时，
* connect 不应成功建立。本用例需先关闭 PC 端 tcp_server（与 TC-NET-701/702 互斥环境：
* 701/702 要求服务端在线，703 要求服务端离线，故 703 应在独立的一轮中运行）。 */
static void phase7_test_timeout(void)
{
int32_t sockfd = net_socket(NET_AF_INET, NET_SOCK_STREAM);
if (sockfd < 0) { TEST_CHECK(0, "TC703 socket create"); return; }
if (sockfd < 0) { TEST_CHECK(0, "TC-NET-703 socket create"); return; }
struct net_sockaddr_in raddr;
memset(&raddr, 0, sizeof(raddr));
@@ -269,10 +269,10 @@ static void phase7_test_timeout(void)
raddr.sin_port = net_htons((uint16_t)PHASE7_REMOTE_PORT);
raddr.sin_addr.s_addr = net_inet_addr(PHASE7_REMOTE_IP);
DBG_INFO("TC703 connecting %s:%d (expect TIMEOUT, PC server must be OFF)",
DBG_INFO("TC-NET-703 connecting %s:%d (expect TIMEOUT, PC server must be OFF)",
PHASE7_REMOTE_IP, PHASE7_REMOTE_PORT);
int32_t rc = net_connect(sockfd, (struct net_sockaddr *)&raddr, sizeof(raddr));
TEST_CHECK(rc == 0, "TC703 connect issued (ret=%d)", rc);
TEST_CHECK(rc == 0, "TC-NET-703 connect issued (ret=%d)", rc);
if (rc != 0) { net_close(sockfd); return; }
int32_t established = 0;
@@ -284,14 +284,14 @@ static void phase7_test_timeout(void)
osDelay(100); /* 仅作等待/让出 CPU；连接状态由 netTask 的 net_poll 每 10ms 刷新 */
}
if (established) {
TEST_CHECK(0, "TC703 connected?! stop PC server and retry");
TEST_CHECK(0, "TC-NET-703 connected?! stop PC server and retry");
} else {
TEST_CHECK(1, "TC703 no-connect within %dms (timeout as expected)", PHASE7_TIMEOUT_TEST_MS);
TEST_CHECK(1, "TC-NET-703 no-connect within %dms (timeout as expected)", PHASE7_TIMEOUT_TEST_MS);
}
net_close(sockfd);
}
/* TC 704：多 Socket 并发 TCP Client。
/* TC-NET-704：多 Socket 并发 TCP Client。
* 并发上限 = NET_MAX_SOCKETS(8) − 3 个常驻监听（FTP / 对时 / 远显）= 5；
* 本用例同时打开 Socket 0~4，各自连 PC echo server，每路独立收发
* PHASE7_EXCH_SIZE 字节回显并比对，验证 5 个 Socket 均能独立工作。
@@ -315,7 +315,7 @@ static int32_t phase7_session_multi(void)
for (int32_t i = 0; i < PHASE7_MULTI_COUNT; i++) {
sockfd[i] = net_socket(NET_AF_INET, NET_SOCK_STREAM);
if (sockfd[i] < 0) {
TEST_CHECK(0, "TC704 socket create #%d", i);
TEST_CHECK(0, "TC-NET-704 socket create #%d", i);
for (int32_t j = 0; j < i; j++) net_close(sockfd[j]);
return 0;
}
@@ -324,7 +324,7 @@ static int32_t phase7_session_multi(void)
laddr.sin_family = NET_AF_INET;
laddr.sin_port = net_htons((uint16_t)(PHASE7_MULTI_BASE_PORT + i));
if (net_bind(sockfd[i], (struct net_sockaddr *)&laddr, sizeof(laddr)) < 0) {
TEST_CHECK(0, "TC704 bind #%d port %d", i, PHASE7_MULTI_BASE_PORT + i);
TEST_CHECK(0, "TC-NET-704 bind #%d port %d", i, PHASE7_MULTI_BASE_PORT + i);
net_close(sockfd[i]);
for (int32_t j = 0; j < i; j++) net_close(sockfd[j]);
return 0;
@@ -335,7 +335,7 @@ static int32_t phase7_session_multi(void)
raddr.sin_port = net_htons((uint16_t)PHASE7_REMOTE_PORT);
raddr.sin_addr.s_addr = net_inet_addr(PHASE7_REMOTE_IP);
int32_t rc = net_connect(sockfd[i], (struct net_sockaddr *)&raddr, sizeof(raddr));
TEST_CHECK(rc == 0, "TC704 connect #%d issued (ret=%d)", i, rc);
TEST_CHECK(rc == 0, "TC-NET-704 connect #%d issued (ret=%d)", i, rc);
if (rc != 0) {
net_close(sockfd[i]);
for (int32_t j = 0; j < i; j++) net_close(sockfd[j]);
@@ -356,11 +356,11 @@ static int32_t phase7_session_multi(void)
if (all_up) break;
osDelay(100);
}
TEST_CHECK(all_up, "TC704 all %d sockets established within %dms", PHASE7_MULTI_COUNT, PHASE7_CONN_TIMEOUT_MS);
TEST_CHECK(all_up, "TC-NET-704 all %d sockets established within %dms", PHASE7_MULTI_COUNT, PHASE7_CONN_TIMEOUT_MS);
if (!all_up) {
for (int32_t i = 0; i < PHASE7_MULTI_COUNT; i++) {
net_sock_t *sk = net_get_sock(sockfd[i]);
if (sk) DBG_ERROR("TC704 socket #%d state=%d", i, sk->state);
if (sk) DBG_ERROR("TC-NET-704 socket #%d state=%d", i, sk->state);
net_close(sockfd[i]);
}
return 0;
@@ -372,7 +372,7 @@ static int32_t phase7_session_multi(void)
for (int32_t i = 0; i < PHASE7_MULTI_COUNT; i++) {
int32_t sent = net_send(sockfd[i], tx, PHASE7_EXCH_SIZE, 0);
if (sent != PHASE7_EXCH_SIZE) {
TEST_CHECK(0, "TC704 socket #%d send %dB (sent=%d)", i, PHASE7_EXCH_SIZE, sent);
TEST_CHECK(0, "TC-NET-704 socket #%d send %dB (sent=%d)", i, PHASE7_EXCH_SIZE, sent);
ok = 0;
continue;
}
@@ -393,9 +393,9 @@ static int32_t phase7_session_multi(void)
if (sock_ok) {
int32_t bad = 0;
for (int32_t k = 0; k < PHASE7_EXCH_SIZE; k++) if (rx[k] != (uint8_t)k) { bad = 1; break; }
TEST_CHECK(!bad, "TC704 socket #%d echo %dB OK", i, PHASE7_EXCH_SIZE);
TEST_CHECK(!bad, "TC-NET-704 socket #%d echo %dB OK", i, PHASE7_EXCH_SIZE);
} else {
TEST_CHECK(0, "TC704 socket #%d recv %dB (expect %d)", i, recvd, PHASE7_EXCH_SIZE);
TEST_CHECK(0, "TC-NET-704 socket #%d recv %dB (expect %d)", i, recvd, PHASE7_EXCH_SIZE);
ok = 0;
}
}
@@ -410,23 +410,23 @@ void net_layer_client_test_main(void)
{
DBG_INFO("=== CH395F Phase 7 Tests (NET TCP Client) ===");
DBG_INFO("--- TC 701: connect + %dB echo exchange ---", PHASE7_EXCH_SIZE);
DBG_INFO("--- TC-NET-701: connect + %dB echo exchange ---", PHASE7_EXCH_SIZE);
phase7_session((uint16_t)PHASE7_LOCAL_PORT);
DBG_INFO("--- TC 702: close/reconnect x%d ---", PHASE7_LOOP_COUNT);
DBG_INFO("--- TC-NET-702: close/reconnect x%d ---", PHASE7_LOOP_COUNT);
{
int32_t all_ok = 1;
for (int32_t i = 0; i < PHASE7_LOOP_COUNT; i++) {
if (!phase7_session((uint16_t)(PHASE7_LOCAL_PORT + 1 + i))) all_ok = 0;
}
TEST_CHECK(all_ok, "TC702 reconnect x%d all passed", PHASE7_LOOP_COUNT);
TEST_CHECK(all_ok, "TC-NET-702 reconnect x%d all passed", PHASE7_LOOP_COUNT);
}
DBG_INFO("--- TC 704: %d-socket concurrent client (PC %s:%d MUST be ON) ---",
DBG_INFO("--- TC-NET-704: %d-socket concurrent client (PC %s:%d MUST be ON) ---",
PHASE7_MULTI_COUNT, PHASE7_REMOTE_IP, PHASE7_REMOTE_PORT);
phase7_session_multi();
DBG_INFO("--- TC 703: connect timeout (PC %s:%d MUST be OFF) ---",
DBG_INFO("--- TC-NET-703: connect timeout (PC %s:%d MUST be OFF) ---",
PHASE7_REMOTE_IP, PHASE7_REMOTE_PORT);
phase7_test_timeout();