feat(net/udp): UDP 数据面并入 netMsgQueue 串行执行(#73)
前置来自 #57 SNTP 调研:旧 net_sendto / net_recvfrom 由调用方直调 SPI 且无限自旋收包,既违约「netTask 是芯片唯一访问者」,又把 IWDG 预算吃在自旋里。 改造面 - 新增 Drivers/BSP/NET/net_udp.c/.h(真机专属,模拟器不编译): bind/set_peer/sendto/recvfrom 四条执行体 + 挂起收包表 + tick; net_msg_type_t 加四型,公开 API 一律「入队 → 睡在通知上」。 - 源地址出参不搭 net_msg_t(按值拷贝,AGENTS 禁加回传字段):改住 net_udp.c 的 per-fd 槽,netTask 就地写回调用方内存,通知值只带 结果码;每条出口都清槽,泄漏 = 该 fd 永久 BUSY。 - 发送复用 net_send_locked,不写第二份分块逻辑;「会话是否已死」 收成一条判据 net_send_state_down()(TCP 看 ESTABLISHED、UDP 看 UDP_OPEN),原先 4 处各写一遍。 - 顺带修掉真缺陷(新条 TRAP-NET-22):旧 sendto 把 DesIP 写成具体 IP,芯片静默切 UDP Client,而旧 recvfrom 无条件剥 8 字节 → SNTP 这类 48 B 应答丢载荷前 8 字节并交出垃圾源地址。加 udp_mode(塞进 原有 padding,sizeof 不变)、bind 恒 SERVER、显式对端 sendto 切 CLIENT、set_peer(fd, NULL) 轻量回 SERVER,仅 SERVER 且 avail >= 8 才剥头。 - 截断定案:一次调用交付一个数据报,buf 装不下的尾巴用 64 B 栈上 scratch 排空(不用 clear_recv_buf——它连后面已到达的包一起丢)。 - 取消点接齐:net_init 重建 cancel_all、net_socket 分配 fd clear、 net_close settle_close + clear、重 bind 前先结算等包者, net_process_messages 第 5 个 tick 位挂 net_udp_tick。 - 收紧两处契约(原实现无生产调用者):UDP 未 bind 一律 -5; net_recv / _nb / _to 拒 DGRAM(绕过剥头就是静默吃 8 字节); NET_ERR_NOT_IN_NETTASK(-12) 退役为历史常量并写明原因。 验证 - 主机单测 test/host/net_socket 全套 616/616 绿(改造前 470):新 分片 ns_s7_udp.c 20 组,改写 440 / 555 / 560 组;覆盖率 net_udp.c 234/236(99.2%)、net_socket.c 956/969(98.7%), scripts/test_coverage_baseline.json 随本提交登记新文件。 - 测试抓到 4 个被测码真 bug:自等守卫误用调用侧谓词、芯片长度被读 两次、槽指针取在 fd 合法性检查之前、重 bind 静默作废等待者。 - Keil ARMCC 0 Error(s) 0 Warning(s);net_udp.o Code 1,358 / ZI 224 (8 fd × 28 B,其余模块零增长),全仓 RW_IRAM1 72.2%;内存台账 受管区按门禁提示用 --write / --update 机器回填,未手改数字。 - pre-commit 全量钩子(含 doc-links、coding-standard、mem-budget、 generated-fresh、bsp-err、registration、nested-comment)全绿。 限度 - 本轮无板子:真机回归 5 条(两端互通、set_peer(NULL) 能否恢复收 广播、截断排空后下一包完整性、挂起 recv 期间 IWDG 余量、bind 写 DesIP 与 open 先后的真芯片效果)已写进覆盖率口径「台架必验」。 - scripts/stack_report.py 退出码 1 是 10-26 起挂在账上的 iec104Task 栈债(margin 1,016 < 1,024,见 docs/代码规范/pre-commit使用说明.md: 122);本轮只让 net_bind 的 UDP 分支多一层静态帧(1,544 → 1,600), netTask margin 1,888 与 timeSyncTask 1,152 不受影响。抬栈要过 mem-budget 台账,不在本分支自行处理。 - 登记簿销项按仓库约定留给主工作树,本分支不动 docs/任务规划/**。
This commit is contained in:
@@ -134,6 +134,7 @@ SIM_EXEMPT = [
|
||||
("Drivers/BSP/NET/net_listener.c", "MCU 监听器生命周期(依赖 ch395f_* SPI 驱动与 net_socket.c 静态状态),模拟器无对应(Winsock 后端无孤儿态/重监听概念)"),
|
||||
("Drivers/BSP/NET/net_events.c", "MCU 芯片事件处理 + 100ms 周期对账(依赖 ch395f_* SPI 驱动与驱动状态缓存),模拟器无对应(Winsock 后端无\"事件未收到/静默回收\"概念,无失同步可收敛)"),
|
||||
("Drivers/BSP/NET/net_pending.c", "MCU 挂起 recv 模型(依赖 ch395f_* SPI 读出与 FreeRTOS 通知),模拟器另有 net_socket_sim.c 按外部语义模拟"),
|
||||
("Drivers/BSP/NET/net_udp.c", "MCU UDP 数据面执行器与挂起 recv 槽(2026-11-03 UDP 队列化改造;依赖 ch395f_* SPI 读写、net_send_locked 与 FreeRTOS 通知),模拟器另有 net_socket_sim.c 按外部语义模拟"),
|
||||
("Drivers/BSP/RS485/rs485.c", "MCU RS-485 驱动"),
|
||||
("Drivers/BSP/SD2506/sd2506.c", "MCU RTC 驱动"),
|
||||
("Drivers/BSP/ScreenLink/sb_proto.c", "屏板链路协议层纯逻辑(帧 A 解析 / 帧 B 组帧 / CRC-16),消费者 = MCU 侧 USART1 收发起发(批 1/2),模拟器无消费路径;主机侧纯逻辑单测覆盖于 test/host/sb_proto"),
|
||||
|
||||
@@ -15,3 +15,4 @@ date code ro rw zi er_irom1 er_pct iram1 iram1_pct ccm ccm_pct top_rwzi
|
||||
2026-10-29 243552 28784 1972 145388 272336 26.0 89936 68.6 57376 87.9 heap_4.o=57376;lv_mem_core_builtin.o=16384;lftpd.o=7884;ui_net_sink.o=6770;ui_port.o=6420;nand_ftl.o=6216;wave_ring.o=5296;ch395f.o=4162;console_log.o=4132;sys_log_mcu.o=4055
|
||||
2026-10-30 246720 29836 2052 149708 276556 26.4 94336 72.0 57376 87.9 heap_4.o=57376;lv_mem_core_builtin.o=16384;lftpd.o=7884;ui_net_sink.o=6770;ui_port.o=6432;nand_ftl.o=6216;wave_ring.o=5296;sb_link.o=4376;ch395f.o=4162;console_log.o=4132
|
||||
2026-11-02 247548 29836 2052 149740 277384 26.5 94368 72.0 57376 87.9 heap_4.o=57376;lv_mem_core_builtin.o=16384;lftpd.o=7884;ui_net_sink.o=6802;ui_port.o=6432;nand_ftl.o=6216;wave_ring.o=5296;sb_link.o=4376;ch395f.o=4162;console_log.o=4132
|
||||
2026-11-03 249112 29836 2052 149996 278948 26.6 94624 72.2 57376 87.9 heap_4.o=57376;lv_mem_core_builtin.o=16384;lftpd.o=7884;ui_net_sink.o=6802;ui_port.o=6432;nand_ftl.o=6216;wave_ring.o=5296;sb_link.o=4376;ch395f.o=4162;console_log.o=4132
|
||||
|
||||
|
@@ -329,12 +329,12 @@
|
||||
"lines_valid": 126
|
||||
},
|
||||
"Drivers/BSP/NET/net_pending.c": {
|
||||
"func_rate": 0.75,
|
||||
"funcs_covered": 12,
|
||||
"funcs_valid": 16,
|
||||
"line_rate": 0.8711,
|
||||
"lines_covered": 169,
|
||||
"lines_valid": 194
|
||||
"func_rate": 0.7647,
|
||||
"funcs_covered": 13,
|
||||
"funcs_valid": 17,
|
||||
"line_rate": 0.8693,
|
||||
"lines_covered": 173,
|
||||
"lines_valid": 199
|
||||
},
|
||||
"Drivers/BSP/NET/net_select.c": {
|
||||
"func_rate": 1.0,
|
||||
@@ -346,11 +346,19 @@
|
||||
},
|
||||
"Drivers/BSP/NET/net_socket.c": {
|
||||
"func_rate": 1.0,
|
||||
"funcs_covered": 53,
|
||||
"funcs_valid": 53,
|
||||
"line_rate": 0.9978,
|
||||
"lines_covered": 891,
|
||||
"lines_valid": 893
|
||||
"funcs_covered": 59,
|
||||
"funcs_valid": 59,
|
||||
"line_rate": 0.9969,
|
||||
"lines_covered": 966,
|
||||
"lines_valid": 969
|
||||
},
|
||||
"Drivers/BSP/NET/net_udp.c": {
|
||||
"func_rate": 1.0,
|
||||
"funcs_covered": 14,
|
||||
"funcs_valid": 14,
|
||||
"line_rate": 0.9916,
|
||||
"lines_covered": 237,
|
||||
"lines_valid": 239
|
||||
},
|
||||
"Drivers/BSP/NETCFG/ftp_cfg.c": {
|
||||
"func_rate": 1.0,
|
||||
@@ -396,9 +404,9 @@
|
||||
"func_rate": 0.7692,
|
||||
"funcs_covered": 10,
|
||||
"funcs_valid": 13,
|
||||
"line_rate": 0.7302,
|
||||
"lines_covered": 157,
|
||||
"lines_valid": 215
|
||||
"line_rate": 0.622,
|
||||
"lines_covered": 158,
|
||||
"lines_valid": 254
|
||||
},
|
||||
"Drivers/BSP/UI/ui_w_soe.c": {
|
||||
"func_rate": 1.0,
|
||||
@@ -573,9 +581,9 @@
|
||||
},
|
||||
"net_pending": {
|
||||
"files": {
|
||||
"Drivers/BSP/NET/net_pending.c": 194
|
||||
"Drivers/BSP/NET/net_pending.c": 199
|
||||
},
|
||||
"lines_total": 194,
|
||||
"lines_total": 199,
|
||||
"ok": true
|
||||
},
|
||||
"net_select": {
|
||||
@@ -587,9 +595,10 @@
|
||||
},
|
||||
"net_socket": {
|
||||
"files": {
|
||||
"Drivers/BSP/NET/net_socket.c": 893
|
||||
"Drivers/BSP/NET/net_socket.c": 969,
|
||||
"Drivers/BSP/NET/net_udp.c": 239
|
||||
},
|
||||
"lines_total": 893,
|
||||
"lines_total": 1208,
|
||||
"ok": true
|
||||
},
|
||||
"phasor": {
|
||||
@@ -730,9 +739,9 @@
|
||||
},
|
||||
"ui_sink": {
|
||||
"files": {
|
||||
"Drivers/BSP/UI/ui_net_sink.c": 215
|
||||
"Drivers/BSP/UI/ui_net_sink.c": 254
|
||||
},
|
||||
"lines_total": 215,
|
||||
"lines_total": 254,
|
||||
"ok": true
|
||||
},
|
||||
"vol_idle_sync": {
|
||||
@@ -827,6 +836,7 @@
|
||||
"Drivers/BSP/NET/net_pending.c",
|
||||
"Drivers/BSP/NET/net_select.c",
|
||||
"Drivers/BSP/NET/net_socket.c",
|
||||
"Drivers/BSP/NET/net_udp.c",
|
||||
"Drivers/BSP/NETCFG/ftp_cfg.c",
|
||||
"Drivers/BSP/NETCFG/net_cfg.c",
|
||||
"Drivers/BSP/ScreenLink/sb_link.c",
|
||||
@@ -837,14 +847,14 @@
|
||||
],
|
||||
"totals": {
|
||||
"files_generated_excluded": 5,
|
||||
"files_tested": 51,
|
||||
"files_untested": 172,
|
||||
"func_rate": 0.9243,
|
||||
"funcs_covered": 598,
|
||||
"funcs_valid": 647,
|
||||
"line_rate": 0.9019,
|
||||
"lines_covered": 8055,
|
||||
"lines_valid": 8931,
|
||||
"files_tested": 52,
|
||||
"files_untested": 173,
|
||||
"func_rate": 0.9266,
|
||||
"funcs_covered": 619,
|
||||
"funcs_valid": 668,
|
||||
"line_rate": 0.9012,
|
||||
"lines_covered": 8372,
|
||||
"lines_valid": 9290,
|
||||
"modules_ok": 47,
|
||||
"modules_total": 47
|
||||
},
|
||||
@@ -858,7 +868,7 @@
|
||||
"path": "Drivers/BSP/GD5F2GQ5UE/gd5f2gq5ue.c"
|
||||
},
|
||||
{
|
||||
"code_lines": 533,
|
||||
"code_lines": 570,
|
||||
"path": "App/task/ui_task.c"
|
||||
},
|
||||
{
|
||||
@@ -882,7 +892,7 @@
|
||||
"path": "Drivers/BSP/UI/ui_w_setview.c"
|
||||
},
|
||||
{
|
||||
"code_lines": 300,
|
||||
"code_lines": 303,
|
||||
"path": "Drivers/BSP/UI/ui_content_page.c"
|
||||
},
|
||||
{
|
||||
@@ -894,7 +904,7 @@
|
||||
"path": "Drivers/BSP/SD2506/sd2506.c"
|
||||
},
|
||||
{
|
||||
"code_lines": 248,
|
||||
"code_lines": 251,
|
||||
"path": "Drivers/BSP/UI/ui_page_wave_play.c"
|
||||
},
|
||||
{
|
||||
@@ -953,6 +963,10 @@
|
||||
"code_lines": 142,
|
||||
"path": "App/task/protect_task.c"
|
||||
},
|
||||
{
|
||||
"code_lines": 134,
|
||||
"path": "Drivers/BSP/UI/ui_menu.c"
|
||||
},
|
||||
{
|
||||
"code_lines": 129,
|
||||
"path": "Drivers/BSP/UI/ui_page_clear.c"
|
||||
@@ -961,10 +975,6 @@
|
||||
"code_lines": 129,
|
||||
"path": "Drivers/BSP/UI/ui_page_comm.c"
|
||||
},
|
||||
{
|
||||
"code_lines": 126,
|
||||
"path": "Drivers/BSP/UI/ui_menu.c"
|
||||
},
|
||||
{
|
||||
"code_lines": 123,
|
||||
"path": "App/task/net_task.c"
|
||||
@@ -977,18 +987,22 @@
|
||||
"code_lines": 112,
|
||||
"path": "Drivers/BSP/UI/ui_page_ac.c"
|
||||
},
|
||||
{
|
||||
"code_lines": 104,
|
||||
"path": "Drivers/BSP/NET/net_types.h"
|
||||
},
|
||||
{
|
||||
"code_lines": 103,
|
||||
"path": "Drivers/BSP/UI/ui_port.c"
|
||||
},
|
||||
{
|
||||
"code_lines": 101,
|
||||
"path": "Drivers/BSP/NET/net_types.h"
|
||||
},
|
||||
{
|
||||
"code_lines": 98,
|
||||
"path": "Drivers/BSP/SD2506/sd2506.h"
|
||||
},
|
||||
{
|
||||
"code_lines": 94,
|
||||
"path": "Drivers/BSP/NET/net_socket.h"
|
||||
},
|
||||
{
|
||||
"code_lines": 93,
|
||||
"path": "Drivers/BSP/GD5F2GQ5UE/gd5f2gq5ue.h"
|
||||
@@ -1001,10 +1015,6 @@
|
||||
"code_lines": 84,
|
||||
"path": "Drivers/BSP/RS485/rs485.c"
|
||||
},
|
||||
{
|
||||
"code_lines": 83,
|
||||
"path": "Drivers/BSP/NET/net_socket.h"
|
||||
},
|
||||
{
|
||||
"code_lines": 77,
|
||||
"path": "App/algo/prot_set.h"
|
||||
@@ -1074,12 +1084,12 @@
|
||||
"path": "App/algo/adc_input.h"
|
||||
},
|
||||
{
|
||||
"code_lines": 42,
|
||||
"path": "App/cfg/cfg_file.h"
|
||||
"code_lines": 43,
|
||||
"path": "Drivers/BSP/UI/ui_content_page.h"
|
||||
},
|
||||
{
|
||||
"code_lines": 42,
|
||||
"path": "Drivers/BSP/UI/ui_content_page.h"
|
||||
"path": "App/cfg/cfg_file.h"
|
||||
},
|
||||
{
|
||||
"code_lines": 41,
|
||||
@@ -1137,6 +1147,10 @@
|
||||
"code_lines": 33,
|
||||
"path": "Drivers/BSP/NET/net_select.h"
|
||||
},
|
||||
{
|
||||
"code_lines": 33,
|
||||
"path": "Drivers/BSP/UI/ui_net_sink.h"
|
||||
},
|
||||
{
|
||||
"code_lines": 33,
|
||||
"path": "Drivers/BSP/UI/ui_page_action.h"
|
||||
@@ -1185,6 +1199,10 @@
|
||||
"code_lines": 27,
|
||||
"path": "App/task/task_handles.h"
|
||||
},
|
||||
{
|
||||
"code_lines": 27,
|
||||
"path": "Drivers/BSP/NET/net_pending.h"
|
||||
},
|
||||
{
|
||||
"code_lines": 27,
|
||||
"path": "Drivers/BSP/UI/ui_w_setview.h"
|
||||
@@ -1197,10 +1215,6 @@
|
||||
"code_lines": 26,
|
||||
"path": "App/util/task_prof.h"
|
||||
},
|
||||
{
|
||||
"code_lines": 26,
|
||||
"path": "Drivers/BSP/NET/net_pending.h"
|
||||
},
|
||||
{
|
||||
"code_lines": 26,
|
||||
"path": "Drivers/BSP/UI/ui_port.h"
|
||||
@@ -1269,10 +1283,6 @@
|
||||
"code_lines": 22,
|
||||
"path": "Drivers/BSP/UI/ui_page_yk.c"
|
||||
},
|
||||
{
|
||||
"code_lines": 20,
|
||||
"path": "Drivers/BSP/UI/ui_net_sink.h"
|
||||
},
|
||||
{
|
||||
"code_lines": 19,
|
||||
"path": "App/app/sys_events.h"
|
||||
@@ -1309,6 +1319,10 @@
|
||||
"code_lines": 15,
|
||||
"path": "App/util/sys_clock.h"
|
||||
},
|
||||
{
|
||||
"code_lines": 15,
|
||||
"path": "Drivers/BSP/NET/net_udp.h"
|
||||
},
|
||||
{
|
||||
"code_lines": 15,
|
||||
"path": "Drivers/BSP/UI/ui_net_sink_backend_mcu.c"
|
||||
@@ -1353,6 +1367,10 @@
|
||||
"code_lines": 12,
|
||||
"path": "Drivers/BSP/NET/lftpd/private/lftpd_io.h"
|
||||
},
|
||||
{
|
||||
"code_lines": 12,
|
||||
"path": "Drivers/BSP/UI/ui_menu.h"
|
||||
},
|
||||
{
|
||||
"code_lines": 12,
|
||||
"path": "Drivers/BSP/UI/ui_net_sink_backend.h"
|
||||
@@ -1381,10 +1399,6 @@
|
||||
"code_lines": 11,
|
||||
"path": "Drivers/BSP/NET/lftpd/private/lftpd_inet.h"
|
||||
},
|
||||
{
|
||||
"code_lines": 11,
|
||||
"path": "Drivers/BSP/UI/ui_menu.h"
|
||||
},
|
||||
{
|
||||
"code_lines": 11,
|
||||
"path": "Drivers/BSP/UI/ui_page_calib.h"
|
||||
|
||||
Reference in New Issue
Block a user