From 2053f6d913cd32f5079a31a799384fde7789d860 Mon Sep 17 00:00:00 2001 From: Wanderingss <1624155937@qq.com> Date: Wed, 18 Nov 2026 23:31:37 +0800 Subject: [PATCH 1/5] =?UTF-8?q?docs(iec60870):=20=E6=8A=8A=20104=20?= =?UTF-8?q?=E6=9D=BF=E7=AB=AF=E8=90=BD=E5=9C=B0=E6=96=87=E6=A1=A3=E5=BD=92?= =?UTF-8?q?=E5=85=A5=20docs/iec60870/=E6=9D=BF=E7=AB=AF=E8=90=BD=E5=9C=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 四篇讲「本项目怎么接 104」的文档原来散在子系统设计与网络两个目录, 和随库迁入的 36 篇协议库设计混在一起。现集中到 docs/iec60870/板端落地/: - IEC104上行设计说明.md(原 docs/子系统设计/) - IEC104_Net适配契约.md(原 docs/网络/) - IEC104_MCU落地规划.md(原 docs/子系统设计/) - IEC104_MCU最小可行性验证.md(原 docs/子系统设计/) 改动: - 四篇 git mv 保留历史,全库引用经 rename_ref.py 逐篇改写(27 个文件 54 处引用行),旧路径残留扫描为 0。 - docs/README.md:§5.3 改为「IEC 60870-5-104 文档(40 篇)」,拆成 「板端落地 4 篇」与「协议库设计与接口 36 篇」两张表,说明两条轴的分工; 从 §5.1 功能子系统表里移除这三篇的重复条目。 - docs/iec60870/README.md:新增两条轴入口与板端落地表,原阅读顺序 改标注为「协议库部分」。 验证: - check_doc_links.py --all --sections-strict:310 篇 0 问题。 - 三份索引 markdown 链接可达性逐个 exists() 校验,断链 0;索引表覆盖 36 篇协议库文档,与实际磁盘文件双向差集为空。 - 板端落地目录 4 篇 BOM / CR / U+FFFD 均为 0。 - 工作树 Keil 权威构建 0 errors 0 warnings(Code=365896 RO=48336 RW=2736 ZI=173104),此后预提交 21 Passed / 0 Failed。 --- App/README.md | 2 +- App/iec60870/104/README.md | 8 +++---- App/iec60870/104/business/README.md | 2 +- App/iec60870/104/iec104_comm.c | 2 +- App/iec60870/104/iec104_comm.h | 2 +- App/iec60870/README.md | 4 ++-- App/iec60870/common/README.md | 2 +- App/log/README.md | 4 ++-- Drivers/BSP/UI/ui_page_yk.c | 2 +- README.md | 2 +- docs/README.md | 22 +++++++++++------ docs/iec60870/README.md | 24 ++++++++++++++++--- .../板端落地}/IEC104_MCU最小可行性验证.md | 2 +- .../板端落地}/IEC104_MCU落地规划.md | 2 +- .../板端落地}/IEC104_Net适配契约.md | 0 .../板端落地}/IEC104上行设计说明.md | 2 +- docs/产品需求/产品需求设计文档.md | 10 ++++---- docs/子系统设计/网络配置说明.md | 4 ++-- docs/子系统设计/运行与自检记录设计.md | 2 +- docs/架构设计/项目架构总览.md | 2 +- docs/测试说明/专项验证/模拟器差距清单.md | 2 +- .../测试说明/单元测试/开机账本单元测试说明.md | 2 +- docs/硬件平台/开入开出实施说明.md | 4 ++-- docs/算法/继电保护功能复现规划.md | 2 +- docs/问题记录/采集与数据处理短板评测.md | 4 ++-- scripts/archive/id_gate/编号治理历史.md | 4 ++-- simulator/README.md | 2 +- test/host/bench/iec104/iec104_master.py | 4 ++-- test/host/run_par/run_unit_test.py | 2 +- 29 files changed, 76 insertions(+), 50 deletions(-) rename docs/{子系统设计 => iec60870/板端落地}/IEC104_MCU最小可行性验证.md (98%) rename docs/{子系统设计 => iec60870/板端落地}/IEC104_MCU落地规划.md (99%) rename docs/{网络 => iec60870/板端落地}/IEC104_Net适配契约.md (100%) rename docs/{子系统设计 => iec60870/板端落地}/IEC104上行设计说明.md (97%) diff --git a/App/README.md b/App/README.md index e6e6f8f0..351d3fe1 100644 --- a/App/README.md +++ b/App/README.md @@ -41,7 +41,7 @@ FreeRTOS/CMSIS-RTOS API**(本条与「就绪屏障位必须 `osFlagsNoClear` 改动口径:全部按项目自有代码对待(命名、注释、结构遵循 `docs/代码规范/`); `iec104_*` 是本项目自己的装配与平台层,`IEC104_*` / `IEC60870_*` 是协议主体与共享编解码。 -设计入口 → `docs/子系统设计/IEC104上行设计说明.md`;目录说明与改动纪律 → [`iec60870/README.md`](iec60870/README.md)。 +设计入口 → `docs/iec60870/板端落地/IEC104上行设计说明.md`;目录说明与改动纪律 → [`iec60870/README.md`](iec60870/README.md)。 ## 相关文档 diff --git a/App/iec60870/104/README.md b/App/iec60870/104/README.md index 69dd4123..cf0a2d56 100644 --- a/App/iec60870/104/README.md +++ b/App/iec60870/104/README.md @@ -28,7 +28,7 @@ Net 后端,装配代码与它服务的传输层放在一起才能一眼看清 `iec104_net_mcu.c`(经 CH395F)实现,模拟器由 `IEC104_Net_Windows.c` 实现。 同时链接两份会重复定义符号,或者更隐蔽地链到错的那份——两条路径的阻塞语义完全不同, 后者不会报错,只会让时序对不上。板端后端的句柄规则(LISTEN/CLIENT 双槽、代次不变式) -见 `docs/网络/IEC104_Net适配契约.md`。 +见 `docs/iec60870/板端落地/IEC104_Net适配契约.md`。 **非阻塞 I/O 与部分发送是这一层的前提。** `Slave`/`TcpServer` 假定 Net 后端从不在调用内 阻塞,因而发送必须能返回「已写一部分」,由 `SendManager` 记住偏移下轮续写。 @@ -46,7 +46,7 @@ Net 后端,装配代码与它服务的传输层放在一起才能一眼看清 - **它是「标准 DTU 演示表」,不等于现场点表。** 按 IEC 60870-5-104 标准 DTU 的典型配置 编排,用于跑通协议栈与主站对点工具,不代表现场实际接线。新旧通信地址相同**不代表 - 语义相同**;当前哪些点真接了硬件来源,见 `docs/子系统设计/IEC104上行设计说明.md` + 语义相同**;当前哪些点真接了硬件来源,见 `docs/iec60870/板端落地/IEC104上行设计说明.md` 的平台接缝章节。 - **改点数要同步别处。** 遥信总数的事实来源是 `iec104_dtu_table.h` 的 `IEC104_DTU_SP_COUNT`(59)/ `IEC104_DTU_DP_COUNT`(16),遥测为 @@ -82,7 +82,7 @@ Net 后端,装配代码与它服务的传输层放在一起才能一眼看清 ## 5. 相关文档 - 完整协议栈与目录总览 → [`../README.md`](../README.md) -- 板端设计与落地结论 → `docs/子系统设计/IEC104上行设计说明.md` +- 板端设计与落地结论 → `docs/iec60870/板端落地/IEC104上行设计说明.md` - 点表与 UI 视图的语义差异 → `docs/UI设计/UI_数据供给设计.md` -- Net 适配契约 → `docs/网络/IEC104_Net适配契约.md` +- Net 适配契约 → `docs/iec60870/板端落地/IEC104_Net适配契约.md` - 阻塞模型与 `netTask` 调用边界 → `docs/网络/Net层阻塞模型架构设计.md` diff --git a/App/iec60870/104/business/README.md b/App/iec60870/104/business/README.md index 77b6b256..0135c8b2 100644 --- a/App/iec60870/104/business/README.md +++ b/App/iec60870/104/business/README.md @@ -43,4 +43,4 @@ - 完整协议栈与目录总览 → [`../../README.md`](../../README.md) - 容量表与 RAM 口径 → [`../../README.md`](../../README.md) §4 -- 板端落地与已知缺口 → `docs/子系统设计/IEC104上行设计说明.md`、`docs/子系统设计/IEC104_MCU落地规划.md` +- 板端落地与已知缺口 → `docs/iec60870/板端落地/IEC104上行设计说明.md`、`docs/iec60870/板端落地/IEC104_MCU落地规划.md` diff --git a/App/iec60870/104/iec104_comm.c b/App/iec60870/104/iec104_comm.c index 0bc61c6e..4adda7cd 100644 --- a/App/iec60870/104/iec104_comm.c +++ b/App/iec60870/104/iec104_comm.c @@ -4,7 +4,7 @@ * getter 合法带自愈 + setter 守卫。契约、线程约定与生效语义 * (改后重启生效、不挂回调不置事件位、主站地址不做)→ * iec104_comm.h 文件头;键表口径 → docs/子系统设计/网络配置说明.md - * §3.6;热生效代价分析 → docs/子系统设计/IEC104上行设计说明.md §8。 + * §3.6;热生效代价分析 → docs/iec60870/板端落地/IEC104上行设计说明.md §8。 * 适用平台:STM32F407ZGTx / PC 模拟器(双端编译:模拟器运行期无 104 任务, * 本 TU 不产生行为,按双端注册口径入 CMakeLists 保持构建事实一致) * 创建日期:2026-10-26(道G task-8,「UI 补齐」第 5 项非 UI 前置) diff --git a/App/iec60870/104/iec104_comm.h b/App/iec60870/104/iec104_comm.h index a1c42218..31c69c23 100644 --- a/App/iec60870/104/iec104_comm.h +++ b/App/iec60870/104/iec104_comm.h @@ -20,7 +20,7 @@ * (拆链/网络代次重建)自然生效,不必整机重启。不挂段回调、不新增 * 事件位、不走 SYS_EVT_NET_RECONFIG(网络代次链语义不同;且 CH395F * 单连接 socket 上"换端口/拒绝重听"= close + re-listen,扫描主机 - * 可打成风暴,详见 docs/子系统设计/IEC104上行设计说明.md §8)。 + * 可打成风暴,详见 docs/iec60870/板端落地/IEC104上行设计说明.md §8)。 * 主站地址(accept 过滤)本卡**不做**:现无既有消费点,理由同上 §8。 * 创建日期:2026-10-26(道G task-8,「UI 补齐」第 5 项非 UI 前置) */ diff --git a/App/iec60870/README.md b/App/iec60870/README.md index 238694ca..5c948abf 100644 --- a/App/iec60870/README.md +++ b/App/iec60870/README.md @@ -151,7 +151,7 @@ CA,此后 `Find_Point` 在二分查找前先比对 CA,不匹配直接走与 ## 8. 相关文档 -- 板端设计与落地结论 → `docs/子系统设计/IEC104上行设计说明.md`、`docs/子系统设计/IEC104_MCU落地规划.md` +- 板端设计与落地结论 → `docs/iec60870/板端落地/IEC104上行设计说明.md`、`docs/iec60870/板端落地/IEC104_MCU落地规划.md` - 网络层阻塞模型与 `netTask` 调用边界 → `docs/网络/Net层阻塞模型架构设计.md` -- Net 适配契约(LISTEN/CLIENT 双句柄、代次不变式)→ `docs/网络/IEC104_Net适配契约.md` +- Net 适配契约(LISTEN/CLIENT 双句柄、代次不变式)→ `docs/iec60870/板端落地/IEC104_Net适配契约.md` - 目录总览 → [`App/README.md`](../README.md) diff --git a/App/iec60870/common/README.md b/App/iec60870/common/README.md index 2840834f..23ef549d 100644 --- a/App/iec60870/common/README.md +++ b/App/iec60870/common/README.md @@ -40,4 +40,4 @@ IOA 各占几个字节以及 ASDU 上限。通用上限是 254;接入本工程 - 完整协议栈与目录总览 → [`../README.md`](../README.md) - 信息对象与品质位口径在平台侧怎么消费 → `App/algo/meas.h` 的 `MEAS_QDS_*` 注释 -- ASDU 头与 COT 宽度 → `docs/子系统设计/IEC104上行设计说明.md` +- ASDU 头与 COT 宽度 → `docs/iec60870/板端落地/IEC104上行设计说明.md` diff --git a/App/log/README.md b/App/log/README.md index f7ab978a..1ae8f4b8 100644 --- a/App/log/README.md +++ b/App/log/README.md @@ -62,8 +62,8 @@ | 事故 | `SYSLOG_ACCIDENT` / `accid.log` | 512 | `App/task/protect_task.c:188` | `asserted` 上升沿**且**该元件跳闸投退项 = 1 | | 保护告警 | `SYSLOG_ALARM` / `alarm.log` | 1024 | 同文件 `191` | `asserted` 上升沿**且**跳闸投退项 = 0 或该元件无此项 | | 保护启动 | `SYSLOG_START` / `start.log` | 1024 | 同文件 `183` | `picked` 上升沿(越限电平,早于/等于动作) | -| 操作 | `SYSLOG_OPER` / `oper.log` | 512 | `App/task/default_task.c`(`default_task_func()`,`settings saved`)、`App/log/sys_log_mcu.c`(`s_clear_service()`,清除记录成功)、`App/task/ui_task.c`(`ui_task_maint_oper_note()`,面板操作)、`App/sync/time_sntp.c`(`clock set by SNTP`);宿主侧 `simulator/main.c` 与 `simulator/sim/sim_syslog.c` | 定值**真落盘成功** / 清除记录成功 / 面板运维动作 / SNTP 对时。⚠ 104 侧不再投递:原旧 `App/protocol/iec104/iec104_pts.c` 写 `force reset` 与 `plate in/out`,该实现已于 2026-11-17 割接删除(文件在 2026-11-18 随骨架迁 MCU 移除),骨架阶段不驱动物理出口故无记录(见 `docs/子系统设计/IEC104上行设计说明.md` §0.5) | -| 遥控 | `SYSLOG_YK` / `yk.log` | 256 | **当前无生产者**——原写入点旧 `App/protocol/iec104/iec104_pts.c`(`s_src_yk_exec()`:选择段、执行段、非法 DPC、未知 IOA;该文件 2026-11-18 已删除) | ⚠ 骨架阶段**有意不记**:模拟动作绝不驱动物理出口,照旧写"选择/执行"即为伪造记录(判据与后果见 `docs/子系统设计/IEC104上行设计说明.md` §0.5)。恢复记录需新增观测接缝,待另行立项 | +| 操作 | `SYSLOG_OPER` / `oper.log` | 512 | `App/task/default_task.c`(`default_task_func()`,`settings saved`)、`App/log/sys_log_mcu.c`(`s_clear_service()`,清除记录成功)、`App/task/ui_task.c`(`ui_task_maint_oper_note()`,面板操作)、`App/sync/time_sntp.c`(`clock set by SNTP`);宿主侧 `simulator/main.c` 与 `simulator/sim/sim_syslog.c` | 定值**真落盘成功** / 清除记录成功 / 面板运维动作 / SNTP 对时。⚠ 104 侧不再投递:原旧 `App/protocol/iec104/iec104_pts.c` 写 `force reset` 与 `plate in/out`,该实现已于 2026-11-17 割接删除(文件在 2026-11-18 随骨架迁 MCU 移除),骨架阶段不驱动物理出口故无记录(见 `docs/iec60870/板端落地/IEC104上行设计说明.md` §0.5) | +| 遥控 | `SYSLOG_YK` / `yk.log` | 256 | **当前无生产者**——原写入点旧 `App/protocol/iec104/iec104_pts.c`(`s_src_yk_exec()`:选择段、执行段、非法 DPC、未知 IOA;该文件 2026-11-18 已删除) | ⚠ 骨架阶段**有意不记**:模拟动作绝不驱动物理出口,照旧写"选择/执行"即为伪造记录(判据与后果见 `docs/iec60870/板端落地/IEC104上行设计说明.md` §0.5)。恢复记录需新增观测接缝,待另行立项 | - **"哪些元件算跳闸"只有一个真源**:定值表 `g_prot_set_meta` 里的 `PS_*_TRIP`(枚举注释 即"0 告警 / 1 跳闸")+ 实例表 `k_pe[]` 的 `trip_ctl` 列。分类入口 diff --git a/Drivers/BSP/UI/ui_page_yk.c b/Drivers/BSP/UI/ui_page_yk.c index 12ad8b4f..8ace0e76 100644 --- a/Drivers/BSP/UI/ui_page_yk.c +++ b/Drivers/BSP/UI/ui_page_yk.c @@ -8,7 +8,7 @@ * 触发判据 = 104 遥控的选择 / 执行 / 拒绝(含未知类型与参数越界); * 写入点 = 旧 App/protocol/iec104/iec104_pts.c 的遥控段(该文件 2026-11-18 * 已删除);骨架阶段**当前无生产者**——模拟动作绝不驱动物理出口, - * 见 docs/子系统设计/IEC104上行设计说明.md §0.5; + * 见 docs/iec60870/板端落地/IEC104上行设计说明.md §0.5; * "记录类型 = 日志 ID 本身"(一类记录一个文件,记录体内没有类型字段位, * Lead 裁定 2026-10-26)——本页只读 yk.log 一个文件,不做跨文件混排。 * 台架复核已完成(2026-11-06,Issue #53 台架轮、实机 boot 188–193,证据贴 Issue #53 评论): diff --git a/README.md b/README.md index 06d6bb02..4b8147bd 100644 --- a/README.md +++ b/README.md @@ -417,7 +417,7 @@ pre-commit run --all-files | `docs/网络/BSD_Socket_API_使用指南.md` | BSD Socket API 使用指南(`net_socket` / `net_select`:线程安全 / 快速开始 / TCP / UDP / I/O 多路复用 / 事件回调 / API 参考 / 常见问题) | | `docs/网络/Net层阻塞模型架构设计.md` | NET 阻塞模型(挂起请求表五路语义,recv 一期 / SEND 二期已落地) | | `docs/网络/网络自愈架构设计.md` | 网络自愈架构(监听重建 / 沉降隔离 / 周期对账) | -| `docs/子系统设计/IEC104上行设计说明.md` | IEC 60870-5-104 上行(工厂默认 :2404 监听) | +| `docs/iec60870/板端落地/IEC104上行设计说明.md` | IEC 60870-5-104 上行(工厂默认 :2404 监听) | | `docs/子系统设计/ADC采样节拍设计.md` | TIM3 1kHz 采样节拍(两片转换器同源硬件驱动) | | `docs/UI设计/UI_设计架构.md` | LVGL UI 系统架构(菜单 / 内容页 / 内存预算) | | `docs/UI设计/菜单页面设计.md` | 菜单导航行为、数据流与内容页设计 | diff --git a/docs/README.md b/docs/README.md index 5c520041..f62ab0ef 100644 --- a/docs/README.md +++ b/docs/README.md @@ -15,7 +15,7 @@ docs/ ├── 产品需求/ 产品需求设计文档(需求基线)+ 参考产品复刻明细(逐项差额) ├── 架构设计/ 全局架构与设计方法论(含 软件架构与运行时规格 / 硬件规格与能力边界:位表与引脚权威) ├── 子系统设计/ 各功能子系统的设计说明 -├── iec60870/ IEC 60870-5-104 协议库设计与接口文档(36 篇,导航 iec60870/README.md) +├── iec60870/ IEC 60870-5-104 文档(40 篇:板端落地 4 + 协议库设计 36,导航 iec60870/README.md) ├── 算法/ 傅氏算法与继电保护算法专题 ├── 网络/ BSD Socket API 使用与内部实现 ├── 测试说明/ 测试流程与规范 · 单元测试 · 板级测试 · 专项验证 · 测试工具 · 测试数据(六个子目录,导航 `测试说明/README.md`) @@ -96,13 +96,10 @@ docs/ | [`看门狗设计说明.md`](子系统设计/看门狗设计说明.md) | IWDG(CubeMX 配置)+ 任务心跳位图:选型与超时推导、掩码与埋点、取证机制、验证记录;已台架闭环(V2/V4/V5)。**§11 = 任务级饥饿的诊断方法与 `[PROF]` 实测基线**(诊断沉淀:判读口径、量化归因、三条脆弱点、明确不做的四条) | | [`ADC采样节拍设计.md`](子系统设计/ADC采样节拍设计.md) | **ADC 采集链路采样节拍(现状说明)**:TIM3 1 kHz 更新事件同时触发 TPAFE CONVST 与(经 TRGO)STM32 ADC1 + DMA 乒乓缓冲;节拍源为什么是 TIM3、DMA 硬约束、事件驱动消费与就绪门、实现落点、观测计数、性能特征与设计边界 | | [docs/子系统设计/故障录波设计说明.md](子系统设计/故障录波设计说明.md) | **故障录波设计与口径属主**:1 kHz 起步与 80 点口径的偏离登记、存原始码值的理由、四段所有权与四条并发陷阱、段文件字节布局、现场单通道回放显示契约、预算与 R6 前置 | -| [`IEC104上行设计说明.md`](子系统设计/IEC104上行设计说明.md) | **IEC 104 上行规约**:既有板端范围/点表/链路与历史验证;新增成熟共享核心迁入边界、标准演示集合、独立 RAM 参数、模拟动作和虚拟设备时间;真实 TCP 业务与板端替换状态分别说明,不把构建或旧台架结果当新核心验收 | -| [`IEC104_MCU落地规划.md`](子系统设计/IEC104_MCU落地规划.md) | **MCU 全功能规划(尚未实施)**:全点、全参数持久化及原子生效、通信切换、电能与严格兼容文件、网络与完整资源调查、逐项审批及分波次全量验收 | | [`屏板链路设计.md`](子系统设计/屏板链路设计.md) | **屏板串口链路(主机侧,`Drivers/BSP/ScreenLink/`)设计**:链路与角色、USART1 700 kbaud 配置与中断收发、物理接线(含台架日志口与 PC 顶替屏板)、协议实现口径(CRC 字节序 / 整帧 DMA / 时序)、键值与状态灯映射表、资源与耗时、对外接口表、验证状态与未闭环项、坑账本 | | [`网络/BSD_Socket_API_使用指南.md`](网络/BSD_Socket_API_使用指南.md) | **上层视图**:BSD Socket API 公开语义、示例、常见问题 | | [`网络/BSD_Socket_API_函数调用关系.md`](网络/BSD_Socket_API_函数调用关系.md) | **内部视图**:netTask / 消息队列 / 保护判据挂起 / 重试对账的调用关系与设计意图 | | [`网络/Net层阻塞模型架构设计.md`](网络/Net层阻塞模型架构设计.md) | **等待模型**:recv/send 挂起请求架构、数据结构与挂起槽状态机、recv 五路 + send 四路完成语义、模块接口契约(14 函数)、实现落点(20 集成点)、调用方契约、设计边界与性能特征 | -| [`网络/IEC104_Net适配契约.md`](网络/IEC104_Net适配契约.md) | **104 板端 Net 后端契约**:直译 vendor `Close(client)` 会毁掉监听的**反例**、按槽 role 的映射规则、LISTEN 恒定 / CLIENT 每次新建的双句柄模型、代次不变式、单调不复用句柄、`NET_NO_OS` 编译期边界与已知缺口、证据边界(fake 12/12,CH395F 板端未证) | | [`网络/网络自愈架构设计.md`](网络/网络自愈架构设计.md) | **网络自愈架构 + 监听生命周期**:现状权威描述——根因三层证据与 A′ 出局、ioLibrary 代码级对照、设计原则(不变量 I1~I8)、分层职责与三 tick、reconciler 形态①~⑤ + M3 门、驱动原语、读即清信源审计、FUN_PARA bit3 契约、recv 语义、KeepAlive、参数表与 E 锚点速查、红线、编号发现速查、代码级事实清点、决策记录、`net_listener.c` / `net_events.c` 模块化边界、延后项;审计与实施过程已归档 | | [`网络/网络句柄失效值契约.md`](网络/网络句柄失效值契约.md) | **fd 失效值契约(0 是合法句柄)**:220 banner 误导链、三层根因(失效值落合法域 / 数值形态判据 / 主机假 fd 域不同域)+「MISRA 9.1 与 cppcheck 为何抓不到」、契约条款 C1~C7 各带正反例、提交门禁 `net-handle` 的 R1~R5 与失败读法、新代码接入八条自查清单 | @@ -120,10 +117,21 @@ docs/ --- -### 5.3 IEC 60870-5-104 协议库文档(`docs/iec60870/`,36 篇) +### 5.3 IEC 60870-5-104 文档(`docs/iec60870/`,40 篇) 入口:[`iec60870/README.md`](iec60870/README.md)——按「想干什么」组织的导航(构建、点表、召唤、遥控、参数、文件、升级、历史、录波、日志、排障)。 -这批文档随 104 协议库从 `IEC60870-Slave/docs/` 迁入本仓文档库(2026-11-18),文中指向源码的链接已改指 `App/iec60870/`;**标「本项目未实现」的 7 篇是能力参考,不代表功能可用**。 +这个目录里有两条轴:**板端落地**是本项目自己的约定(怎么接、接成什么样),**协议库设计**是库内部各模块怎么实现(随库从 `IEC60870-Slave/docs/` 迁入,文中指向源码的链接已改指 `App/iec60870/`,标「本项目未实现」的 7 篇只是能力参考)。 + +**板端落地(本项目自有,4 篇)** + +| 文档 | 内容 | +|---|---| +| [`iec60870/板端落地/IEC104上行设计说明.md`](iec60870/板端落地/IEC104上行设计说明.md) | **104 上行规约基线**:范围、点表、链路流程、板端接入、RAM/栈预算与测试方案;含成熟核心迁入后的状态与验证边界(§0) | +| [`iec60870/板端落地/IEC104_Net适配契约.md`](iec60870/板端落地/IEC104_Net适配契约.md) | **板端 Net 后端契约**:直译 vendor `Close(client)` 会毁掉监听的**反例**、按槽 role 的映射规则、LISTEN 恒定 / CLIENT 每次新建的双句柄模型、代次不变式、`NET_NO_OS` 编译期边界与证据边界 | +| [`iec60870/板端落地/IEC104_MCU落地规划.md`](iec60870/板端落地/IEC104_MCU落地规划.md) | **MCU 全功能规划(尚未实施)**:全点、全参数持久化及原子生效、通信切换、电能与严格兼容文件、网络与完整资源调查、逐项审批及分波次全量验收 | +| [`iec60870/板端落地/IEC104_MCU最小可行性验证.md`](iec60870/板端落地/IEC104_MCU最小可行性验证.md) | **最小可行性验证记录**:已批准工作包的隔离验证结果与资源域 STOP 结论;记录当时的决策与证据,不是产品落地完成报告 | + +**协议库设计与接口(随库迁入,36 篇)** | 文档 | 内容 | |---|---| @@ -164,7 +172,7 @@ docs/ | [`iec60870/104/README.md`](iec60870/104/README.md) | 104 目录自身说明:文件分工、关键约束、平台适配层 | | [`iec60870/README.md`](iec60870/README.md) | 本批文档的总导航(按目的索引) | -> **与项目自有 104 文档的关系**:[`子系统设计/IEC104上行设计说明.md`](子系统设计/IEC104上行设计说明.md) 讲**板端怎么接**(点表、数据源、Net 后端、验收状态);本节这批讲**协议库内部怎么实现**。两者不重复:前者是本项目约定与落地状态,后者是协议模块的设计推理。 +> **两条轴的分工**:`板端落地/` 讲**本项目怎么接**(点表、数据源、Net 后端、资源与验收状态),是项目约定与落地状态的唯一出处;下面这批讲**协议库内部怎么实现**,是模块设计推理。两者不重复。 ## 6. 测试说明 diff --git a/docs/iec60870/README.md b/docs/iec60870/README.md index ef817ecc..a4c20777 100644 --- a/docs/iec60870/README.md +++ b/docs/iec60870/README.md @@ -1,10 +1,28 @@ # 文档索引 -说明文档统一放在 `docs/`,源码分别位于根目录的 `104/`、`common/`、`examples/` 和 `test/`。目录总览及快速构建入口见[项目 README](../README.md)。本文中的文档链接相对于当前文件;文档内的构建命令均从项目根目录执行。 +目录总览见[项目文档索引](../README.md)。本文中的文档链接相对于当前文件;文档内的构建命令均从项目根目录执行。 -## 推荐阅读顺序 +这个目录有两条轴,先认准是哪一条: -专用示例的点表、定值、运行与恢复见 [DTU 配置演示](examples/DTU配置演示.md),验证入口见 [DTU 测试](test/IEC104测试文档.md#dtu-tests)。 +| 轴 | 位置 | 讲什么 | +|---|---|---| +| **本项目板端落地** | [`板端落地/`](板端落地/) | 本项目自己怎么写:104 上行基线(范围/点表/链路/接入/预算)、板端 Net 后端契约、MCU 落地规划、最小可行性验证记录 | +| **协议库设计与接口** | `104/` `common/` `examples/` `test/` | 协议库各模块内部怎么实现(随库迁入,源码落点 `App/iec60870/`) | + +要判断「这块功能在本项目能不能用」,看 `板端落地/`;要理解「协议库内部某个模块怎么工作」,看下面这批。 + +## 板端落地(本项目自有,4 篇) + +| 文档 | 内容 | +|---|---| +| [104 上行设计说明](板端落地/IEC104上行设计说明.md) | 范围、点表、链路流程、板端接入、RAM/栈预算与测试方案;含成熟核心迁入后的状态与验证边界 | +| [104 板端 Net 适配契约](板端落地/IEC104_Net适配契约.md) | 把库的 `IEC104_Net.h` 后端 ABI 接到 `net_*` 的规则、双句柄模型、代次不变式与证据边界 | +| [MCU 全功能落地规划](板端落地/IEC104_MCU落地规划.md) | 全点、全参数持久化、通信切换、电能与文件服务、资源调查与分波次验收(尚未实施) | +| [MCU 最小可行性验证](板端落地/IEC104_MCU最小可行性验证.md) | 已批准工作包的隔离验证结果与资源域 STOP 结论(决策记录,不是落地完成报告) | + +## 推荐阅读顺序(协议库部分) + +以下是协议库内部的阅读路径,源码落点见上文。专用示例的点表、定值、运行与恢复见 [DTU 配置演示](examples/DTU配置演示.md),验证入口见 [DTU 测试](test/IEC104测试文档.md#dtu-tests)。 diff --git a/docs/子系统设计/IEC104_MCU最小可行性验证.md b/docs/iec60870/板端落地/IEC104_MCU最小可行性验证.md similarity index 98% rename from docs/子系统设计/IEC104_MCU最小可行性验证.md rename to docs/iec60870/板端落地/IEC104_MCU最小可行性验证.md index 238f394b..5837c386 100644 --- a/docs/子系统设计/IEC104_MCU最小可行性验证.md +++ b/docs/iec60870/板端落地/IEC104_MCU最小可行性验证.md @@ -2,7 +2,7 @@ > **定位**:记录已批准的最小可行性工作包及隔离验证结果,不是 MCU 产品落地完成报告。 > **状态**:网络、持久化与文件机制已完成隔离验证并经独立审查接受;资源域已终版审查并接受,结论为 STOP(见 `ci-artifacts/iec104-mcu-feasibility/resources/STOP.md`)。机制通过与资源停止结论分开,不表示 MCU 产品可部署。 -> **关联规划**:`docs/子系统设计/IEC104_MCU落地规划.md`;本报告补充新发现,不改写已冻结规划及历史产物。 +> **关联规划**:`docs/iec60870/板端落地/IEC104_MCU落地规划.md`;本报告补充新发现,不改写已冻结规划及历史产物。 ## 1. 固定一次验证范围,避免可行性工作包扩成无限优化 diff --git a/docs/子系统设计/IEC104_MCU落地规划.md b/docs/iec60870/板端落地/IEC104_MCU落地规划.md similarity index 99% rename from docs/子系统设计/IEC104_MCU落地规划.md rename to docs/iec60870/板端落地/IEC104_MCU落地规划.md index 5c9a299b..d58590c1 100644 --- a/docs/子系统设计/IEC104_MCU落地规划.md +++ b/docs/iec60870/板端落地/IEC104_MCU落地规划.md @@ -2,7 +2,7 @@ > **定位**:把已验证的模拟器共享核心推进到微控制器(MCU)产品所需的实施决策与验收方案,**不是实现完成报告**。 > **状态**:四域冻结调查汇总,待独立审查;明确推荐是实施决策依据,不表示方案已实现、资源已满足或产品改动获批。 -> **现状入口**:`docs/子系统设计/IEC104上行设计说明.md`;本文不改写既有模拟器和板端历史验证结论。 +> **现状入口**:`docs/iec60870/板端落地/IEC104上行设计说明.md`;本文不改写既有模拟器和板端历史验证结论。 ## 1. 先固定全量交付边界,避免分批实施被误当成缩减产品范围 diff --git a/docs/网络/IEC104_Net适配契约.md b/docs/iec60870/板端落地/IEC104_Net适配契约.md similarity index 100% rename from docs/网络/IEC104_Net适配契约.md rename to docs/iec60870/板端落地/IEC104_Net适配契约.md diff --git a/docs/子系统设计/IEC104上行设计说明.md b/docs/iec60870/板端落地/IEC104上行设计说明.md similarity index 97% rename from docs/子系统设计/IEC104上行设计说明.md rename to docs/iec60870/板端落地/IEC104上行设计说明.md index fec37d76..5bb591c3 100644 --- a/docs/子系统设计/IEC104上行设计说明.md +++ b/docs/iec60870/板端落地/IEC104上行设计说明.md @@ -307,7 +307,7 @@ |---|---| | 主机侧纯逻辑单测 | `test/host/iec104/`(已删除 2026-11-18):APCI 重组/坏帧、STARTDT 握手、总召全流程(含 RBT/分片/预算)、COV、k/w 窗、t1/t2/t3(假时基)、遥控两段式与 PN、YK12 软压板两段转真 + 置脏(保护定值持久化)、定值两段写 + set_sealed 后 selfcheck、C_RD(含本地项不可寻址)、C_CS(含闰年)、错地址/错类型 EVI;**板端默认源真实链**(ring→phasor→freq→meas 快照,非桩):值/品质透传、CLIPPED→IV、0x401D 绑频(收敛 ±0.02 Hz / 未新鲜 IV)、死区运行时化 + 2 点确认/回摆撤销、seq 去重(104 改读快照与频率点绑定,TC-IEC104-025~028)+ 运行参数段路由/两段式/RMW(TC-IEC104-029)+ `[comm]` 段真链(道G task-8,TC-IEC104-031~033:注册/出厂模板/沉降重载/带外自愈/setter 守卫/ca 端到端 = C_RD 正答与旧写死 ca=1 转 COT13+EVI);`test/host/iec104_serv/`(已不存在,2026-11-18 复核)钉端口与 ca 取值来源(TC-I104SRV-001b/c);`test/host/cfg_file/` 钉段/键容量上限(TC-CONFIG-056/057);`test/host/run_par/`:[run_par] 注册/落盘往返/守卫/系数直通合法带(TC-RUNPAR-001~008);`test/host/prot_set/`:blob 往返 + 损坏整表拒绝(all-or-nothing)| | 静态门禁 | `iec104-unit-test` 钩子 + cppcheck/coding-standard | -| 台架 | `/serial-boot-test` 锚点(104 服务启动/监听行);**PC 主站客户端 `test/host/bench/iec104/iec104_master.py`(纯标准库,台架复测 2026-10-12 就绪)**:STARTDT/总召四组+actterm/C_SE 定值两段写→YX15·16 变位(COT=3)/恢复复归/YK11 两段正答/C_RD 读回,台架往返 **18/18 PASS**(证据 `../测试说明/测试数据/boot_log_data/20261012_B6_iec104_roundtrip_log.txt`);**保护定值持久化模式 `--b7-pre/--b7-post/--b7-mark/--b7-check`**(中间 ST-LINK 复位):YK12 两段投退→保护退出/联动、**定值与压板态跨复位保持**(含非默认 7.5 往返),**21/21 + 13/13 + 4/4+4/4 PASS**(证据 `../测试说明/测试数据/boot_log_data/20261012_B7_iec104_persist_log.txt`);**SOE 记录腿**(同工具同轮回归):自发 YX 断言 **M_SP_TB_1 带 ts**(工具解析 type 30/1 双型)+ FTP 下载 `/log/soe.log` 经 `test/host/soe/decode_soe.py` 解码断言(校验和/seq 单调/CP56↔epoch UTC 交叉),pre 21/21 + post 13/13 不回归;lib60870 级第三方全流程归 第三方送检验收 | +| 台架 | `/serial-boot-test` 锚点(104 服务启动/监听行);**PC 主站客户端 `test/host/bench/iec104/iec104_master.py`(纯标准库,台架复测 2026-10-12 就绪)**:STARTDT/总召四组+actterm/C_SE 定值两段写→YX15·16 变位(COT=3)/恢复复归/YK11 两段正答/C_RD 读回,台架往返 **18/18 PASS**(证据 `../../测试说明/测试数据/boot_log_data/20261012_B6_iec104_roundtrip_log.txt`);**保护定值持久化模式 `--b7-pre/--b7-post/--b7-mark/--b7-check`**(中间 ST-LINK 复位):YK12 两段投退→保护退出/联动、**定值与压板态跨复位保持**(含非默认 7.5 往返),**21/21 + 13/13 + 4/4+4/4 PASS**(证据 `../../测试说明/测试数据/boot_log_data/20261012_B7_iec104_persist_log.txt`);**SOE 记录腿**(同工具同轮回归):自发 YX 断言 **M_SP_TB_1 带 ts**(工具解析 type 30/1 双型)+ FTP 下载 `/log/soe.log` 经 `test/host/soe/decode_soe.py` 解码断言(校验和/seq 单调/CP56↔epoch UTC 交叉),pre 21/21 + post 13/13 不回归;lib60870 级第三方全流程归 第三方送检验收 | ## 8. V0.1 限制与待办(如实登记) diff --git a/docs/产品需求/产品需求设计文档.md b/docs/产品需求/产品需求设计文档.md index ef30f318..a475ba76 100644 --- a/docs/产品需求/产品需求设计文档.md +++ b/docs/产品需求/产品需求设计文档.md @@ -640,7 +640,7 @@ flowchart LR ### 5.15 IEC 60870-5-104 上行(FR-IEC104)✅ 本产品为**被控站(受控端)**:104 **TCP 服务器**,端口 `[comm]` 段 `port`(工厂默认 **2404**),主站主动连入。 -点表口径见 §6.8,设计细节见 [`docs/子系统设计/IEC104上行设计说明.md`](../子系统设计/IEC104上行设计说明.md)。 +点表口径见 §6.8,设计细节见 [`docs/iec60870/板端落地/IEC104上行设计说明.md`](../iec60870/板端落地/IEC104上行设计说明.md)。 **FR-IEC104-1 链路层** - 需求:APCI U/S/I 帧、STARTDT/STOPDT/TESTFR、k/w 窗、t1/t2/t3;TCP 流重组与坏帧自恢复。 @@ -1215,7 +1215,7 @@ for (i = 1; i < LED_COUNT; i++) /* LE | FTP | TCP **21** | 文件上传/下载(根目录 `/`,NAND 存储) | 登录后任意 FTP 客户端列目录/读写(鉴权见 §7.6) | | 墙钟对时(SNTP 客户端) | UDP 出向 **123**(主/备服务器 `[sntp]` 段,enable=0 出厂默认) | 设备主动取 NTP 源时间写 RTC(:8888 推送监听**已删除**,2026-11-04,§6.3) | 使能后核对设备时间 / 日志时间戳与 `[SNTP] step offset=` 留痕 | | 远程显示(RemoDispBus) | TCP **7003** | 远端看图(160×160 1bpp)+ 远端导航按键 | DTU-RemoteLCD 或任意 TCP 客户端连 7003 收帧 | -| IEC 60870-5-104 上行 | TCP **工厂默认 2404** | 被控站接入:遥测/遥信上送、总召、遥控/定值下发(点表见 §6.8) | 任意 104 主站连 2404,STARTDT+总召往返(→ `docs/子系统设计/IEC104上行设计说明.md`) | +| IEC 60870-5-104 上行 | TCP **工厂默认 2404** | 被控站接入:遥测/遥信上送、总召、遥控/定值下发(点表见 §6.8) | 任意 104 主站连 2404,STARTDT+总召往返(→ `docs/iec60870/板端落地/IEC104上行设计说明.md`) | > **现场组网要求**:设备与客户端**同网段**(默认 .100/24、网关 .1);跨网段先改 IP 再上线。 @@ -1354,7 +1354,7 @@ mac=00:00:00:00:00:00 ### 6.8 IEC 60870-5-104 点表摘要 > **权威口径**:验收以《检测平台配电终端送检要求(点表)》为准;本表是 V0.1 实现摘要, -> 逐点细节与未实现项见 [`docs/子系统设计/IEC104上行设计说明.md`](../子系统设计/IEC104上行设计说明.md) §3。 +> 逐点细节与未实现项见 [`docs/iec60870/板端落地/IEC104上行设计说明.md`](../iec60870/板端落地/IEC104上行设计说明.md) §3。 > **段基址与参考产品逐字对齐**(8 段全表见 复刻明细 §1):遥信 `0x0001`、保护 `0x1001`、遥测 `0x4001`、 > 参数 `0x5001`、遥控 `0x6001`、设定 `0x6201`、电能 `0x6401`、步位置 `0x6601`。 > **点表规模是当前最大差距**:本产品 9 遥测 / 33 遥信 / 2 遥控,参考产品 31 遥测 / 138 开入 / 31 开出。 @@ -1397,7 +1397,7 @@ mac=00:00:00:00:00:00 > 同期(13)、看门狗(63)、遥测越限(10)等整单元(复刻明细 §1)。 **链路参数**:k=12 / w=8 / t1=15 s / t2=10 s / t3=20 s;IOA 3 字节、公共地址 2 字节、传送原因 2 字节; -公共地址与端口可配(`[comm]` 段,工厂默认 1 / 2404)。**生效语义**(用户裁定 2026-10-30):两者都按「保存即生效」要求;现实现 = 公共地址改后重启、端口下次重 bind 才生效;差距的代码语义与重 bind 时机见 `docs/子系统设计/IEC104上行设计说明.md` §8。 +公共地址与端口可配(`[comm]` 段,工厂默认 1 / 2404)。**生效语义**(用户裁定 2026-10-30):两者都按「保存即生效」要求;现实现 = 公共地址改后重启、端口下次重 bind 才生效;差距的代码语义与重 bind 时机见 `docs/iec60870/板端落地/IEC104上行设计说明.md` §8。 --- @@ -1826,7 +1826,7 @@ pre-commit run --all-files | ADC 采样节拍与 DMA | [`docs/子系统设计/ADC采样节拍设计.md`](../../docs/子系统设计/ADC采样节拍设计.md) | | ADC 通道映射与实测 | [`docs/硬件平台/ADC通道映射说明.md`](../../docs/硬件平台/ADC通道映射说明.md) | | ADC 前端注入验证流程 | [`docs/测试说明/专项验证/ADC前端注入验证流程.md`](../测试说明/专项验证/ADC前端注入验证流程.md) | -| IEC 60870-5-104 上行 | [`docs/子系统设计/IEC104上行设计说明.md`](../../docs/子系统设计/IEC104上行设计说明.md) | +| IEC 60870-5-104 上行 | [`docs/iec60870/板端落地/IEC104上行设计说明.md`](../iec60870/板端落地/IEC104上行设计说明.md) | | 数据可信(标定 / 快照 / 运行参数) | [`docs/算法/采集与算法层设计说明.md`](../算法/采集与算法层设计说明.md) §13 | | 页面补齐规划 | [`docs/UI设计/页面补齐规划.md`](../../docs/UI设计/页面补齐规划.md) | | 条目命名与编号规则 | [`docs/文档规范.md`](../../docs/文档规范.md) §7.1 | diff --git a/docs/子系统设计/网络配置说明.md b/docs/子系统设计/网络配置说明.md index 8a6e1204..f5ee45d3 100644 --- a/docs/子系统设计/网络配置说明.md +++ b/docs/子系统设计/网络配置说明.md @@ -141,7 +141,7 @@ write=1 遥测死区 9 点的持久载体(引擎属主 defaultTask;**现场远程写入口 = 104 段 `0x8030~0x8038`**,本段键供 FTP 手改 / 排障直读,逐项语义与地址表 → -`docs/子系统设计/IEC104上行设计说明.md` §3.4)。**值 = 工程量毫单位 int32 有符号** +`docs/iec60870/板端落地/IEC104上行设计说明.md` §3.4)。**值 = 工程量毫单位 int32 有符号** (`db_ua=500` 即 0.5 V;电流域 `db_ia=5` 即 0.005 A;频率域 `db_freq=500` 即 0.5 Hz)。 | 键 | 通道 | 工厂默认 | 104 写路径合法域(毫单位) | @@ -177,7 +177,7 @@ write=1 端口另在下次重 bind(拆链/代次重建)自然生效。不挂段回调、不新增事件位—— CH395F 单连接 socket 上「换端口/拒绝重听」= close + re-listen,做成热生效 会被端口扫描打成 SPI/看门狗风暴(详论 → 本段只登记,正文唯一详述处 = - `docs/子系统设计/IEC104上行设计说明.md` §8)。 + `docs/iec60870/板端落地/IEC104上行设计说明.md` §8)。 - **主站地址(accept 侧 IP 白名单)本段不做**:无既有消费点 + 上述拒绝代价 + 配错即锁死真主站,待送检/现场需求立项;读者勿假设该键已存在。 - 落盘:UI 保存(task-9)经 `net_cfg_save_request()` → `SYS_EVT_CFG_SAVE` 整档 diff --git a/docs/子系统设计/运行与自检记录设计.md b/docs/子系统设计/运行与自检记录设计.md index a76ff05d..d9e78428 100644 --- a/docs/子系统设计/运行与自检记录设计.md +++ b/docs/子系统设计/运行与自检记录设计.md @@ -66,7 +66,7 @@ epoch 定宽 10 位是因为 2001-09-23 起 Unix 秒已是 10 位;uint32 到 2 | `/log/alarm.log` | `SYSLOG_ALARM` | 保护告警(告警型元件动作) | 1024 条(64 KB) | 同上 | | `/log/start.log` | `SYSLOG_START` | 保护启动(越限电平上升沿) | 1024 条(64 KB) | 同上 | | `/log/oper.log` | `SYSLOG_OPER` | 操作(改动了装置状态的运维动作) | 512 条(32 KB) | 同上 | -| `/log/yk.log` | `SYSLOG_YK` | ⚠ 原为遥控(104 命令的选择/执行/拒绝);该写入点随 2026-11-17 通信骨架割接删除,**当前无生产者**,骨架阶段有意不记(不驱动物理出口,照旧写即为伪造),见本文档 §2.2 与 `docs/子系统设计/IEC104上行设计说明.md` §0.5 | 256 条(16 KB) | 同上 | +| `/log/yk.log` | `SYSLOG_YK` | ⚠ 原为遥控(104 命令的选择/执行/拒绝);该写入点随 2026-11-17 通信骨架割接删除,**当前无生产者**,骨架阶段有意不记(不驱动物理出口,照旧写即为伪造),见本文档 §2.2 与 `docs/iec60870/板端落地/IEC104上行设计说明.md` §0.5 | 256 条(16 KB) | 同上 | - **上限是逻辑上限,不是预分配**:文件按追加写自然增长,一条不写就不占簇;到顶才删除重建(串口打 `cap full, recreate`)。七类全满的名义峰值 = 4864 条 × 64 B = **304 KB**,相对 NAND 容量可忽略,且这些只在事件边沿写。 - 告警/启动给到 1024 条,是因为一次故障会连片触发多个元件,别让最能说明故障过程的两类最先被截掉。 diff --git a/docs/架构设计/项目架构总览.md b/docs/架构设计/项目架构总览.md index 6a72be31..c7cff236 100644 --- a/docs/架构设计/项目架构总览.md +++ b/docs/架构设计/项目架构总览.md @@ -395,7 +395,7 @@ flowchart LR | ADC 通道映射(网名/板级/通道号 13 路置换) | `docs/硬件平台/ADC通道映射说明.md` | | 故障录波(数据面/段格式/回放契约) | `docs/子系统设计/故障录波设计说明.md` | | 屏板链路(USART1 主出口 / 帧 A 帧 B / 实测证据) | `docs/子系统设计/屏板链路设计.md` | -| IEC 60870-5-104 上行(默认 :2404,可经 `[comm]` 改) | `docs/子系统设计/IEC104上行设计说明.md` | +| IEC 60870-5-104 上行(默认 :2404,可经 `[comm]` 改) | `docs/iec60870/板端落地/IEC104上行设计说明.md` | | 配置文件引擎(/config.ini 多段注册制) | `docs/子系统设计/配置文件设计.md` | | 运行与自检记录(64B 记录 + SOE) | `docs/子系统设计/运行与自检记录设计.md` | | 墙钟时间维护 | `docs/子系统设计/系统墙钟时间维护说明.md` | diff --git a/docs/测试说明/专项验证/模拟器差距清单.md b/docs/测试说明/专项验证/模拟器差距清单.md index 4f92d277..99f075f8 100644 --- a/docs/测试说明/专项验证/模拟器差距清单.md +++ b/docs/测试说明/专项验证/模拟器差距清单.md @@ -74,7 +74,7 @@ ### 2.4 IEC104 显式共享核心模式 -`--iec104` 在同一 `lvgl_sim.exe` 中启用成熟 Slave/TcpServer 的真实 TCP 路径;按新增授权监听 `0.0.0.0`,即所有 IPv4 网卡。主站连接宿主实际 IPv4 地址(例如 `192.168.31.13`),不连接 `0.0.0.0`;程序不自动修改防火墙,仅应在可信内网使用,尚未证明另一台机器连接通过。它与上文默认 UI/黄金模式分开,也不替换旧板端 `iec104_serv.c`。以下哈希及本机回环测试是监听范围变更前历史证据,不代表新二进制或跨机验证,历史产物不重写。历史冻结哈希 `d2285bbc68ce4353c814dbcc455a2083b56e81fc54bf88081402e821c6a92833` 的审查人独立 TCP 复跑 11 项通过,证据 `ci-artifacts/iec104-review/tcp-final/report.json`;同哈希黄金菜单 8 状态与内容 76 页回归通过,证据 `ci-artifacts/iec104-sim-menu-release.log`、`ci-artifacts/iec104-sim-content-release.log`,未刷新参考。**仅模拟器首个里程碑通过**,不能写成全部门禁、板端替换或旧栈删除完成。详细状态见 `docs/子系统设计/IEC104上行设计说明.md` §0。 +`--iec104` 在同一 `lvgl_sim.exe` 中启用成熟 Slave/TcpServer 的真实 TCP 路径;按新增授权监听 `0.0.0.0`,即所有 IPv4 网卡。主站连接宿主实际 IPv4 地址(例如 `192.168.31.13`),不连接 `0.0.0.0`;程序不自动修改防火墙,仅应在可信内网使用,尚未证明另一台机器连接通过。它与上文默认 UI/黄金模式分开,也不替换旧板端 `iec104_serv.c`。以下哈希及本机回环测试是监听范围变更前历史证据,不代表新二进制或跨机验证,历史产物不重写。历史冻结哈希 `d2285bbc68ce4353c814dbcc455a2083b56e81fc54bf88081402e821c6a92833` 的审查人独立 TCP 复跑 11 项通过,证据 `ci-artifacts/iec104-review/tcp-final/report.json`;同哈希黄金菜单 8 状态与内容 76 页回归通过,证据 `ci-artifacts/iec104-sim-menu-release.log`、`ci-artifacts/iec104-sim-content-release.log`,未刷新参考。**仅模拟器首个里程碑通过**,不能写成全部门禁、板端替换或旧栈删除完成。详细状态见 `docs/iec60870/板端落地/IEC104上行设计说明.md` §0。 | 差距 | 模拟器行为 | 真机行为 | 影响 | 回归补测 | |---|---|---|---|---| diff --git a/docs/测试说明/单元测试/开机账本单元测试说明.md b/docs/测试说明/单元测试/开机账本单元测试说明.md index 96dafbe0..7331eaf2 100644 --- a/docs/测试说明/单元测试/开机账本单元测试说明.md +++ b/docs/测试说明/单元测试/开机账本单元测试说明.md @@ -11,7 +11,7 @@ > [`测试开发标准流程.md`](../流程与规范/测试开发标准流程.md)(测试分层与门禁总览)、 > [`主机单测覆盖率口径.md`](主机单测覆盖率口径.md)(覆盖率总闸如何收编本套)、 > [`系统墙钟时间维护说明.md`](../../子系统设计/系统墙钟时间维护说明.md)(`docs/子系统设计/系统墙钟时间维护说明.md` §13.1——同一块 70 B 用户 SRAM 的占用分配表,本模块占 0..7)、 -> [`../../子系统设计/IEC104上行设计说明.md`](../../子系统设计/IEC104上行设计说明.md) +> [`../../iec60870/板端落地/IEC104上行设计说明.md`](../../iec60870/板端落地/IEC104上行设计说明.md) > (同一张运行报告页的另一半数据源:104 观测计数) --- diff --git a/docs/硬件平台/开入开出实施说明.md b/docs/硬件平台/开入开出实施说明.md index 460b8552..c84dd3c7 100644 --- a/docs/硬件平台/开入开出实施说明.md +++ b/docs/硬件平台/开入开出实施说明.md @@ -403,7 +403,7 @@ 9 路对外可控开出分别对应"跳闸""告警""闭锁"还是别的含义,**不在本文档定义**(供电使能 bit6 由驱动自动算出,不在此列)。这是保护逻辑层的职责,去向: - 保护判据与动作逻辑 → `docs/算法/采集与算法层设计说明.md`、`docs/算法/继电保护功能复现规划.md` -- 104 规约的遥信/遥控点表 → `docs/子系统设计/IEC104上行设计说明.md` +- 104 规约的遥信/遥控点表 → `docs/iec60870/板端落地/IEC104上行设计说明.md` 在业务层把这些定义清楚之前,**这些开出只能用于台架验证,不得用于真实跳闸**;新增 6 脚的真实去向尚未由网表确认,PC15 仅作信号位。 @@ -418,7 +418,7 @@ | 未接入项 | 现状 | 去向 | |---|---|---| | 开入去抖 | 未实现 | 业务层接线任务,落点在 `App/task/default_task.c` | -| 开入 → 104 遥信点表 | 未接入 | `docs/子系统设计/IEC104上行设计说明.md` | +| 开入 → 104 遥信点表 | 未接入 | `docs/iec60870/板端落地/IEC104上行设计说明.md` | | UI 遥信配置页(遥信类型/防抖/双点遥信) | 三叶未绑,原因是**缺数据源**而非缺硬件 | `docs/UI设计/页面补齐规划.md` | --- diff --git a/docs/算法/继电保护功能复现规划.md b/docs/算法/继电保护功能复现规划.md index d1f96a22..67777cb0 100644 --- a/docs/算法/继电保护功能复现规划.md +++ b/docs/算法/继电保护功能复现规划.md @@ -411,7 +411,7 @@ > > **2026-10-25 运行参数段落实进度**:这一项已落 `App/algo/run_par.c`——本仓自定逐项地址 > 0x8030~0x8038(死区 9 点)/ 0x8040~0x804F(k/b 覆盖直通 adc_cal),表与理由见 -> `docs/子系统设计/IEC104上行设计说明.md` §3.4;**送检点表到位后以送检为准替换常量段**。 +> `docs/iec60870/板端落地/IEC104上行设计说明.md` §3.4;**送检点表到位后以送检为准替换常量段**。 > 变比/报警/录波/功率置负等其余运行参数类项目前无消费者,留白不预埋。 > > **2026-10-11 落实进度**:`App/algo/prot_set.c` 已建 RAM 模型(Q10 定点,31 项),**通讯地址逐项对照参考 `Comm/Pub/Const_CommSetPara.c` `g_tCommSetParaTab`**(基址 0x8820:过流 Ⅰ/Ⅱ/Ⅲ = 0x8856~0x8861、过负荷 = 0x8871~0x8874、零序过压 = 0x888E~0x8890;过压/欠压沿用告警段 0x8027~0x802A)。⚠ **默认值/范围为拟定值**(参考 EEPROM 出厂默认表不在本仓库,按 DTU 馈线典型量级拟定),待对照参考出厂表逐项修订。 diff --git a/docs/问题记录/采集与数据处理短板评测.md b/docs/问题记录/采集与数据处理短板评测.md index c0030361..ab9627f2 100644 --- a/docs/问题记录/采集与数据处理短板评测.md +++ b/docs/问题记录/采集与数据处理短板评测.md @@ -65,7 +65,7 @@ | 保护判据 | 9 元件(三段过流/过负荷/过压/欠压/零序过压/过频/低频) | 复现规划 §3.3(「三段式相间过流」~「零序过压」) | | 出口与记录 | SOE + 动作记录(64 B 定长、CP56 时标、SPSC 环异步落盘) | 复现规划 §3.4(「SOE 记录」) | | 动作留痕 | 定值校验和 + 持久化 + 全局软压板 + 采样故障闭锁 | 复现规划 §3.5(「定值校验和」) | -| 上行 | 104 总召/变位/遥控/定值读写/时钟同步 | `docs/子系统设计/IEC104上行设计说明.md` | +| 上行 | 104 总召/变位/遥控/定值读写/时钟同步 | `docs/iec60870/板端落地/IEC104上行设计说明.md` | ### 3.2 部分闭环 @@ -337,7 +337,7 @@ | 运行参数段 | 未登记 | **新发现**,建议按语义标识登记("运行参数段 0x8020~0x8058") | | 开入开出 | 未登记 | **新发现**,建议登记("开入量采集与遥信"、"遥控与出口") | | 削顶检测 | 复现规划 §3.5(「采样通道自检」残余,"码值越界待做") | 给出两条具体判据 | -| 频率点 | `docs/子系统设计/IEC104上行设计说明.md` §8 第 4 条 | 明确它现在就能做(算法已就绪,只差绑定) | +| 频率点 | `docs/iec60870/板端落地/IEC104上行设计说明.md` §8 第 4 条 | 明确它现在就能做(算法已就绪,只差绑定) | --- diff --git a/scripts/archive/id_gate/编号治理历史.md b/scripts/archive/id_gate/编号治理历史.md index cf5a73ca..1c3c6aad 100644 --- a/scripts/archive/id_gate/编号治理历史.md +++ b/scripts/archive/id_gate/编号治理历史.md @@ -260,8 +260,8 @@ P-6 号必须能反查到定义(属主登记处得存在)· P-7 编号不语 | 「卡」+ 数字 7 | 量纲回归用例 | 原数据可信 3 节 退出判据第 ⑥ 条;用例在 `test/host/prot_dim` | | 「卡」+ 数字 8 | 遥测快照发布 | 原数据可信 4.5 节 | | 「卡」+ 数字 9 | 104 改读快照 | 原数据可信 4.5 节 | -| 「卡」+ 数字 10 | 运行参数段 | `App/algo/run_par.h` 头注释 + `docs/子系统设计/IEC104上行设计说明.md` | -| 「卡」+ 数字 11 | 频率点绑定 | `docs/子系统设计/IEC104上行设计说明.md` 的 `0x401D` 行 | +| 「卡」+ 数字 10 | 运行参数段 | `App/algo/run_par.h` 头注释 + `docs/iec60870/板端落地/IEC104上行设计说明.md` | +| 「卡」+ 数字 11 | 频率点绑定 | `docs/iec60870/板端落地/IEC104上行设计说明.md` 的 `0x401D` 行 | | 「卡」+ 数字 12 | 两点标定 | 原数据可信 5 节(未开始,等标准源) | **本表把形态写成「卡」+ 数字、不复述字面量**:本文是门禁语料,复述形态会把"讲规则的文档"变成 diff --git a/simulator/README.md b/simulator/README.md index 0d35f9ab..6891ac19 100644 --- a/simulator/README.md +++ b/simulator/README.md @@ -150,7 +150,7 @@ LVGL 场景(同一份 ui_menu.c) 用户后续授权的全部 IPv4 监听变更已单独构建并在本机验证:二进制 SHA256 `dde0f0512624518b223564b47ce6bbafab01586532b82ff36fb490288ef012a7`,证据位于 `ci-artifacts/iec104-lan/`。OS 监听地址为 `0.0.0.0`;`127.0.0.1` 与本机确实配置的 `192.168.31.13` 均完成 STARTDT 握手,有限时服务退出后无监听残留。**这是本机连接验证,不证明其他机器可穿过防火墙访问;下述完整业务与黄金证据属于此前里程碑二进制,不冒充新哈希的全套复验。** -**仅模拟器首个里程碑通过(历史验收快照)**:当时二进制 SHA256 为 `d2285bbc68ce4353c814dbcc455a2083b56e81fc54bf88081402e821c6a92833`(`ci-artifacts/iec104-sim-release.sha256`)。同哈希审查人独立 TCP 复跑 11 项通过,报告 `ci-artifacts/iec104-review/tcp-final/report.json`;菜单 8 状态、内容 76 页、往返池水位及实时数据回归通过,日志 `ci-artifacts/iec104-sim-menu-release.log`、`ci-artifacts/iec104-sim-content-release.log`,未刷新黄金参考。构建、正常 READY/STOP 与端口占用失败证据分别为 `ci-artifacts/iec104-sim-build-release.log`、`ci-artifacts/iec104-sim-smoke-release.log`、`ci-artifacts/iec104-sim-bind-failure.log`;编译输入清单 `ci-artifacts/iec104-sim-release-sources.sha256` 记录 95 个编译 C 文件及 160 个输入文件哈希。**MCU 替换、旧栈删除及真实 UI 参数绑定仍未完成,cppcheck 尚未运行,不等于全部门禁或板端通过。**测试精确集合与矩阵见 `test/host/iec104_dtu/MATRIX.md`;完整边界见 `docs/子系统设计/IEC104上行设计说明.md` §0 和 `docs/测试说明/专项验证/模拟器差距清单.md`。 +**仅模拟器首个里程碑通过(历史验收快照)**:当时二进制 SHA256 为 `d2285bbc68ce4353c814dbcc455a2083b56e81fc54bf88081402e821c6a92833`(`ci-artifacts/iec104-sim-release.sha256`)。同哈希审查人独立 TCP 复跑 11 项通过,报告 `ci-artifacts/iec104-review/tcp-final/report.json`;菜单 8 状态、内容 76 页、往返池水位及实时数据回归通过,日志 `ci-artifacts/iec104-sim-menu-release.log`、`ci-artifacts/iec104-sim-content-release.log`,未刷新黄金参考。构建、正常 READY/STOP 与端口占用失败证据分别为 `ci-artifacts/iec104-sim-build-release.log`、`ci-artifacts/iec104-sim-smoke-release.log`、`ci-artifacts/iec104-sim-bind-failure.log`;编译输入清单 `ci-artifacts/iec104-sim-release-sources.sha256` 记录 95 个编译 C 文件及 160 个输入文件哈希。**MCU 替换、旧栈删除及真实 UI 参数绑定仍未完成,cppcheck 尚未运行,不等于全部门禁或板端通过。**测试精确集合与矩阵见 `test/host/iec104_dtu/MATRIX.md`;完整边界见 `docs/iec60870/板端落地/IEC104上行设计说明.md` §0 和 `docs/测试说明/专项验证/模拟器差距清单.md`。 ## 三、构建与运行 diff --git a/test/host/bench/iec104/iec104_master.py b/test/host/bench/iec104/iec104_master.py index ef949d85..ed430243 100644 --- a/test/host/bench/iec104/iec104_master.py +++ b/test/host/bench/iec104/iec104_master.py @@ -2,8 +2,8 @@ # -*- coding: utf-8 -*- """B6 bench leg: IEC 60870-5-104 master client (GI + COV round-trip). -Historical bench leg; acceptance criteria: docs/子系统设计/IEC104上行设计说明.md §8. -docs/子系统设计/IEC104上行设计说明.md §3/§4. Constants mirror the old in-house +Historical bench leg; acceptance criteria: docs/iec60870/板端落地/IEC104上行设计说明.md §8. +docs/iec60870/板端落地/IEC104上行设计说明.md §3/§4. Constants mirror the old in-house protocol layer (App/protocol/iec104/iec104_asdu.h / iec104_link.h, both deleted 2026-11-18 with the skeleton MCU migration); current wire layout is governed by App/iec60870/common/IEC60870_Asdu.h + App/iec60870/104/IEC104_Types.h. diff --git a/test/host/run_par/run_unit_test.py b/test/host/run_par/run_unit_test.py index 16293276..711d4f65 100644 --- a/test/host/run_par/run_unit_test.py +++ b/test/host/run_par/run_unit_test.py @@ -12,7 +12,7 @@ 退出码:0=PASS / 1=测试失败 / 2=环境错误。 -设计依据:docs/算法/采集与算法层设计说明.md §13(运行参数段)+ docs/子系统设计/IEC104上行设计说明.md §3.4。 +设计依据:docs/算法/采集与算法层设计说明.md §13(运行参数段)+ docs/iec60870/板端落地/IEC104上行设计说明.md §3.4。 创建日期:2026-10-25(道D 运行参数段) """ import os From f23d30111d3201cbccdef2b42866015e5fb10033 Mon Sep 17 00:00:00 2001 From: Wanderingss <1624155937@qq.com> Date: Thu, 19 Nov 2026 00:31:41 +0800 Subject: [PATCH 2/5] =?UTF-8?q?perf(iec104):=20TcpServer=20=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=88=B3=E9=99=8D=E5=88=B0=2032=20=E4=BD=8D=E3=80=81?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=B8=A7=E6=A7=BD=208=E2=86=924=EF=BC=8C?= =?UTF-8?q?=E7=9C=81=20296=20B=20RAM?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 单连接子站的 TcpServer 结构体(server_pool[1])原来 7656 B,其中大量 绝对时刻用 64 位存,纯属浪费。按两条线索瘦身: 一、毫秒时间戳 64→32 位 涉及 SendBuffer 发送槽状态、SendManager I 帧记录、Connection 的六个 时刻字段、TcpServer 的两个重试时刻与 ack 观察槽。这些字段只用于 「记下时刻、稍后相减求是否超时」,改成 32 位后按无符号差值 / 有符号 差值判断,49.7 天回绕天然正确,不必再做回绕扩展。 有两处原本是大小比较,一并改成差值判据,否则回绕瞬间会误判时钟倒退: - IEC104_Connection 的 Check_Time 判单调性 - Dispatch_Received_Frame 判活动时刻是否更新 两个重试时刻用 0 表示「未暂停」,赋值后补一条抬到 1ms 的兜底,避免 恰好回绕成 0 被当成未暂停。 取时刻的入口收敛到 TcpServer 里一个静态函数,出口截断成 32 位; 对外 ABI 未变:Now_Ms 仍取 64 位单调毫秒供 CP56/UTC 时基使用, 查询 ack 时刻的出参仍是 64 位,测试夹具的哨兵语义不受影响。 二、控制帧槽 IEC104_TCP_CONTROL_CAPACITY 8→4 S/U 帧 FIFO 在单连接子站里实际深度是个位数,8 是通用多连接库的默认 值。取模与队满判断全部走运行期容量,无硬编码,改默认值即可。 实测(权威构建,同一台机器前后对比): server_pool 7656 -> 7360 B(-296) iec104_tcpserver.o ZI 7656 -> 7360 RW_IRAM1 118416 -> 118120 B(90.3% -> 90.1%) ER_IROM1 414232 B 不变 验证:Keil 0 错 0 警;模拟器构建通过;真实 TCP 回环 13/13;单测 iec104_comm 50/50、iec104_serv 50/50、soe 32/32、netmcu 13/13 + 2/2、 iec104_dtu 7/7;覆盖率 89.3% 无回退;pre-commit 12 项通过 0 失败; 内存台账 --check 一致、--gate 通过。 --- App/iec60870/104/IEC104_Connection.c | 66 ++++++++++--------- App/iec60870/104/IEC104_Connection.h | 46 ++++++------- App/iec60870/104/IEC104_SendBuffer.c | 14 ++-- App/iec60870/104/IEC104_SendBuffer.h | 14 ++-- App/iec60870/104/IEC104_SendManager.c | 63 +++++++++--------- App/iec60870/104/IEC104_SendManager.h | 50 +++++++------- App/iec60870/104/IEC104_TcpServer.c | 40 ++++++----- App/iec60870/104/IEC104_TcpServer_Config.h | 3 +- App/iec60870/104/IEC104_TcpTypes.h | 4 +- .../test/iec104_idle_transport_test.c | 2 +- docs/内存管理/RAM使用分析与优化方案.md | 6 +- docs/内存管理/RAM预算台账.md | 6 +- scripts/ram_baseline.tsv | 1 + 13 files changed, 164 insertions(+), 151 deletions(-) diff --git a/App/iec60870/104/IEC104_Connection.c b/App/iec60870/104/IEC104_Connection.c index b1f8e6be..c02941f4 100644 --- a/App/iec60870/104/IEC104_Connection.c +++ b/App/iec60870/104/IEC104_Connection.c @@ -90,13 +90,14 @@ static IEC104_ConnectionResult_t Require_Active(const IEC104_Connection_t *conne * 说明:此处不写last_now_ms;例如后续frame_id或写入量校验失败时,时刻也不前移。 */ static IEC104_ConnectionResult_t Check_Time( - const IEC104_Connection_t *connection, uint64_t generation, uint64_t now_ms) + const IEC104_Connection_t *connection, uint64_t generation, uint32_t now_ms) { IEC104_ConnectionResult_t result = Require_Active(connection, generation); if (result != IEC104_CONNECTION_OK) { return result; } - return now_ms >= connection->last_now_ms ? IEC104_CONNECTION_OK : IEC104_CONNECTION_ERROR; + /* 32位毫秒按有符号差值判单调:回绕后仍判为时间在前进。 */ + return (int32_t)(now_ms - connection->last_now_ms) >= 0 ? IEC104_CONNECTION_OK : IEC104_CONNECTION_ERROR; } /** @@ -123,18 +124,18 @@ static IEC104_ConnectionResult_t Fail(IEC104_Connection_t *connection, IEC104_Co * timeout_ms——超时毫秒数。 * 输出参数:deadline——ConnectionDeadline_t *所指数据的更新结果。 * 返回值:按处理分支返回0、1。 - * 说明:先校验时钟再作64位差,不计算started_ms + timeout_ms,避免溢出。 + * 说明:32位时刻按无符号差值求elapsed,比较用有符号差值判回绕;不计算started_ms + timeout_ms,避免溢出。 */ static int Set_Deadline(ConnectionDeadline_t *deadline, - uint64_t now_ms, uint64_t started_ms, uint32_t timeout_ms) + uint32_t now_ms, uint32_t started_ms, uint32_t timeout_ms) { - uint64_t elapsed; - if (timeout_ms == 0U || now_ms < started_ms) { + uint32_t elapsed; + if (timeout_ms == 0U || (int32_t)(now_ms - started_ms) < 0) { return 0; } elapsed = now_ms - started_ms; deadline->active = 1U; - deadline->remaining_ms = elapsed >= timeout_ms ? 0U : timeout_ms - (uint32_t)elapsed; + deadline->remaining_ms = elapsed >= timeout_ms ? 0U : timeout_ms - elapsed; return 1; } @@ -161,7 +162,7 @@ static int Deadline_Expired(const ConnectionDeadlines_t *deadlines, ConnectionDe * t2/t3仅在控制槽和Link准入允许时参与唤醒,容量背压仍由已有发送/确认期限约束。 */ static int Collect_Deadlines( - const IEC104_Connection_t *connection, uint64_t now_ms, ConnectionDeadlines_t *deadlines) + const IEC104_Connection_t *connection, uint32_t now_ms, ConnectionDeadlines_t *deadlines) { IEC104_SendManagerDeadlines_t sending; ConnectionDeadlines_t prepared; @@ -282,7 +283,7 @@ static int Notify_Transfer_Change(IEC104_Connection_t *connection, IEC104_DataTr * TESTFR_ACT的WAIT已登记禁发新主动探测,只等待CON应答槽,重试不撤回该事实。 * 已受理I帧直接报告就绪,保证后续驱动不会重复推进V(R)或处理累计ACK。 */ -static IEC104_ConnectionResult_t Dispatch_Received_Frame(IEC104_Connection_t *connection, uint64_t now_ms) +static IEC104_ConnectionResult_t Dispatch_Received_Frame(IEC104_Connection_t *connection, uint32_t now_ms) { IEC104_ReceivedFrame_t frame; IEC104_ReceiverResult_t received; @@ -307,7 +308,8 @@ static IEC104_ConnectionResult_t Dispatch_Received_Frame(IEC104_Connection_t *co return Release_Control_Frame(connection); } /* 使用成帧时刻登记活动;WAIT重试不续期,也不覆盖更晚的本地整帧完成时刻。 */ - if (connection->received_at_ms > connection->last_activity_ms) { + /* 32位回绕安全:有符号差值>0才更新活动时刻。 */ + if ((int32_t)(connection->received_at_ms - connection->last_activity_ms) > 0) { connection->last_activity_ms = connection->received_at_ms; } if (frame.apci.frame_type == IEC104_FRAME_TYPE_I || frame.apci.frame_type == IEC104_FRAME_TYPE_S) { @@ -417,7 +419,7 @@ static IEC104_ConnectionFault_t Get_Confirmation_Timeout(const ConnectionDeadlin * 接收/写入事实在调用本函数前已提交,检查的是这些事实处理后仍存在的等待义务。 */ static IEC104_ConnectionResult_t Check_Timeouts( - IEC104_Connection_t *connection, uint64_t now_ms, ConnectionTimeoutScope_t scope) + IEC104_Connection_t *connection, uint32_t now_ms, ConnectionTimeoutScope_t scope) { ConnectionDeadlines_t deadlines; @@ -455,7 +457,7 @@ static IEC104_ConnectionResult_t Check_Timeouts( * 说明:Link只读查询与实际构帧共用准入规则;Connection只决定驱动顺序和t2是否到期。 * 查询不消耗发送编号,只有确有义务才向Manager请求控制槽;容量不足留待后续驱动。 */ -static IEC104_SendManagerResult_t Queue_Pending_Control(IEC104_Connection_t *connection, uint64_t now_ms) +static IEC104_SendManagerResult_t Queue_Pending_Control(IEC104_Connection_t *connection, uint32_t now_ms) { const IEC104_LinkState_t *link = &connection->link_state; ConnectionDeadlines_t deadlines; @@ -499,7 +501,7 @@ static IEC104_SendManagerResult_t Queue_Pending_Control(IEC104_Connection_t *con * 返回值:OK本轮正常,包括无义务或容量等待;底层异常冻结并返回FATAL。 * 说明:不组合Link内部枚举和序号,不循环等待资源,也不准备新的业务I帧。 */ -static IEC104_ConnectionResult_t Advance_Control(IEC104_Connection_t *connection, uint64_t now_ms) +static IEC104_ConnectionResult_t Advance_Control(IEC104_Connection_t *connection, uint32_t now_ms) { IEC104_SendManagerResult_t result; ConnectionDeadlines_t deadlines; @@ -539,7 +541,7 @@ static IEC104_ConnectionResult_t Advance_Control(IEC104_Connection_t *connection * 返回OK只描述本轮处理结果,不保证发送缓冲为空;调用方仍可Prepare取得控制帧。 */ static IEC104_ConnectionResult_t Drive( - IEC104_Connection_t *connection, uint64_t now_ms, ConnectionTimeoutScope_t scope) + IEC104_Connection_t *connection, uint32_t now_ms, ConnectionTimeoutScope_t scope) { IEC104_ConnectionResult_t received = Dispatch_Received_Frame(connection, now_ms); if (received == IEC104_CONNECTION_FATAL || @@ -601,7 +603,7 @@ IEC104_ConnectionResult_t IEC104_Connection_Init( IEC104_Connection_t *connection, IEC104_AsduQueue_t *queue, IEC104_SendBufferControlFrame_t *control_frames, uint16_t control_capacity, IEC104_IFrameSendRecordStorage_t *records, uint16_t record_capacity, - const IEC104_ConnectionConfig_t *config, uint64_t connection_generation, uint64_t now_ms) + const IEC104_ConnectionConfig_t *config, uint64_t connection_generation, uint32_t now_ms) { IEC104_Connection_t prepared; if (connection == NULL || config == NULL || config->link.k == 0U || config->link.k > IEC104_SEQUENCE_MASK || @@ -667,7 +669,7 @@ IEC104_ConnectionResult_t IEC104_Connection_Begin_Receive_Batch( * 这里只更新事件时刻,不延长任何期限;后续必须立即续收或以Tick结束待续状态。 */ IEC104_ConnectionResult_t IEC104_Connection_Yield_Receive_Batch( - IEC104_Connection_t *connection, uint64_t connection_generation, uint64_t now_ms) + IEC104_Connection_t *connection, uint64_t connection_generation, uint32_t now_ms) { IEC104_ConnectionResult_t checked = Check_Time(connection, connection_generation, now_ms); if (checked != IEC104_CONNECTION_OK) { @@ -716,7 +718,7 @@ IEC104_ConnectionResult_t IEC104_Connection_Set_Transfer_Observer( */ IEC104_ConnectionResult_t IEC104_Connection_Feed( IEC104_Connection_t *connection, uint64_t connection_generation, - const uint8_t *data, uint32_t length, uint64_t now_ms, uint32_t *consumed_length) + const uint8_t *data, uint32_t length, uint32_t now_ms, uint32_t *consumed_length) { IEC104_ConnectionResult_t checked; IEC104_ReceiverResult_t received; @@ -823,7 +825,7 @@ IEC104_ConnectionResult_t IEC104_Connection_Release_Received_Frame( */ static IEC104_ConnectionResult_t Submit_Response( IEC104_Connection_t *connection, uint64_t connection_generation, - const uint8_t *asdu, uint16_t asdu_length, uint64_t now_ms, + const uint8_t *asdu, uint16_t asdu_length, uint32_t now_ms, IEC104_SendBufferHeadInfo_t *head_info, uint64_t *ticket, int queue_only, IEC104_BusinessPriority_t priority) { @@ -903,7 +905,7 @@ static int Received_Frame_Ready(const IEC104_Connection_t *connection) * 说明:期限到达或接收待续时让事件循环先推进协议,再重新查询。 */ IEC104_ConnectionResult_t IEC104_Connection_Can_Submit_Idle_Priority( - const IEC104_Connection_t *connection, uint64_t connection_generation, uint64_t now_ms, uint16_t reserve, + const IEC104_Connection_t *connection, uint64_t connection_generation, uint32_t now_ms, uint16_t reserve, IEC104_BusinessPriority_t priority) { uint32_t wait_ms; @@ -928,7 +930,7 @@ IEC104_ConnectionResult_t IEC104_Connection_Can_Submit_Idle_Priority( * 说明:本函数不驱动连接、不预留资源,实际Submit_Idle仍须重新检查准入条件。 */ IEC104_ConnectionResult_t IEC104_Connection_Can_Submit_Idle( - const IEC104_Connection_t *connection, uint64_t connection_generation, uint64_t now_ms, uint16_t reserve) + const IEC104_Connection_t *connection, uint64_t connection_generation, uint32_t now_ms, uint16_t reserve) { return IEC104_Connection_Can_Submit_Idle_Priority(connection, connection_generation, now_ms, reserve, (IEC104_BusinessPriority_t)0); } @@ -950,7 +952,7 @@ IEC104_ConnectionResult_t IEC104_Connection_Can_Submit_Idle( */ IEC104_ConnectionResult_t IEC104_Connection_Submit_Idle_Priority( IEC104_Connection_t *connection, uint64_t connection_generation, - const uint8_t *asdu, uint16_t asdu_length, uint16_t reserve, uint64_t now_ms, + const uint8_t *asdu, uint16_t asdu_length, uint16_t reserve, uint32_t now_ms, IEC104_SendBufferHeadInfo_t *head_info, IEC104_BusinessPriority_t priority) { @@ -991,7 +993,7 @@ IEC104_ConnectionResult_t IEC104_Connection_Submit_Idle_Priority( */ IEC104_ConnectionResult_t IEC104_Connection_Submit_Idle( IEC104_Connection_t *connection, uint64_t connection_generation, - const uint8_t *asdu, uint16_t asdu_length, uint16_t reserve, uint64_t now_ms, + const uint8_t *asdu, uint16_t asdu_length, uint16_t reserve, uint32_t now_ms, IEC104_SendBufferHeadInfo_t *head_info) { return IEC104_Connection_Submit_Idle_Priority(connection, connection_generation, asdu, asdu_length, reserve, now_ms, head_info, (IEC104_BusinessPriority_t)0); @@ -1007,7 +1009,7 @@ IEC104_ConnectionResult_t IEC104_Connection_Submit_Idle( */ IEC104_ConnectionResult_t IEC104_Connection_Submit_Response_Priority( IEC104_Connection_t *connection, uint64_t connection_generation, - const uint8_t *asdu, uint16_t asdu_length, uint64_t now_ms, + const uint8_t *asdu, uint16_t asdu_length, uint32_t now_ms, IEC104_SendBufferHeadInfo_t *head_info, IEC104_BusinessPriority_t priority) { @@ -1024,7 +1026,7 @@ IEC104_ConnectionResult_t IEC104_Connection_Submit_Response_Priority( */ IEC104_ConnectionResult_t IEC104_Connection_Submit_Response( IEC104_Connection_t *connection, uint64_t connection_generation, - const uint8_t *asdu, uint16_t asdu_length, uint64_t now_ms, + const uint8_t *asdu, uint16_t asdu_length, uint32_t now_ms, IEC104_SendBufferHeadInfo_t *head_info) { return IEC104_Connection_Submit_Response_Priority(connection, connection_generation, asdu, asdu_length, now_ms, head_info, (IEC104_BusinessPriority_t)0); @@ -1048,7 +1050,7 @@ IEC104_ConnectionResult_t IEC104_Connection_Submit_Response( */ IEC104_ConnectionResult_t IEC104_Connection_Submit_Response_Tracked_Priority( IEC104_Connection_t *connection, uint64_t connection_generation, - const uint8_t *asdu, uint16_t asdu_length, uint64_t now_ms, + const uint8_t *asdu, uint16_t asdu_length, uint32_t now_ms, IEC104_SendBufferHeadInfo_t *head_info, uint64_t *ticket, IEC104_BusinessPriority_t priority) { @@ -1065,7 +1067,7 @@ IEC104_ConnectionResult_t IEC104_Connection_Submit_Response_Tracked_Priority( */ IEC104_ConnectionResult_t IEC104_Connection_Submit_Response_Tracked( IEC104_Connection_t *connection, uint64_t connection_generation, - const uint8_t *asdu, uint16_t asdu_length, uint64_t now_ms, + const uint8_t *asdu, uint16_t asdu_length, uint32_t now_ms, IEC104_SendBufferHeadInfo_t *head_info, uint64_t *ticket) { return IEC104_Connection_Submit_Response_Tracked_Priority(connection, connection_generation, asdu, asdu_length, now_ms, head_info, ticket, (IEC104_BusinessPriority_t)0); @@ -1087,7 +1089,7 @@ IEC104_ConnectionResult_t IEC104_Connection_Submit_Response_Tracked( */ IEC104_ConnectionResult_t IEC104_Connection_Enqueue_Response_Tracked_Priority( IEC104_Connection_t *connection, uint64_t connection_generation, - const uint8_t *asdu, uint16_t asdu_length, uint64_t now_ms, uint64_t *ticket, + const uint8_t *asdu, uint16_t asdu_length, uint32_t now_ms, uint64_t *ticket, IEC104_BusinessPriority_t priority) { IEC104_SendBufferHeadInfo_t unused; @@ -1105,7 +1107,7 @@ IEC104_ConnectionResult_t IEC104_Connection_Enqueue_Response_Tracked_Priority( */ IEC104_ConnectionResult_t IEC104_Connection_Enqueue_Response_Tracked( IEC104_Connection_t *connection, uint64_t connection_generation, - const uint8_t *asdu, uint16_t asdu_length, uint64_t now_ms, uint64_t *ticket) + const uint8_t *asdu, uint16_t asdu_length, uint32_t now_ms, uint64_t *ticket) { return IEC104_Connection_Enqueue_Response_Tracked_Priority(connection, connection_generation, asdu, asdu_length, now_ms, ticket, (IEC104_BusinessPriority_t)0); } @@ -1139,7 +1141,7 @@ IEC104_ConnectionResult_t IEC104_Connection_Set_Ack_Observer( * 对端确认超时故障交回接收阶段;调用方须持续调度Feed/Tick,不能只驱动发送。 */ IEC104_ConnectionResult_t IEC104_Connection_Prepare_Next_Send( - IEC104_Connection_t *connection, uint64_t connection_generation, uint64_t now_ms, + IEC104_Connection_t *connection, uint64_t connection_generation, uint32_t now_ms, IEC104_SendBufferHeadInfo_t *head_info) { IEC104_SendBufferHeadInfo_t prepared; @@ -1250,7 +1252,7 @@ IEC104_ConnectionResult_t IEC104_Connection_Get_Record_Wait( */ IEC104_ConnectionResult_t IEC104_Connection_Handle_Send_Progress( IEC104_Connection_t *connection, IEC104_SendFrameId_t frame_id, - uint16_t bytes_written_now, uint64_t now_ms, IEC104_LocalSendCompletion_t *completion) + uint16_t bytes_written_now, uint32_t now_ms, IEC104_LocalSendCompletion_t *completion) { IEC104_LocalSendCompletion_t completed; IEC104_SendManagerResult_t result; @@ -1335,7 +1337,7 @@ IEC104_ConnectionResult_t IEC104_Connection_Handle_Send_Failure( * 每次按当前有效过程的起点重新计算,旧回调不能携带旧时间差覆盖新一轮探测。 */ IEC104_ConnectionResult_t IEC104_Connection_Tick( - IEC104_Connection_t *connection, uint64_t connection_generation, uint64_t now_ms) + IEC104_Connection_t *connection, uint64_t connection_generation, uint32_t now_ms) { IEC104_ConnectionResult_t checked = Check_Time(connection, connection_generation, now_ms); if (checked != IEC104_CONNECTION_OK) { @@ -1361,7 +1363,7 @@ IEC104_ConnectionResult_t IEC104_Connection_Tick( * 接收批次必须先用Tick结束,不能用等待查询代替推进协议或结束批次。 */ IEC104_ConnectionResult_t IEC104_Connection_Get_Wait_Time( - const IEC104_Connection_t *connection, uint64_t connection_generation, uint64_t now_ms, + const IEC104_Connection_t *connection, uint64_t connection_generation, uint32_t now_ms, uint32_t max_wait_ms, uint32_t *wait_ms) { ConnectionDeadlines_t deadlines; diff --git a/App/iec60870/104/IEC104_Connection.h b/App/iec60870/104/IEC104_Connection.h index 2b689a80..fbe2e699 100644 --- a/App/iec60870/104/IEC104_Connection.h +++ b/App/iec60870/104/IEC104_Connection.h @@ -93,13 +93,13 @@ typedef struct { IEC104_ConnectionTransferObserver_t transfer_observer; /* 内部通知容量及变化交接 */ IEC104_SendFrameId_t stop_con_frame_id; /* 当前STOP对应的最后一帧CON,拒绝旧完成结束新期限 */ uint64_t connection_generation; /* 非零且跨连接不复用,所有外部事件均须匹配 */ - uint64_t last_now_ms; /* 串行事件的单调时刻,不接受倒退 */ - uint64_t last_activity_ms; /* 完整合法APDU到达或本地整帧完成;反向启停CON除外 */ - uint64_t received_at_ms; /* 当前完整接收帧到达时刻,WAIT不续期 */ + uint32_t last_now_ms; /* 串行事件的单调时刻,不接受倒退 */ + uint32_t last_activity_ms; /* 完整合法APDU到达或本地整帧完成;反向启停CON除外 */ + uint32_t received_at_ms; /* 当前完整接收帧到达时刻,WAIT不续期 */ uint64_t receive_serial; /* 每次成帧递增;耗尽时结束连接 */ - uint64_t rx_ack_started_ms; /* 当前连续未确认接收区间的最早起点 */ - uint64_t testfr_started_ms; /* 本次TESTFR_ACT完整写出的时刻 */ - uint64_t stop_started_ms; /* 本轮STOP原成帧时刻;受理时启用计时,受理前WAIT也计入总期限 */ + uint32_t rx_ack_started_ms; /* 当前连续未确认接收区间的最早起点 */ + uint32_t testfr_started_ms; /* 本次TESTFR_ACT完整写出的时刻 */ + uint32_t stop_started_ms; /* 本轮STOP原成帧时刻;受理时启用计时,受理前WAIT也计入总期限 */ IEC104_ConnectionPhase_t phase; /* Connection生命周期,独立于Link的STARTED/STOPPED */ IEC104_ConnectionFault_t fault; /* 只登记首次故障;Close保留该值供查询 */ uint8_t rx_link_applied; /* I帧已交给Manager,不得因重复Peek/驱动再交一次 */ @@ -138,7 +138,7 @@ extern IEC104_ConnectionResult_t IEC104_Connection_Init( IEC104_Connection_t *connection, IEC104_AsduQueue_t *queue, IEC104_SendBufferControlFrame_t *control_frames, uint16_t control_capacity, IEC104_IFrameSendRecordStorage_t *records, uint16_t record_capacity, - const IEC104_ConnectionConfig_t *config, uint64_t connection_generation, uint64_t now_ms); + const IEC104_ConnectionConfig_t *config, uint64_t connection_generation, uint32_t now_ms); /** * 功能:Init后、首次Feed前安装内部启停通知适配;observer复制入连接,context须持续有效。 @@ -180,7 +180,7 @@ extern IEC104_ConnectionResult_t IEC104_Connection_Begin_Receive_Batch( * 不能用于等待业务消费或socket可读;仅ACTIVE且已Begin时可调用。 */ extern IEC104_ConnectionResult_t IEC104_Connection_Yield_Receive_Batch( - IEC104_Connection_t *connection, uint64_t connection_generation, uint64_t now_ms); + IEC104_Connection_t *connection, uint64_t connection_generation, uint32_t now_ms); /** * 功能:最多消费至一帧末尾,consumed_length必填;非NULL时始终写入实际消费量。 @@ -198,7 +198,7 @@ extern IEC104_ConnectionResult_t IEC104_Connection_Yield_Receive_Batch( */ extern IEC104_ConnectionResult_t IEC104_Connection_Feed( IEC104_Connection_t *connection, uint64_t connection_generation, - const uint8_t *data, uint32_t length, uint64_t now_ms, uint32_t *consumed_length); + const uint8_t *data, uint32_t length, uint32_t now_ms, uint32_t *consumed_length); /** * 功能:FRAME_READY时写只读视图;无业务帧EMPTY,保留帧待继续处理时WAIT。FAILED仍可读已受理I帧。 @@ -238,7 +238,7 @@ extern IEC104_ConnectionResult_t IEC104_Connection_Release_Received_Frame( */ extern IEC104_ConnectionResult_t IEC104_Connection_Submit_Response( IEC104_Connection_t *connection, uint64_t connection_generation, - const uint8_t *asdu, uint16_t asdu_length, uint64_t now_ms, + const uint8_t *asdu, uint16_t asdu_length, uint32_t now_ms, IEC104_SendBufferHeadInfo_t *head_info); /** @@ -253,7 +253,7 @@ extern IEC104_ConnectionResult_t IEC104_Connection_Submit_Response( * 本层不执行网络收发;Drive受理的STOP会由后续Manager准入检查拦住新的IDLE。 */ extern IEC104_ConnectionResult_t IEC104_Connection_Can_Submit_Idle( - const IEC104_Connection_t *connection, uint64_t connection_generation, uint64_t now_ms, uint16_t reserve); + const IEC104_Connection_t *connection, uint64_t connection_generation, uint32_t now_ms, uint16_t reserve); /** * 功能:使用默认业务等级尝试直接准备一帧IDLE业务ASDU。 * 输入参数:connection/connection_generation——连接及代次;asdu/asdu_length——原文及长度。 @@ -264,7 +264,7 @@ extern IEC104_ConnectionResult_t IEC104_Connection_Can_Submit_Idle( */ extern IEC104_ConnectionResult_t IEC104_Connection_Submit_Idle( IEC104_Connection_t *connection, uint64_t connection_generation, - const uint8_t *asdu, uint16_t asdu_length, uint16_t reserve, uint64_t now_ms, + const uint8_t *asdu, uint16_t asdu_length, uint16_t reserve, uint32_t now_ms, IEC104_SendBufferHeadInfo_t *head_info); /** @@ -279,7 +279,7 @@ extern IEC104_ConnectionResult_t IEC104_Connection_Submit_Idle( */ extern IEC104_ConnectionResult_t IEC104_Connection_Submit_Response_Tracked( IEC104_Connection_t *connection, uint64_t connection_generation, - const uint8_t *asdu, uint16_t asdu_length, uint64_t now_ms, + const uint8_t *asdu, uint16_t asdu_length, uint32_t now_ms, IEC104_SendBufferHeadInfo_t *head_info, uint64_t *ticket); /** @@ -294,7 +294,7 @@ extern IEC104_ConnectionResult_t IEC104_Connection_Submit_Response_Tracked( */ extern IEC104_ConnectionResult_t IEC104_Connection_Enqueue_Response_Tracked( IEC104_Connection_t *connection, uint64_t connection_generation, - const uint8_t *asdu, uint16_t asdu_length, uint64_t now_ms, uint64_t *ticket); + const uint8_t *asdu, uint16_t asdu_length, uint32_t now_ms, uint64_t *ticket); /** * 功能:Init后、开始收发前安装传输内部ACK观察器,不向应用调用回调。 @@ -319,7 +319,7 @@ extern IEC104_ConnectionResult_t IEC104_Connection_Set_Ack_Observer( * pending_data借用至该帧完成或Close;一次只能有一个未回报的写操作,禁止APDU交错。 */ extern IEC104_ConnectionResult_t IEC104_Connection_Prepare_Next_Send( - IEC104_Connection_t *connection, uint64_t connection_generation, uint64_t now_ms, + IEC104_Connection_t *connection, uint64_t connection_generation, uint32_t now_ms, IEC104_SendBufferHeadInfo_t *head_info); /** @@ -349,7 +349,7 @@ extern IEC104_ConnectionResult_t IEC104_Connection_Get_Record_Wait( */ extern IEC104_ConnectionResult_t IEC104_Connection_Handle_Send_Progress( IEC104_Connection_t *connection, IEC104_SendFrameId_t frame_id, - uint16_t bytes_written_now, uint64_t now_ms, IEC104_LocalSendCompletion_t *completion); + uint16_t bytes_written_now, uint32_t now_ms, IEC104_LocalSendCompletion_t *completion); /** * 功能:最终写失败:匹配当前帧时提交失败并冻结,返回FATAL;错身份ERROR,不影响当前帧。 @@ -373,7 +373,7 @@ extern IEC104_ConnectionResult_t IEC104_Connection_Handle_Send_Failure( * t2保留连续未确认区间的最早起点;只确认区间前缀时不续期,剩余部分可能提前确认。 */ extern IEC104_ConnectionResult_t IEC104_Connection_Tick( - IEC104_Connection_t *connection, uint64_t connection_generation, uint64_t now_ms); + IEC104_Connection_t *connection, uint64_t connection_generation, uint32_t now_ms); /** * 功能:供TcpServer在接收批次结束且已推进协议后,查询下一次驱动前可等待的毫秒数。 @@ -393,7 +393,7 @@ extern IEC104_ConnectionResult_t IEC104_Connection_Tick( * 参数、代次、时钟、内部状态非法或接收批次未结束返回ERROR;FAILED返回FATAL。 */ extern IEC104_ConnectionResult_t IEC104_Connection_Get_Wait_Time( - const IEC104_Connection_t *connection, uint64_t connection_generation, uint64_t now_ms, + const IEC104_Connection_t *connection, uint64_t connection_generation, uint32_t now_ms, uint32_t max_wait_ms, uint32_t *wait_ms); /** @@ -473,7 +473,7 @@ extern IEC104_ConnectionResult_t IEC104_Connection_Close( * 尚未交付的接收请求可能产生更高级候选,会暂缓新编号;当前帧和协议维护仍可继续。 */ IEC104_ConnectionResult_t IEC104_Connection_Can_Submit_Idle_Priority( - const IEC104_Connection_t *connection, uint64_t connection_generation, uint64_t now_ms, uint16_t reserve, + const IEC104_Connection_t *connection, uint64_t connection_generation, uint32_t now_ms, uint16_t reserve, IEC104_BusinessPriority_t priority); /** * 功能:实际提交不沿用此前Can的结论:取值期间可能到期,Drive也可能受理STOP或推进出请求。 @@ -492,7 +492,7 @@ IEC104_ConnectionResult_t IEC104_Connection_Can_Submit_Idle_Priority( */ IEC104_ConnectionResult_t IEC104_Connection_Submit_Idle_Priority( IEC104_Connection_t *connection, uint64_t connection_generation, - const uint8_t *asdu, uint16_t asdu_length, uint16_t reserve, uint64_t now_ms, + const uint8_t *asdu, uint16_t asdu_length, uint16_t reserve, uint32_t now_ms, IEC104_SendBufferHeadInfo_t *head_info, IEC104_BusinessPriority_t priority); /** @@ -505,7 +505,7 @@ IEC104_ConnectionResult_t IEC104_Connection_Submit_Idle_Priority( */ IEC104_ConnectionResult_t IEC104_Connection_Submit_Response_Priority( IEC104_Connection_t *connection, uint64_t connection_generation, - const uint8_t *asdu, uint16_t asdu_length, uint64_t now_ms, + const uint8_t *asdu, uint16_t asdu_length, uint32_t now_ms, IEC104_SendBufferHeadInfo_t *head_info, IEC104_BusinessPriority_t priority); /** @@ -526,7 +526,7 @@ IEC104_ConnectionResult_t IEC104_Connection_Submit_Response_Priority( */ IEC104_ConnectionResult_t IEC104_Connection_Submit_Response_Tracked_Priority( IEC104_Connection_t *connection, uint64_t connection_generation, - const uint8_t *asdu, uint16_t asdu_length, uint64_t now_ms, + const uint8_t *asdu, uint16_t asdu_length, uint32_t now_ms, IEC104_SendBufferHeadInfo_t *head_info, uint64_t *ticket, IEC104_BusinessPriority_t priority); /** @@ -545,7 +545,7 @@ IEC104_ConnectionResult_t IEC104_Connection_Submit_Response_Tracked_Priority( */ IEC104_ConnectionResult_t IEC104_Connection_Enqueue_Response_Tracked_Priority( IEC104_Connection_t *connection, uint64_t connection_generation, - const uint8_t *asdu, uint16_t asdu_length, uint64_t now_ms, uint64_t *ticket, + const uint8_t *asdu, uint16_t asdu_length, uint32_t now_ms, uint64_t *ticket, IEC104_BusinessPriority_t priority); #ifdef __cplusplus diff --git a/App/iec60870/104/IEC104_SendBuffer.c b/App/iec60870/104/IEC104_SendBuffer.c index b8fbca69..536d2cef 100644 --- a/App/iec60870/104/IEC104_SendBuffer.c +++ b/App/iec60870/104/IEC104_SendBuffer.c @@ -34,7 +34,8 @@ static int Frame_State_Valid(const IEC104_SendBuffer_t *buffer, { if (state->frame_serial == 0U || state->frame_serial >= buffer->next_frame_serial || state->written_bytes > state->apdu_length || state->encoded_nr > IEC104_SEQUENCE_MASK || - (state->written_bytes == state->apdu_length && state->written_at_ms < state->queued_at_ms)) { + (state->written_bytes == state->apdu_length && + (int32_t)(state->written_at_ms - state->queued_at_ms) < 0)) { return 0; } if (is_i) { @@ -293,7 +294,7 @@ IEC104_SendBufferResult_t IEC104_SendBuffer_Reserve_I_Frame( IEC104_SendBufferResult_t IEC104_SendBuffer_Commit_Frame( IEC104_SendBuffer_t *buffer, IEC104_SendFrameId_t frame_id, IEC104_SendBufferFrameType_t frame_type, uint16_t apdu_length, - const IEC104_IFrameTx_t *i_frame_snapshot, uint64_t queued_at_ms) + const IEC104_IFrameTx_t *i_frame_snapshot, uint32_t queued_at_ms) { IEC104_SendBufferFrameState_t *state; const uint8_t *apdu; @@ -422,7 +423,7 @@ IEC104_SendBufferResult_t IEC104_SendBuffer_Peek_Send_Head( */ IEC104_SendBufferResult_t IEC104_SendBuffer_Record_Written_Bytes( IEC104_SendBuffer_t *buffer, IEC104_SendFrameId_t frame_id, - uint16_t bytes_written_now, uint64_t written_at_ms) + uint16_t bytes_written_now, uint32_t written_at_ms) { IEC104_SendBufferFrameState_t *state; @@ -434,7 +435,7 @@ IEC104_SendBufferResult_t IEC104_SendBuffer_Record_Written_Bytes( if (!Frame_Id_Matches(buffer, state, frame_id) || state->written_bytes == state->apdu_length || bytes_written_now > (uint16_t)(state->apdu_length - state->written_bytes) || (bytes_written_now == (uint16_t)(state->apdu_length - state->written_bytes) && - written_at_ms < state->queued_at_ms)) { + (int32_t)(written_at_ms - state->queued_at_ms) < 0)) { return IEC104_SEND_BUFFER_ERROR; } /* 只累计成功字节;queued_at_ms始终保留,最后一段才建立实际写完时刻。 */ @@ -493,7 +494,7 @@ IEC104_SendBufferResult_t IEC104_SendBuffer_Commit_Send_Completion( * 已整帧写完但尚未提交完成释放的帧仍在检查范围内。 */ int IEC104_SendBuffer_Head_Send_Expired( - const IEC104_SendBuffer_t *buffer, uint64_t connection_generation, uint64_t now_ms, uint32_t timeout_ms) + const IEC104_SendBuffer_t *buffer, uint64_t connection_generation, uint32_t now_ms, uint32_t timeout_ms) { IEC104_SendBufferHeadInfo_t head; IEC104_SendBufferResult_t result; @@ -505,7 +506,8 @@ int IEC104_SendBuffer_Head_Send_Expired( if (result == IEC104_SEND_BUFFER_EMPTY) { return 0; } - if (result != IEC104_SEND_BUFFER_OK || now_ms < head.queued_at_ms) { + /* 32位回绕安全:先判单调再以无符号差值对比超时。 */ + if (result != IEC104_SEND_BUFFER_OK || (int32_t)(now_ms - head.queued_at_ms) < 0) { return -1; } return now_ms - head.queued_at_ms >= timeout_ms; diff --git a/App/iec60870/104/IEC104_SendBuffer.h b/App/iec60870/104/IEC104_SendBuffer.h index cad4683d..6e9fb4a1 100644 --- a/App/iec60870/104/IEC104_SendBuffer.h +++ b/App/iec60870/104/IEC104_SendBuffer.h @@ -51,15 +51,15 @@ typedef struct { IEC104_SendBufferFrameType_t frame_type; /* 完成分派类型,不按当前Link状态推断 */ IEC104_IFrameTx_t i_frame_snapshot; /* I帧原始快照;S/U查询时为0 */ uint16_t encoded_nr; /* I/S中实际编码的N(R),U帧为0 */ - uint64_t queued_at_ms; /* 本地发送期限的原始起点 */ - uint64_t written_at_ms; /* 仅整帧写完时有效,允许时刻0 */ + uint32_t queued_at_ms; /* 本地发送期限的原始起点 */ + uint32_t written_at_ms; /* 仅整帧写完时有效,允许时刻0 */ } IEC104_SendBufferHeadInfo_t; /* 共用写入元数据;frame_type保存上面的枚举值。 */ typedef struct { uint64_t frame_serial; /* 本次预留分配的编号,不随槽位复用而复用 */ - uint64_t queued_at_ms; /* Commit时保存的原始单调时刻 */ - uint64_t written_at_ms; /* 最后一段成功写入的实际时刻,允许0 */ + uint32_t queued_at_ms; /* Commit时保存的原始单调时刻 */ + uint32_t written_at_ms; /* 最后一段成功写入的实际时刻,允许0 */ uint16_t apdu_length; /* 完整长度;尚未提交的预留为0 */ uint16_t written_bytes; /* 累计已写长度,不可超过apdu_length */ uint16_t encoded_nr; /* Commit从APCI读取的确认快照 */ @@ -157,7 +157,7 @@ extern IEC104_SendBufferResult_t IEC104_SendBuffer_Reserve_I_Frame( extern IEC104_SendBufferResult_t IEC104_SendBuffer_Commit_Frame( IEC104_SendBuffer_t *buffer, IEC104_SendFrameId_t frame_id, IEC104_SendBufferFrameType_t frame_type, uint16_t apdu_length, - const IEC104_IFrameTx_t *i_frame_snapshot, uint64_t queued_at_ms); + const IEC104_IFrameTx_t *i_frame_snapshot, uint32_t queued_at_ms); /** * 功能:核对唯一预留身份后归还存储;仅限Link尚未构帧成功时使用,不回滚协议状态。 @@ -192,7 +192,7 @@ extern IEC104_SendBufferResult_t IEC104_SendBuffer_Peek_Send_Head( */ extern IEC104_SendBufferResult_t IEC104_SendBuffer_Record_Written_Bytes( IEC104_SendBuffer_t *buffer, IEC104_SendFrameId_t frame_id, - uint16_t bytes_written_now, uint64_t written_at_ms); + uint16_t bytes_written_now, uint32_t written_at_ms); /** * 功能:对应Link.Complete及I帧本地完成记录提交后调用;TESTFR_CON无Link.Complete。成功释放当前槽,不等待ACK。 @@ -218,7 +218,7 @@ extern IEC104_SendBufferResult_t IEC104_SendBuffer_Commit_Send_Completion( */ extern int IEC104_SendBuffer_Head_Send_Expired( const IEC104_SendBuffer_t *buffer, uint64_t connection_generation, - uint64_t now_ms, uint32_t timeout_ms); + uint32_t now_ms, uint32_t timeout_ms); /** * 功能:旧I/O结束后清除引用;不关闭TCP,不释放调用方数组。 diff --git a/App/iec60870/104/IEC104_SendManager.c b/App/iec60870/104/IEC104_SendManager.c index bd10576b..35169cb8 100644 --- a/App/iec60870/104/IEC104_SendManager.c +++ b/App/iec60870/104/IEC104_SendManager.c @@ -85,7 +85,8 @@ static int I_Frame_Record_Valid(const IEC104_SendManager_t *manager, record->i_frame_snapshot.frame_length <= IEC104_MAX_APDU_LEN && record->local_send_completed <= 1U && record->peer_acknowledged <= 1U && (record->peer_acknowledged == 0U || record->local_send_completed != 0U) && - (record->local_send_completed == 0U || record->written_at_ms >= record->queued_at_ms); + (record->local_send_completed == 0U || + (int32_t)(record->written_at_ms - record->queued_at_ms) >= 0); } /** @@ -465,7 +466,7 @@ static IEC104_SendManagerResult_t Cancel_Control_Reservation( */ static IEC104_SendManagerResult_t Commit_Control_Frame( IEC104_SendManager_t *manager, const IEC104_SendBufferReservation_t *reservation, - IEC104_SendBufferFrameType_t frame_type, uint64_t now_ms) + IEC104_SendBufferFrameType_t frame_type, uint32_t now_ms) { return IEC104_SendBuffer_Commit_Frame(manager->send_buffer, reservation->frame_id, frame_type, IEC104_APCI_LEN, NULL, now_ms) == IEC104_SEND_BUFFER_OK ? @@ -483,7 +484,7 @@ static IEC104_SendManagerResult_t Commit_Control_Frame( */ static IEC104_SendManagerResult_t Finish_Control_Prepare( IEC104_SendManager_t *manager, const IEC104_SendBufferReservation_t *reservation, - IEC104_SendBufferFrameType_t frame_type, int length, uint64_t now_ms) + IEC104_SendBufferFrameType_t frame_type, int length, uint32_t now_ms) { if (length <= 0) { return Cancel_Control_Reservation(manager, reservation, @@ -508,7 +509,7 @@ static IEC104_SendManagerResult_t Finish_Control_Prepare( */ IEC104_SendManagerResult_t IEC104_SendManager_Queue_S_Ack( IEC104_SendManager_t *manager, uint64_t connection_generation, - uint16_t w, int immediate, uint64_t now_ms) + uint16_t w, int immediate, uint32_t now_ms) { IEC104_SendBufferReservation_t reservation; IEC104_SendManagerResult_t result; @@ -539,7 +540,7 @@ IEC104_SendManagerResult_t IEC104_SendManager_Queue_S_Ack( */ IEC104_SendManagerResult_t IEC104_SendManager_Queue_T2_Ack( IEC104_SendManager_t *manager, uint64_t connection_generation, - uint32_t elapsed_ms, uint32_t t2_ms, uint64_t now_ms) + uint32_t elapsed_ms, uint32_t t2_ms, uint32_t now_ms) { IEC104_SendBufferReservation_t reservation; IEC104_SendManagerResult_t result; @@ -568,7 +569,7 @@ IEC104_SendManagerResult_t IEC104_SendManager_Queue_T2_Ack( * 接入方以实际written_at_ms作为等待CON的t1起点;不能在入队时提前提交发送完成。 */ IEC104_SendManagerResult_t IEC104_SendManager_Queue_Testfr_Act( - IEC104_SendManager_t *manager, uint64_t connection_generation, uint64_t now_ms) + IEC104_SendManager_t *manager, uint64_t connection_generation, uint32_t now_ms) { IEC104_SendBufferReservation_t reservation; IEC104_SendManagerResult_t result = Reserve_Control_Frame(manager, connection_generation, &reservation); @@ -593,7 +594,7 @@ IEC104_SendManagerResult_t IEC104_SendManager_Queue_Testfr_Act( */ IEC104_SendManagerResult_t IEC104_SendManager_Queue_T3_Testfr( IEC104_SendManager_t *manager, uint64_t connection_generation, - uint32_t idle_elapsed_ms, uint32_t t3_ms, uint64_t now_ms) + uint32_t idle_elapsed_ms, uint32_t t3_ms, uint32_t now_ms) { IEC104_SendBufferReservation_t reservation; IEC104_SendManagerResult_t result; @@ -625,7 +626,7 @@ IEC104_SendManagerResult_t IEC104_SendManager_Queue_T3_Testfr( */ IEC104_SendManagerResult_t IEC104_SendManager_Handle_Testfr_Act( IEC104_SendManager_t *manager, uint64_t connection_generation, - const IEC104_ApciInfo_t *apci, uint64_t now_ms) + const IEC104_ApciInfo_t *apci, uint32_t now_ms) { IEC104_SendBufferReservation_t reservation; IEC104_SendManagerResult_t result; @@ -804,7 +805,7 @@ IEC104_SendManagerResult_t IEC104_SendManager_Can_Submit_Response_Priority( static IEC104_SendManagerResult_t Prepare_I_Asdu( IEC104_SendManager_t *manager, const uint8_t *asdu, uint16_t asdu_length, IEC104_AsduPriority_t priority, const IEC104_AsduEntryId_t *queue_entry, - int normal_waiting, uint64_t response_ticket, uint64_t now_ms, IEC104_SendBufferHeadInfo_t *head_info) + int normal_waiting, uint64_t response_ticket, uint32_t now_ms, IEC104_SendBufferHeadInfo_t *head_info) { IEC104_SendBufferReservation_t reservation; IEC104_SendBufferResult_t tx_result; @@ -903,7 +904,7 @@ static IEC104_SendManagerResult_t Prepare_I_Asdu( * 跨尾部原文用249字节局部缓冲拼接后调用Link;连续原文直接借用,不增加动态分配。 */ IEC104_SendManagerResult_t IEC104_SendManager_Prepare_Next_Send( - IEC104_SendManager_t *manager, uint64_t connection_generation, uint64_t now_ms, + IEC104_SendManager_t *manager, uint64_t connection_generation, uint32_t now_ms, IEC104_SendBufferHeadInfo_t *head_info) { IEC104_AsduHeadInfo_t high_head_info, normal_head_info, selected_head_info; @@ -987,7 +988,7 @@ IEC104_SendManagerResult_t IEC104_SendManager_Prepare_Next_Send( */ static IEC104_SendManagerResult_t Submit_Response( IEC104_SendManager_t *manager, uint64_t connection_generation, - const uint8_t *asdu, uint16_t asdu_length, uint64_t now_ms, + const uint8_t *asdu, uint16_t asdu_length, uint32_t now_ms, IEC104_SendBufferHeadInfo_t *head_info, uint64_t *ticket, IEC104_BusinessPriority_t priority) { @@ -1072,7 +1073,7 @@ static IEC104_SendManagerResult_t Submit_Response( */ IEC104_SendManagerResult_t IEC104_SendManager_Submit_Idle_Priority( IEC104_SendManager_t *manager, uint64_t connection_generation, - const uint8_t *asdu, uint16_t asdu_length, uint16_t reserve, uint64_t now_ms, + const uint8_t *asdu, uint16_t asdu_length, uint16_t reserve, uint32_t now_ms, IEC104_SendBufferHeadInfo_t *head_info, IEC104_BusinessPriority_t priority) { @@ -1096,7 +1097,7 @@ IEC104_SendManagerResult_t IEC104_SendManager_Submit_Idle_Priority( */ IEC104_SendManagerResult_t IEC104_SendManager_Submit_Idle( IEC104_SendManager_t *manager, uint64_t connection_generation, - const uint8_t *asdu, uint16_t asdu_length, uint16_t reserve, uint64_t now_ms, + const uint8_t *asdu, uint16_t asdu_length, uint16_t reserve, uint32_t now_ms, IEC104_SendBufferHeadInfo_t *head_info) { return IEC104_SendManager_Submit_Idle_Priority(manager, connection_generation, asdu, asdu_length, reserve, now_ms, head_info, IEC104_BUSINESS_PRIORITY_NONE); @@ -1112,7 +1113,7 @@ IEC104_SendManagerResult_t IEC104_SendManager_Submit_Idle( */ IEC104_SendManagerResult_t IEC104_SendManager_Submit_Response_Priority( IEC104_SendManager_t *manager, uint64_t connection_generation, - const uint8_t *asdu, uint16_t asdu_length, uint64_t now_ms, + const uint8_t *asdu, uint16_t asdu_length, uint32_t now_ms, IEC104_SendBufferHeadInfo_t *head_info, IEC104_BusinessPriority_t priority) { @@ -1129,7 +1130,7 @@ IEC104_SendManagerResult_t IEC104_SendManager_Submit_Response_Priority( */ IEC104_SendManagerResult_t IEC104_SendManager_Submit_Response( IEC104_SendManager_t *manager, uint64_t connection_generation, - const uint8_t *asdu, uint16_t asdu_length, uint64_t now_ms, + const uint8_t *asdu, uint16_t asdu_length, uint32_t now_ms, IEC104_SendBufferHeadInfo_t *head_info) { return IEC104_SendManager_Submit_Response_Priority(manager, connection_generation, asdu, asdu_length, now_ms, head_info, IEC104_BUSINESS_PRIORITY_NONE); @@ -1153,7 +1154,7 @@ IEC104_SendManagerResult_t IEC104_SendManager_Submit_Response( */ IEC104_SendManagerResult_t IEC104_SendManager_Submit_Response_Tracked_Priority( IEC104_SendManager_t *manager, uint64_t connection_generation, - const uint8_t *asdu, uint16_t asdu_length, uint64_t now_ms, + const uint8_t *asdu, uint16_t asdu_length, uint32_t now_ms, IEC104_SendBufferHeadInfo_t *head_info, uint64_t *ticket, IEC104_BusinessPriority_t priority) { @@ -1170,7 +1171,7 @@ IEC104_SendManagerResult_t IEC104_SendManager_Submit_Response_Tracked_Priority( */ IEC104_SendManagerResult_t IEC104_SendManager_Submit_Response_Tracked( IEC104_SendManager_t *manager, uint64_t connection_generation, - const uint8_t *asdu, uint16_t asdu_length, uint64_t now_ms, + const uint8_t *asdu, uint16_t asdu_length, uint32_t now_ms, IEC104_SendBufferHeadInfo_t *head_info, uint64_t *ticket) { return IEC104_SendManager_Submit_Response_Tracked_Priority(manager, connection_generation, asdu, asdu_length, now_ms, head_info, ticket, IEC104_BUSINESS_PRIORITY_NONE); @@ -1197,7 +1198,7 @@ IEC104_SendManagerResult_t IEC104_SendManager_Submit_Response_Tracked( */ IEC104_SendManagerResult_t IEC104_SendManager_Handle_Send_Progress( IEC104_SendManager_t *manager, IEC104_SendFrameId_t frame_id, - uint16_t bytes_written_now, uint64_t now_ms, IEC104_LocalSendCompletion_t *completion) + uint16_t bytes_written_now, uint32_t now_ms, IEC104_LocalSendCompletion_t *completion) { IEC104_SendBufferHeadInfo_t head_info; IEC104_SendBufferResult_t tx_result; @@ -1299,7 +1300,7 @@ IEC104_SendManagerResult_t IEC104_SendManager_Handle_Send_Failure( */ IEC104_SendManagerResult_t IEC104_SendManager_Handle_I_S_Frame( IEC104_SendManager_t *manager, uint64_t connection_generation, - const IEC104_ApciInfo_t *apci, uint64_t now_ms) + const IEC104_ApciInfo_t *apci, uint32_t now_ms) { IEC104_IFrameSendProgress_t before_progress, after_progress; uint16_t acknowledged, first_offset, i, high_acknowledged = 0U, idle_acknowledged = 0U; @@ -1462,12 +1463,12 @@ IEC104_SendManagerResult_t IEC104_SendManager_Peek_Oldest_Sent_Unacked_Record( * timeout_ms——超时毫秒数。 * 输出参数:无。 * 返回值:返回elapsed >= timeout_ms ? 0U : timeout_ms - (uint32_t)elapsed的结果。 - * 说明:先作64位差值再截断,避免绝对期限加法或长时间差溢出。 + * 说明:32位时刻按无符号差值求elapsed,回绕下差值仍正确;不计算绝对期限,避免溢出。 */ -static uint32_t Deadline_Remaining(uint64_t now_ms, uint64_t started_ms, uint32_t timeout_ms) +static uint32_t Deadline_Remaining(uint32_t now_ms, uint32_t started_ms, uint32_t timeout_ms) { - uint64_t elapsed = now_ms - started_ms; - return elapsed >= timeout_ms ? 0U : timeout_ms - (uint32_t)elapsed; + uint32_t elapsed = now_ms - started_ms; + return elapsed >= timeout_ms ? 0U : timeout_ms - elapsed; } /** @@ -1484,7 +1485,7 @@ static uint32_t Deadline_Remaining(uint64_t now_ms, uint64_t started_ms, uint32_ */ IEC104_SendManagerResult_t IEC104_SendManager_Get_Deadlines( const IEC104_SendManager_t *manager, uint64_t connection_generation, - uint64_t now_ms, uint32_t local_send_timeout_ms, uint32_t t1_ms, + uint32_t now_ms, uint32_t local_send_timeout_ms, uint32_t t1_ms, IEC104_SendManagerDeadlines_t *deadlines) { IEC104_SendManagerDeadlines_t prepared; @@ -1503,7 +1504,7 @@ IEC104_SendManagerResult_t IEC104_SendManager_Get_Deadlines( prepared.control_has_room = buffer_status.control_has_room; buffered = IEC104_SendBuffer_Peek_Send_Head(manager->send_buffer, &head); if (buffered == IEC104_SEND_BUFFER_OK) { - if (now_ms < head.queued_at_ms) { + if ((int32_t)(now_ms - head.queued_at_ms) < 0) { return IEC104_SEND_MANAGER_ERROR; } prepared.has_send_head = 1U; @@ -1514,7 +1515,7 @@ IEC104_SendManagerResult_t IEC104_SendManager_Get_Deadlines( } recorded = IEC104_SendManager_Peek_Oldest_Sent_Unacked_Record(manager, &record); if (recorded == IEC104_SEND_MANAGER_OK) { - if (now_ms < record.written_at_ms) { + if ((int32_t)(now_ms - record.written_at_ms) < 0) { return IEC104_SEND_MANAGER_ERROR; } prepared.has_i_ack_deadline = 1U; @@ -1538,7 +1539,7 @@ IEC104_SendManagerResult_t IEC104_SendManager_Get_Deadlines( */ int IEC104_SendManager_T1_I_Ack_Expired( const IEC104_SendManager_t *manager, uint64_t connection_generation, - uint64_t now_ms, uint32_t t1_ms) + uint32_t now_ms, uint32_t t1_ms) { IEC104_IFrameSendRecord_t record; IEC104_SendManagerResult_t result; @@ -1550,7 +1551,7 @@ int IEC104_SendManager_T1_I_Ack_Expired( if (result == IEC104_SEND_MANAGER_EMPTY) { return 0; } - if (result != IEC104_SEND_MANAGER_OK || now_ms < record.written_at_ms) { + if (result != IEC104_SEND_MANAGER_OK || (int32_t)(now_ms - record.written_at_ms) < 0) { return -1; } return Deadline_Remaining(now_ms, record.written_at_ms, t1_ms) == 0U; @@ -1642,7 +1643,7 @@ void IEC104_SendManager_Abort(IEC104_SendManager_t *manager) */ static IEC104_SendManagerResult_t Commit_Startdt_Con( IEC104_SendManager_t *manager, const IEC104_SendBufferReservation_t *reservation, - uint64_t now_ms, int first_start) + uint32_t now_ms, int first_start) { if (first_start) { if (IEC104_AsduQueue_Reset_High(manager->asdu_queue, manager->connection_generation) != IEC104_ASDU_QUEUE_OK) { @@ -1666,7 +1667,7 @@ static IEC104_SendManagerResult_t Commit_Startdt_Con( */ IEC104_SendManagerResult_t IEC104_SendManager_Slave_Handle_Startdt_Act( IEC104_SendManager_t *manager, uint64_t connection_generation, - const IEC104_ApciInfo_t *apci, uint64_t now_ms) + const IEC104_ApciInfo_t *apci, uint32_t now_ms) { IEC104_SendBufferReservation_t reservation; IEC104_SendManagerResult_t result; @@ -1726,7 +1727,7 @@ IEC104_SendManagerResult_t IEC104_SendManager_Slave_Handle_Stopdt_Act( * 说明:Connection用该帧身份结束本轮STOP总计时,旧CON完成不能结束后续STOP的期限。 */ IEC104_SendManagerResult_t IEC104_SendManager_Slave_Queue_Stopdt_Response( - IEC104_SendManager_t *manager, uint64_t connection_generation, uint64_t now_ms, + IEC104_SendManager_t *manager, uint64_t connection_generation, uint32_t now_ms, IEC104_SendFrameId_t *stop_con_id) { IEC104_SendBufferReservation_t reservation; diff --git a/App/iec60870/104/IEC104_SendManager.h b/App/iec60870/104/IEC104_SendManager.h index 598f1572..79b3fe7a 100644 --- a/App/iec60870/104/IEC104_SendManager.h +++ b/App/iec60870/104/IEC104_SendManager.h @@ -56,8 +56,8 @@ typedef enum { typedef struct { uint64_t frame_serial; /* 本连接内不复用的发送编号;代次取所属Manager */ uint64_t asdu_entry_serial; /* NORMAL条目编号;HIGH固定0,不提供ASDU业务身份 */ - uint64_t queued_at_ms; /* 实际准备I帧的时刻,本地发送期限起点 */ - uint64_t written_at_ms; /* local_send_completed==1时有效,允许0 */ + uint32_t queued_at_ms; /* 实际准备I帧的时刻,本地发送期限起点 */ + uint32_t written_at_ms; /* local_send_completed==1时有效,允许0 */ IEC104_IFrameTx_t i_frame_snapshot; /* 原始N(S)/N(R)/长度快照 */ IEC104_AsduPriority_t asdu_priority; /* 原始优先级 */ uint8_t local_send_completed; /* 0/1:完整写出且Link.Complete成功 */ @@ -68,8 +68,8 @@ typedef struct { typedef struct { IEC104_SendFrameId_t frame_id; /* 连接代次 + 不复用的发送身份 */ uint64_t asdu_entry_serial; /* NORMAL用于ACK释放;HIGH固定0,按frame_id读取帧回执 */ - uint64_t queued_at_ms; /* 实际准备I帧的时刻,本地发送期限起点 */ - uint64_t written_at_ms; /* local_send_completed==1时有效,允许0 */ + uint32_t queued_at_ms; /* 实际准备I帧的时刻,本地发送期限起点 */ + uint32_t written_at_ms; /* local_send_completed==1时有效,允许0 */ IEC104_IFrameTx_t i_frame_snapshot; /* 原始N(S)/N(R)/长度快照 */ IEC104_AsduPriority_t asdu_priority; /* 原始优先级;HIGH只确认记录,NORMAL另确认原文队列 */ uint8_t local_send_completed; /* 0/1:完整写出且Link.Complete成功 */ @@ -82,8 +82,8 @@ typedef struct { IEC104_SendBufferFrameType_t frame_type; /* 原帧保存的帧类型,不根据完成后的链路状态推断 */ IEC104_LinkResult_t link_completion_result; /* 保留OK/IGNORED,供调用方决定是否启动过程计时 */ IEC104_IFrameTx_t i_frame_snapshot; /* 仅I帧有效 */ - uint64_t queued_at_ms; /* 原始入队时刻,部分写入或重试不续期 */ - uint64_t written_at_ms; /* 实际整帧写完时刻;主动U帧成功后用于启动等待CON计时 */ + uint32_t queued_at_ms; /* 原始入队时刻,部分写入或重试不续期 */ + uint32_t written_at_ms; /* 实际整帧写完时刻;主动U帧成功后用于启动等待CON计时 */ } IEC104_LocalSendCompletion_t; @@ -95,7 +95,7 @@ typedef struct { typedef struct { void *context; void (*handed)(void *context, uint64_t ticket, IEC104_SendFrameId_t frame_id); - void (*acknowledged)(void *context, IEC104_SendFrameId_t frame_id, uint64_t now_ms); + void (*acknowledged)(void *context, IEC104_SendFrameId_t frame_id, uint32_t now_ms); } IEC104_SendManagerAckObserver_t; /* @@ -171,7 +171,7 @@ extern IEC104_SendManagerResult_t IEC104_SendManager_Can_Submit_Idle( */ extern IEC104_SendManagerResult_t IEC104_SendManager_Submit_Idle( IEC104_SendManager_t *manager, uint64_t connection_generation, - const uint8_t *asdu, uint16_t asdu_length, uint16_t reserve, uint64_t now_ms, + const uint8_t *asdu, uint16_t asdu_length, uint16_t reserve, uint32_t now_ms, IEC104_SendBufferHeadInfo_t *head_info); /** @@ -214,7 +214,7 @@ typedef struct { */ extern IEC104_SendManagerResult_t IEC104_SendManager_Get_Deadlines( const IEC104_SendManager_t *manager, uint64_t connection_generation, - uint64_t now_ms, uint32_t local_send_timeout_ms, uint32_t t1_ms, + uint32_t now_ms, uint32_t local_send_timeout_ms, uint32_t t1_ms, IEC104_SendManagerDeadlines_t *deadlines); /** @@ -260,7 +260,7 @@ extern IEC104_SendManagerResult_t IEC104_SendManager_Enqueue_Response( */ extern IEC104_SendManagerResult_t IEC104_SendManager_Submit_Response( IEC104_SendManager_t *manager, uint64_t connection_generation, - const uint8_t *asdu, uint16_t asdu_length, uint64_t now_ms, + const uint8_t *asdu, uint16_t asdu_length, uint32_t now_ms, IEC104_SendBufferHeadInfo_t *head_info); /** @@ -276,7 +276,7 @@ extern IEC104_SendManagerResult_t IEC104_SendManager_Submit_Response( */ extern IEC104_SendManagerResult_t IEC104_SendManager_Submit_Response_Tracked( IEC104_SendManager_t *manager, uint64_t connection_generation, - const uint8_t *asdu, uint16_t asdu_length, uint64_t now_ms, + const uint8_t *asdu, uint16_t asdu_length, uint32_t now_ms, IEC104_SendBufferHeadInfo_t *head_info, uint64_t *ticket); /** @@ -305,7 +305,7 @@ extern IEC104_SendManagerResult_t IEC104_SendManager_Submit_Response_Tracked( * 跨尾部原文用249字节局部缓冲拼接后调用Link;连续原文直接借用,不增加动态分配。 */ extern IEC104_SendManagerResult_t IEC104_SendManager_Prepare_Next_Send( - IEC104_SendManager_t *manager, uint64_t connection_generation, uint64_t now_ms, + IEC104_SendManager_t *manager, uint64_t connection_generation, uint32_t now_ms, IEC104_SendBufferHeadInfo_t *head_info); /* @@ -339,7 +339,7 @@ extern IEC104_SendManagerResult_t IEC104_SendManager_Prepare_Next_Send( */ extern IEC104_SendManagerResult_t IEC104_SendManager_Queue_S_Ack( IEC104_SendManager_t *manager, uint64_t connection_generation, - uint16_t w, int immediate, uint64_t now_ms); + uint16_t w, int immediate, uint32_t now_ms); /** * 功能:t2到期后按公共S规则准备确认,仍受启停和已有S在途约束。 @@ -350,7 +350,7 @@ extern IEC104_SendManagerResult_t IEC104_SendManager_Queue_S_Ack( */ extern IEC104_SendManagerResult_t IEC104_SendManager_Queue_T2_Ack( IEC104_SendManager_t *manager, uint64_t connection_generation, - uint32_t elapsed_ms, uint32_t t2_ms, uint64_t now_ms); + uint32_t elapsed_ms, uint32_t t2_ms, uint32_t now_ms); /** * 功能:子站主动生成并排队TESTFR_ACT,不要求当前已经STARTED。 @@ -360,7 +360,7 @@ extern IEC104_SendManagerResult_t IEC104_SendManager_Queue_T2_Ack( * 说明:完整发送后经Handle_Send_Progress才进入CON_PENDING,以实际written_at_ms作为t1起点。 */ extern IEC104_SendManagerResult_t IEC104_SendManager_Queue_Testfr_Act( - IEC104_SendManager_t *manager, uint64_t connection_generation, uint64_t now_ms); + IEC104_SendManager_t *manager, uint64_t connection_generation, uint32_t now_ms); /** * 功能:空闲达到t3后准备TESTFR_ACT,复用同一主动探测状态。 @@ -371,7 +371,7 @@ extern IEC104_SendManagerResult_t IEC104_SendManager_Queue_Testfr_Act( */ extern IEC104_SendManagerResult_t IEC104_SendManager_Queue_T3_Testfr( IEC104_SendManager_t *manager, uint64_t connection_generation, - uint32_t idle_elapsed_ms, uint32_t t3_ms, uint64_t now_ms); + uint32_t idle_elapsed_ms, uint32_t t3_ms, uint32_t now_ms); /** * 功能:子站接收TESTFR_ACT并排队TESTFR_CON,不结束本端正在进行的主动探测。 @@ -383,7 +383,7 @@ extern IEC104_SendManagerResult_t IEC104_SendManager_Queue_T3_Testfr( */ extern IEC104_SendManagerResult_t IEC104_SendManager_Handle_Testfr_Act( IEC104_SendManager_t *manager, uint64_t connection_generation, - const IEC104_ApciInfo_t *apci, uint64_t now_ms); + const IEC104_ApciInfo_t *apci, uint32_t now_ms); /** * 功能:按当前主动探测阶段受理TESTFR_CON;不需要发送槽,不生成应答。 @@ -417,7 +417,7 @@ extern IEC104_SendManagerResult_t IEC104_SendManager_Handle_Testfr_Con( */ extern IEC104_SendManagerResult_t IEC104_SendManager_Handle_Send_Progress( IEC104_SendManager_t *manager, IEC104_SendFrameId_t frame_id, - uint16_t bytes_written_now, uint64_t now_ms, IEC104_LocalSendCompletion_t *completion); + uint16_t bytes_written_now, uint32_t now_ms, IEC104_LocalSendCompletion_t *completion); /** * 功能:匹配队首发送失败/发送超时,分派对应Complete(-1),返回FATAL;错frame_id返回ERROR。 @@ -449,7 +449,7 @@ extern IEC104_SendManagerResult_t IEC104_SendManager_Handle_Send_Failure( */ extern IEC104_SendManagerResult_t IEC104_SendManager_Handle_I_S_Frame( IEC104_SendManager_t *manager, uint64_t connection_generation, - const IEC104_ApciInfo_t *apci, uint64_t now_ms); + const IEC104_ApciInfo_t *apci, uint32_t now_ms); /** * 功能:返回最早已本地完成、尚未ACK的I帧记录;OK复制记录,EMPTY/ERROR不改输出。 @@ -473,7 +473,7 @@ extern IEC104_SendManagerResult_t IEC104_SendManager_Peek_Oldest_Sent_Unacked_Re */ extern int IEC104_SendManager_T1_I_Ack_Expired( const IEC104_SendManager_t *manager, uint64_t connection_generation, - uint64_t now_ms, uint32_t t1_ms); + uint32_t now_ms, uint32_t t1_ms); /** * 功能:返回最早同时满足本地完成和对端ACK的业务记录;无记录EMPTY,尚未就绪WAIT。 @@ -535,7 +535,7 @@ extern void IEC104_SendManager_Abort(IEC104_SendManager_t *manager); */ extern IEC104_SendManagerResult_t IEC104_SendManager_Slave_Handle_Startdt_Act( IEC104_SendManager_t *manager, uint64_t connection_generation, - const IEC104_ApciInfo_t *apci, uint64_t now_ms); + const IEC104_ApciInfo_t *apci, uint32_t now_ms); /** * 功能:STOP立即停用并清理待发HIGH,无需控制槽;当前APDU、记录及NORMAL仍按原规则处理。 @@ -565,7 +565,7 @@ extern IEC104_SendManagerResult_t IEC104_SendManager_Slave_Handle_Stopdt_Act( * 调用方用帧身份结束对应STOP期限,不能由任意旧CON完成清掉新停止的计时。 */ extern IEC104_SendManagerResult_t IEC104_SendManager_Slave_Queue_Stopdt_Response( - IEC104_SendManager_t *manager, uint64_t connection_generation, uint64_t now_ms, + IEC104_SendManager_t *manager, uint64_t connection_generation, uint32_t now_ms, IEC104_SendFrameId_t *stop_con_id); /* ==================== 子站初始化 ==================== */ @@ -687,7 +687,7 @@ IEC104_SendManagerResult_t IEC104_SendManager_Enqueue_Response_Priority( */ IEC104_SendManagerResult_t IEC104_SendManager_Submit_Idle_Priority( IEC104_SendManager_t *manager, uint64_t connection_generation, - const uint8_t *asdu, uint16_t asdu_length, uint16_t reserve, uint64_t now_ms, + const uint8_t *asdu, uint16_t asdu_length, uint16_t reserve, uint32_t now_ms, IEC104_SendBufferHeadInfo_t *head_info, IEC104_BusinessPriority_t priority); /** @@ -700,7 +700,7 @@ IEC104_SendManagerResult_t IEC104_SendManager_Submit_Idle_Priority( */ IEC104_SendManagerResult_t IEC104_SendManager_Submit_Response_Priority( IEC104_SendManager_t *manager, uint64_t connection_generation, - const uint8_t *asdu, uint16_t asdu_length, uint64_t now_ms, + const uint8_t *asdu, uint16_t asdu_length, uint32_t now_ms, IEC104_SendBufferHeadInfo_t *head_info, IEC104_BusinessPriority_t priority); /** @@ -721,7 +721,7 @@ IEC104_SendManagerResult_t IEC104_SendManager_Submit_Response_Priority( */ IEC104_SendManagerResult_t IEC104_SendManager_Submit_Response_Tracked_Priority( IEC104_SendManager_t *manager, uint64_t connection_generation, - const uint8_t *asdu, uint16_t asdu_length, uint64_t now_ms, + const uint8_t *asdu, uint16_t asdu_length, uint32_t now_ms, IEC104_SendBufferHeadInfo_t *head_info, uint64_t *ticket, IEC104_BusinessPriority_t priority); diff --git a/App/iec60870/104/IEC104_TcpServer.c b/App/iec60870/104/IEC104_TcpServer.c index d0af59ff..b284b6a6 100644 --- a/App/iec60870/104/IEC104_TcpServer.c +++ b/App/iec60870/104/IEC104_TcpServer.c @@ -78,7 +78,8 @@ static void Priority_Continuation(IEC104_TcpServer_t *server); * QUEUED用代次和HIGH票据找帧,交接后固定frame_serial;不能只凭会回绕的APCI序号关联。 * active_state另记首次STOP/断开之前的确认结果,不随重新START恢复;两种观察共用首次ACK时刻。 */ typedef struct { - uint64_t generation, ticket, frame_serial, acked_at_ms; + uint64_t generation, ticket, frame_serial; + uint32_t acked_at_ms; IEC104_TcpAckState_t state; IEC104_TcpAckState_t active_state; } TcpAckWatch_t; @@ -114,8 +115,8 @@ struct IEC104_TcpServer { uint64_t saved_high_next_sequence; /* 队列Abort后保留HIGH下一票据,跨Close及槽复用不复用旧号。 */ uint64_t listen_token; /* 当前监听的注册身份,也标识本次Init。 */ uint64_t client_token; /* 当前客户端的注册身份,不能以socket数值代替。 */ - uint64_t accept_retry_at_ms; /* 仅now小于此期限时暂停接入;到期不依赖容量或额外解除动作。 */ - uint64_t send_retry_at_ms; /* 发送无进展后的重试期限;到期主动重试,不依赖新的可写边沿。 */ + uint32_t accept_retry_at_ms; /* 仅now小于此期限时暂停接入;到期不依赖容量或额外解除动作。 */ + uint32_t send_retry_at_ms; /* 发送无进展后的重试期限;到期主动重试,不依赖新的可写边沿。 */ uint32_t consecutive_accept_failures; /* 接入连续错误返回次数,饱和递增,OK/WOULD_BLOCK清零。 */ unsigned send_retry_count; /* 跨Process及快速应答累计连续OK+0/RETRY次数,达到预算后暂停。 */ unsigned event_budget; /* 本次推进剩余通知交付数;收尾交付不受预算限制。 */ @@ -218,7 +219,7 @@ static void Observe_Response_Handoff(void *context, uint64_t ticket, IEC104_Send * 返回值:无。 * 说明:只从SENT进入ACKED,首次时刻随后冻结;帧记录移除、重复累计ACK和普通断线均不覆盖它。 */ -static void Observe_Response_Ack(void *context, IEC104_SendFrameId_t frame_id, uint64_t now_ms) +static void Observe_Response_Ack(void *context, IEC104_SendFrameId_t frame_id, uint32_t now_ms) { IEC104_TcpServer_t *server = (IEC104_TcpServer_t *)context; size_t i; @@ -773,12 +774,13 @@ static int Read_Asdu_Queues_Status( * 功能:读取协议及接入/发送重试期限使用的单调毫秒时刻。 * 输入参数:无。 * 输出参数:无。 - * 返回值:Net后端提供的单调毫秒值,不是日历时间。 - * 说明:所有Connection时间参数使用同一时间源,修改系统日期不改变计时基准。 + * 返回值:Net后端提供的单调毫秒值截断到32位tick,不是日历时间。 + * 说明:所有Connection时间参数使用同一时间源,修改系统日期不改变计时基准; + * 截断后由各比较点的有符号差值判据吸收49.7天回绕。 */ -static uint64_t Now_Ms(void) +static uint32_t Now_Ms(void) { - return IEC104_Net_Now_Ms(); + return (uint32_t)IEC104_Net_Now_Ms(); } /** @@ -789,9 +791,9 @@ static uint64_t Now_Ms(void) * 返回值:返回now_ms < server->accept_retry_at_ms的结果。 * 说明:now等于期限即已到期。 */ -static int Accept_Retry_Paused(const IEC104_TcpServer_t *server, uint64_t now_ms) +static int Accept_Retry_Paused(const IEC104_TcpServer_t *server, uint32_t now_ms) { - return now_ms < server->accept_retry_at_ms; + return (int32_t)(now_ms - server->accept_retry_at_ms) < 0; } /** @@ -804,6 +806,8 @@ static int Accept_Retry_Paused(const IEC104_TcpServer_t *server, uint64_t now_ms static void Pause_Accept(IEC104_TcpServer_t *server) { server->accept_retry_at_ms = Now_Ms() + TCP_ACCEPT_RETRY_DELAY_MS; + /* 0是未暂停哨兵,回绕到0会被误判,抬到1ms表示立即到期。 */ + if (server->accept_retry_at_ms == 0U) { server->accept_retry_at_ms = 1U; } server->accept_pending = 1U; } @@ -815,9 +819,9 @@ static void Pause_Accept(IEC104_TcpServer_t *server) * 返回值:返回now_ms < server->send_retry_at_ms的结果。 * 说明:等于期限即允许重试,不能用就绪提示提前解除暂停。 */ -static int Send_Retry_Paused(const IEC104_TcpServer_t *server, uint64_t now_ms) +static int Send_Retry_Paused(const IEC104_TcpServer_t *server, uint32_t now_ms) { - return now_ms < server->send_retry_at_ms; + return (int32_t)(now_ms - server->send_retry_at_ms) < 0; } /** @@ -845,6 +849,8 @@ static void Schedule_Send_Retry(IEC104_TcpServer_t *server) if (++server->send_retry_count >= TCP_SEND_RETRY_BUDGET) { server->send_retry_count = 0U; server->send_retry_at_ms = Now_Ms() + TCP_SEND_RETRY_DELAY_MS; + /* 0是未暂停哨兵,回绕到0会被误判,抬到1ms表示立即到期。 */ + if (server->send_retry_at_ms == 0U) { server->send_retry_at_ms = 1U; } } else { server->process_pending = 1U; } @@ -1710,7 +1716,7 @@ static IEC104_TcpResult_t Accept_Clients(IEC104_TcpServer_t *server, IEC104_TcpE * 启动门禁中的NORMAL积压不算可推进工作;Enqueue不为它置续跑,Release成功时再唤醒一次。 * 纯协议期限另由Prepare_Events合并,不能把本函数返回0理解为可以无限等待。 */ -static int Has_Local_Work(const IEC104_TcpServer_t *server, uint64_t now_ms) +static int Has_Local_Work(const IEC104_TcpServer_t *server, uint32_t now_ms) { return server->process_pending != 0U || (server->client_socket != IEC104_NET_INVALID_SOCKET && server->send_retry_at_ms != 0U && @@ -1761,7 +1767,7 @@ static IEC104_TcpResult_t Prepare_Events( { IEC104_TcpWaitInfo_t snapshot; uint32_t client_interest = 0U; - uint64_t now_ms; + uint32_t now_ms; int accept_paused; int send_paused; if (server->queue_initialized == 0U) { @@ -1955,7 +1961,7 @@ static IEC104_TcpResult_t Wait_For_Events( IEC104_TcpReady_t *ready, IEC104_TcpError_t *error) { uint32_t index, interest = 0U, ready_events = 0U, wait_ms = max_wait_ms; - uint64_t wait_started = Now_Ms(); + uint32_t wait_started = Now_Ms(); IEC104_NetResult_t waited; int socket_error; memset(ready, 0, sizeof(*ready)); @@ -3024,7 +3030,7 @@ static IEC104_TcpAckState_t Get_Ack_State(const IEC104_TcpServer_t *server, if (watch->ticket == ticket && watch->generation == generation) { IEC104_TcpAckState_t state = active_only ? watch->active_state : watch->state; if (state == IEC104_TCP_ACK_ACKED && acked_at_ms != NULL) { - *acked_at_ms = watch->acked_at_ms; + *acked_at_ms = (uint64_t)watch->acked_at_ms; } return state; } @@ -3262,7 +3268,7 @@ IEC104_TcpResult_t IEC104_TcpServer_Get_Status( const IEC104_TcpServer_t *server, IEC104_TcpServerStatus_t *status, IEC104_TcpError_t *error) { IEC104_TcpServerStatus_t snapshot; - uint64_t now_ms; + uint32_t now_ms; IEC104_TcpResult_t result = Check_Server(server, error); if (result != IEC104_TCP_OK) { return result; diff --git a/App/iec60870/104/IEC104_TcpServer_Config.h b/App/iec60870/104/IEC104_TcpServer_Config.h index 7f0313b5..9cb79fd9 100644 --- a/App/iec60870/104/IEC104_TcpServer_Config.h +++ b/App/iec60870/104/IEC104_TcpServer_Config.h @@ -28,7 +28,8 @@ /* 独立SOE区按事件计数;单对象Type30/31每条固定26字节,另按发送记录槽数预留退休身份。 */ #define IEC104_TCP_SOE_CAPACITY 128U #ifndef IEC104_TCP_CONTROL_CAPACITY -#define IEC104_TCP_CONTROL_CAPACITY 8U /* 槽数:待发及正在发送的S/U帧,不占用业务I帧记录槽。 */ +#define IEC104_TCP_CONTROL_CAPACITY 4U /* 槽数:待发及正在发送的S/U帧,不占用业务I帧记录槽。 + 单连接子站S/U FIFO实际深度个位数;8是通用多连接库默认值,板端4足够。 */ #endif #ifndef IEC104_TCP_RECORD_CAPACITY #define IEC104_TCP_RECORD_CAPACITY 32U /* 槽数:未转为事件的I帧记录,含待ACK及已ACK待转移记录。 */ diff --git a/App/iec60870/104/IEC104_TcpTypes.h b/App/iec60870/104/IEC104_TcpTypes.h index 3d66fd11..2eca2b28 100644 --- a/App/iec60870/104/IEC104_TcpTypes.h +++ b/App/iec60870/104/IEC104_TcpTypes.h @@ -219,8 +219,8 @@ typedef struct { * priority可为仅用于记录的IDLE;它位于两级队列COUNT之外,应用不能据此索引队列数组。 */ typedef struct { uint64_t frame_serial; /* 本会话内的发送帧编号,与会回绕的协议N(S)不同。 */ - uint64_t queued_at_ms; /* 准备I帧时的单调毫秒值,并非业务入队时刻。 */ - uint64_t written_at_ms; /* local_send_completed为1时有效,允许0。 */ + uint32_t queued_at_ms; /* 准备I帧时的单调毫秒值,并非业务入队时刻。 */ + uint32_t written_at_ms; /* local_send_completed为1时有效,允许0。 */ uint16_t send_number; /* 原I帧发送时使用的N(S)。 */ uint16_t receive_number; /* 原I帧捎带的N(R),不是查询时刻的最新接收位置。 */ uint16_t apdu_length; /* 原I帧总长度,包含APCI。 */ diff --git a/IEC60870-Slave/test/iec104_idle_transport_test.c b/IEC60870-Slave/test/iec104_idle_transport_test.c index b60144fb..f1454aa3 100644 --- a/IEC60870-Slave/test/iec104_idle_transport_test.c +++ b/IEC60870-Slave/test/iec104_idle_transport_test.c @@ -93,7 +93,7 @@ static void retained(const uint8_t *bytes, size_t length) CHECK(IEC104_Receiver_Feed(&sut->connection.receiver, sut->generation, bytes, length, &consumed) == IEC104_RECEIVER_FRAME_READY); CHECK(consumed == length); - sut->connection.received_at_ms = fake.now; + sut->connection.received_at_ms = (uint32_t)fake.now; ++sut->connection.receive_serial; } diff --git a/docs/内存管理/RAM使用分析与优化方案.md b/docs/内存管理/RAM使用分析与优化方案.md index 8ff51e10..91669bd6 100644 --- a/docs/内存管理/RAM使用分析与优化方案.md +++ b/docs/内存管理/RAM使用分析与优化方案.md @@ -47,10 +47,10 @@ dhara 失败类 +84;RO 另 +208,全是该失败类名表)→ `ER_IROM1` | 区域 | 用量 | 容量 | 占比 | |---|---|---|---| -| ER_IROM1 | 414,232 B (404.52 KB) | 1,048,576 B (1024 KB) | 39.5% | -| RW_IRAM1 | 118,416 B (115.64 KB) | 131,072 B (128 KB) | 90.3% | +| ER_IROM1 | 413,416 B (403.73 KB) | 1,048,576 B (1024 KB) | 39.4% | +| RW_IRAM1 | 118,120 B (115.35 KB) | 131,072 B (128 KB) | 90.1% | | RW_CCM | 57,376 B (56.03 KB) | 65,280 B (64 KB) | 87.9% | -| **Flash (ROM 合计)** | **416,968 B (407.2 KB)** | 1,048,576 B (1024 KB) | **39.8%** | +| **Flash (ROM 合计)** | **416,152 B (406.4 KB)** | 1,048,576 B (1024 KB) | **39.7%** | 各区的容量与常量来源: diff --git a/docs/内存管理/RAM预算台账.md b/docs/内存管理/RAM预算台账.md index 61ae3f85..21385ca6 100644 --- a/docs/内存管理/RAM预算台账.md +++ b/docs/内存管理/RAM预算台账.md @@ -15,10 +15,10 @@ | 区域 | 用量 | 容量 | 占比 | 门禁(≤92%) | |---|---|---|---|---| -| ER_IROM1 (Flash) | 414,232 B | 1,048,576 B | 39.5% | 参考 | +| ER_IROM1 (Flash) | 413,416 B | 1,048,576 B | 39.4% | 参考 | | RW_CCM | 57,376 B | 65,280 B | 87.9% | PASS | | UNINIT_CCM | 48 B | 256 B | 18.8% | 参考 | -| RW_IRAM1 | 118,416 B | 131,072 B | 90.3% | PASS | +| RW_IRAM1 | 118,120 B | 131,072 B | 90.1% | PASS | | 子系统(静态 RW+ZI;除 RTOS 堆在 CCM 外均在 SRAM1) | 现值 | 配额 | 状态 | |---|---|---|---| @@ -26,7 +26,7 @@ | 存储 | 9,144 B | 12 KB | OK | | UI | 36,791 B | 16 KB | ⚠ 超 19.9 KB | | RTOS 堆 | 57,376 B | 56 KB | 堆=配额 | -| 应用 | 47,699 B | 8 KB | ⚠ 超 38.6 KB | +| 应用 | 47,403 B | 8 KB | ⚠ 超 38.3 KB | | 其它 | 10,797 B | — | 参考 | diff --git a/scripts/ram_baseline.tsv b/scripts/ram_baseline.tsv index b5135757..be4c0ee0 100644 --- a/scripts/ram_baseline.tsv +++ b/scripts/ram_baseline.tsv @@ -24,3 +24,4 @@ date code ro rw zi er_irom1 er_pct iram1 iram1_pct ccm ccm_pct top_rwzi 2026-11-13 256592 32036 2088 152584 288628 27.5 97248 74.2 57376 87.9 heap_4.o=57376;lv_mem_core_builtin.o=16384;nand_ftl.o=8288;lftpd.o=7884;ui_net_sink.o=6802;ui_port.o=6432;wave_ring.o=5332;sb_link.o=4376;ch395f.o=4162;console_log.o=4132 2026-11-15 256592 32036 2088 152584 288628 27.5 97248 74.2 57376 87.9 heap_4.o=57376;lv_mem_core_builtin.o=16384;nand_ftl.o=8288;lftpd.o=7884;ui_net_sink.o=6802;ui_port.o=6432;wave_ring.o=5332;sb_link.o=4376;ch395f.o=4162;console_log.o=4132 2026-11-18 365896 48336 2736 173104 414232 39.5 118416 90.3 57376 87.9 heap_4.o=57376;lv_mem_core_builtin.o=16384;nand_ftl.o=8288;lftpd.o=7884;iec104_tcpserver.o=7656;ui_net_sink.o=6802;ui_port.o=6432;iec104_source.o=5944;wave_ring.o=5332;sb_link.o=4376 +2026-11-19 365080 48336 2736 172808 413416 39.4 118120 90.1 57376 87.9 heap_4.o=57376;lv_mem_core_builtin.o=16384;nand_ftl.o=8288;lftpd.o=7884;iec104_tcpserver.o=7360;ui_net_sink.o=6802;ui_port.o=6432;iec104_source.o=5944;wave_ring.o=5332;sb_link.o=4376 From ed25fc5a4d223f6b1ee98f8a42452ec0b29487e4 Mon Sep 17 00:00:00 2001 From: Wanderingss <1624155937@qq.com> Date: Thu, 19 Nov 2026 12:51:45 +0800 Subject: [PATCH 3/5] =?UTF-8?q?perf(iec104):=20=E5=88=A0=E6=AD=BB=E4=BB=BF?= =?UTF-8?q?=E7=9C=9F=E6=95=B0=E7=BB=84=E5=B9=B6=E6=8C=89=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=88=86=E8=A1=A8=E5=AD=98=E5=8F=98=E5=8C=96=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E5=9F=BA=E7=BA=BF=EF=BC=8C=E7=9C=81=20816=20B=20RAM?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 104 的内存大头不在协议栈本身,而在两处「每层各留一份、且按最宽类型统一 存储」的静态数组。本次按实测逐项瘦身,行为等价有证: 一、iec104_source.c 删掉 5 个无写者的模拟注入数组(ZI -288 B) singles / single_set / doubles / measurements / measurement_set 的唯一 写入点是 init() 的 memset,全仓无 setter、无导出写 API、simulator 与 test 也无人写。故 single_set/measurement_set 恒 0 使对应 if 分支永假、 doubles 恒 0 使 type3 分支恒返回零值+NO_SOURCE_QUALITY。 保留 steps/bits:iec104_source_find() 用它们响应 IOA 0x1201..0x1208 与 0x1301..0x1308,删掉会把「返回 0+品质」变成「未知地址」,属协议行为变化。 实测 ZI 5912 -> 5624,比数组名义总和 284 多 4 B,因两处 2 字节对齐空隙 一并消失。 二、iec104_core.c 变化检测基线按点类型分表(ZI -528 B) 原 core_previous_t previous[105] 每点 8 字节(uint32 value + quality + bool,对齐补到 8),840 B。改为按点表顺序分三段:单点 u8 x59、双点 u8 x16、测量值 u32 x30,品质按原索引逐点存,initialized 改位图 14 B。 测量值仍按 32 位位模式比较,不是浮点比较,NaN/-0 判等语义不变。 加两道防护:编译期断言「SP+DP+ME == 105 且段边界为 0/59/75」;启动期 逐点校验 type_id 必须依次为 1/3/13,错序即启动失败——否则会静默把一种 类型的值当另一种比较。校验在每次 core_start 跑 105 次,刻意不缓存成 静态标志:重连后点表若被改坏,这一次就是唯一防线。 等价性证据(独立审查员复算,非自述): iec104_source_point() 225 点全表 x 回调三态 x 边界 4089 条轨迹逐字节一致; 变化检测 133,560 次判定/读回零差异;4 个位置的变异体各自红在埋点行, 证明这几条判据不是恒真摆设;去掉启动校验后乱序点表在主机用例里静默通过。 实测(权威构建,同一台机器前后对比): RW_IRAM1 118,120 -> 117,304 B(-816,90.1% -> 89.5%) ER_IROM1 413,416 -> 413,392 B(-24) iec104_source.o ZI 5912 -> 5624;iec104_core.o ZI 3192 -> 2664 s_core 2928 -> 2400 B 顺带把 App/task/iec104_serv.c 两处写死的源码行号改为「文件路径+函数名」 锚点,重构后不会漂移。 --- App/iec60870/104/iec104_core.c | 75 +++++++++++++++++++++----- App/iec60870/104/iec104_source.c | 26 +++++---- App/task/iec104_serv.c | 9 ++-- docs/内存管理/RAM使用分析与优化方案.md | 6 +-- docs/内存管理/RAM预算台账.md | 6 +-- scripts/ram_baseline.tsv | 2 +- scripts/size_attestation.json | 22 ++++---- 7 files changed, 97 insertions(+), 49 deletions(-) diff --git a/App/iec60870/104/iec104_core.c b/App/iec60870/104/iec104_core.c index ba4ce430..e9805cf1 100644 --- a/App/iec60870/104/iec104_core.c +++ b/App/iec60870/104/iec104_core.c @@ -18,12 +18,15 @@ #define CORE_FEEDBACK_CAPACITY 8U #define CORE_SCAN_CAPACITY 30U #define CORE_MONITOR_CAPACITY 105U - -typedef struct { - uint32_t value; - uint8_t quality; - bool initialized; -} core_previous_t; +/* 监视点索引段:0..58 单点、59..74 双点、75..104 测量值,与 iec104_source_point() + * 的点表顺序绑定(SP59 + DP16 + ME30 = 105)。段边界改点表后必须同步。 */ +#define CORE_SINGLE_FIRST 0U +#define CORE_DOUBLE_FIRST IEC104_DTU_SP_COUNT +#define CORE_MEASURE_FIRST (CORE_DOUBLE_FIRST + IEC104_DTU_DP_COUNT) +_Static_assert(IEC104_DTU_SP_COUNT + IEC104_DTU_DP_COUNT + IEC104_DTU_ME_COUNT == CORE_MONITOR_CAPACITY, + "Monitor capacity must equal the SP+DP+ME point-count sum"); +_Static_assert(CORE_SINGLE_FIRST == 0U && CORE_DOUBLE_FIRST == 59U && CORE_MEASURE_FIRST == 75U, + "Previous-value segment boundaries must stay 0/59/75"); typedef struct { IEC104_Interrogation_t *module; @@ -53,7 +56,16 @@ typedef struct { IEC104_Spontaneous_t *spontaneous; IEC104_SpontaneousChange_t change; IEC104_SpontaneousPublishInfo_t publication; - core_previous_t previous[CORE_MONITOR_CAPACITY]; + /* 变化检测基线按三角色分表存放:单点/双点 1 字节、测量值 4 字节位模式, + * 比统一 8 字节结构省 528B(sizeof(core_t) 2928 -> 2400)。分解:基线块 + * 840 -> 316(314 载荷 + sample_cursor 的 4 字节对齐填充)省 524,且 + * sample_cursor 偏移由 4(mod 8) 变 0(mod 8)、尾段少 4 字节填充,合计 528。 + * 位图代替每个元素的 bool。 */ + uint8_t prev_single[IEC104_DTU_SP_COUNT]; + uint8_t prev_double[IEC104_DTU_DP_COUNT]; + uint32_t prev_measure[IEC104_DTU_ME_COUNT]; + uint8_t prev_quality[CORE_MONITOR_CAPACITY]; + uint8_t prev_initialized[(CORE_MONITOR_CAPACITY + 7U) / 8U]; size_t sample_cursor; iec104_source_stats_t source_stats; IEC60870_CP56Time2a_t sample_time; @@ -416,6 +428,28 @@ static bool startup_step(void) return IEC104_Startup_Process(&s_core.startup, s_core.slave, s_core.system, &s_core.system_status); } +/* 函数功能:读取变化检测基线的值(按三段索引,测量值保留 32 位位模式)。 */ +static uint32_t previous_value(size_t cursor) +{ + if (cursor < CORE_DOUBLE_FIRST) { return s_core.prev_single[cursor]; } + if (cursor < CORE_MEASURE_FIRST) { return s_core.prev_double[cursor - CORE_DOUBLE_FIRST]; } + return s_core.prev_measure[cursor - CORE_MEASURE_FIRST]; +} + +/* 函数功能:写回变化检测基线的值;单点/双点只有 1 字节语义。 */ +static void previous_store(size_t cursor, uint32_t value) +{ + if (cursor < CORE_DOUBLE_FIRST) { s_core.prev_single[cursor] = (uint8_t)value; } + else if (cursor < CORE_MEASURE_FIRST) { s_core.prev_double[cursor - CORE_DOUBLE_FIRST] = (uint8_t)value; } + else { s_core.prev_measure[cursor - CORE_MEASURE_FIRST] = value; } +} + +/* 函数功能:查询某点是否已建立基线(位图,未初始化时不发首次变位)。 */ +static bool previous_initialized(size_t cursor) +{ + return (s_core.prev_initialized[cursor >> 3] & (uint8_t)(1U << (cursor & 7U))) != 0U; +} + /* Re-read current snapshots after backpressure; never consume source events. */ /* 函数功能:有界读取当前快照并将变化交给成熟突发引擎。 */ static bool collect_changes(void) @@ -426,10 +460,10 @@ static bool collect_changes(void) if (!IEC104_Spontaneous_Set_Time_Base(s_core.spontaneous, iec104_source_clock_ms(now), now, s_core.source_stats.synchronized)) { return false; } for (row = 0U; row < CORE_DATA_BUDGET; ++row) { + const size_t cursor = s_core.sample_cursor; uint32_t value = 0U; uint8_t quality; - core_previous_t *previous = &s_core.previous[s_core.sample_cursor]; - if (!iec104_source_point(s_core.sample_cursor, &s_core.object)) { return false; } + if (!iec104_source_point(cursor, &s_core.object)) { return false; } memset(&s_core.change, 0, sizeof(s_core.change)); s_core.change.common_address = s_core.ca; s_core.change.ioa = s_core.object.object.ioa; @@ -449,6 +483,7 @@ static bool collect_changes(void) s_core.change.value.double_point = (uint8_t)value; break; case 13U: + /* 位模式比较:不是浮点比较,NaN/-0 的判等语义必须原样保留。 */ memcpy(&value, &s_core.object.measurement.value, sizeof(value)); quality = s_core.object.measurement.quality; s_core.change.kind = IEC104_SPONTANEOUS_FLOAT; @@ -457,15 +492,16 @@ static bool collect_changes(void) default: return false; } s_core.change.quality = quality; - if (previous->initialized && (previous->value != value || previous->quality != quality)) { + if (previous_initialized(cursor) && + (previous_value(cursor) != value || s_core.prev_quality[cursor] != quality)) { IEC104_SpontaneousPublishResult_t result = IEC104_Spontaneous_Publish(s_core.spontaneous, &s_core.change, 1U, &s_core.publication); if (result == IEC104_SPONTANEOUS_PUBLISH_WAIT) { return true; } if (result != IEC104_SPONTANEOUS_PUBLISH_OK) { return false; } } - previous->value = value; - previous->quality = quality; - previous->initialized = true; + previous_store(cursor, value); + s_core.prev_quality[cursor] = quality; + s_core.prev_initialized[cursor >> 3] |= (uint8_t)(1U << (cursor & 7U)); ++s_core.sample_cursor; if (s_core.sample_cursor == CORE_MONITOR_CAPACITY) { s_core.sample_cursor = 0U; } } @@ -571,6 +607,19 @@ static int initialize_core(const iec104_core_config_t *config) memset(&s_core, 0, sizeof(s_core)); s_core.ca = config->common_address; iec104_source_init(); + /* 点表顺序被改动后这里必须同步,宁可启动失败也不能静默发错变位: + * 变化检测基线按 0..58 单点 / 59..74 双点 / 75..104 测量值分三张表存放, + * 段边界一旦和点表顺序错位,就会把一种类型的值当成另一种比较。 + * 时机:每次 iec104_core_start 成功都会跑一次(网络代次变化 / poll 服务级 + * 失败都会 stop→start,不是开机一次),代价是每次重连多 105 次 + * iec104_source_point() 调用。刻意不缓存成静态标志:重连后点表若已被改坏, + * 这一次校验就是唯一防线。 */ + for (i = 0U; i < CORE_MONITOR_CAPACITY; ++i) { + uint8_t expected = i < CORE_DOUBLE_FIRST ? 1U : (i < CORE_MEASURE_FIRST ? 3U : 13U); + if (!iec104_source_point(i, &s_core.object) || s_core.object.object.type_id != expected) { + return fail(); + } + } s_core.slave = IEC104_Slave_Create(); if (s_core.slave == NULL) { return fail(); } s_core.status.owns_resources = 1U; diff --git a/App/iec60870/104/iec104_source.c b/App/iec60870/104/iec104_source.c index 257bd7a4..6d9ca1ef 100644 --- a/App/iec60870/104/iec104_source.c +++ b/App/iec60870/104/iec104_source.c @@ -27,12 +27,12 @@ static IEC104_RemoteParameterRequest_t owner; static bool stage_active, stage_complete; static iec104_source_bindings_t bindings; static iec104_source_stats_t stats; -static uint8_t singles[IEC104_DTU_SP_COUNT], single_set[IEC104_DTU_SP_COUNT]; -static uint8_t doubles[IEC104_DTU_DP_COUNT]; +/* 模拟注入通道已删除:单点/双点/测量值三张置位表与值表既无写者也无导出写 API, + * 读出恒为“零值 + 无效品质”,直接由常量取代,不再占 RAM。 + * 仅保留仍被 iec104_source_find() 读取的 steps/bits(IOA 0x1201..0x1208 与 + * 0x1301..0x1308 的返回信息),删掉会把“返回 0 + 品质”变成“未知地址”。 */ static int8_t steps[8]; static uint32_t bits[8]; -static float measurements[IEC104_DTU_ME_COUNT]; -static uint8_t measurement_set[IEC104_DTU_ME_COUNT]; /* 标准参数点表按 (CA,IOA) 升序借用给 IEC104_Parameter 模块。 * 只有 common_address 是运行期值(同实例同一CA),故只在这里保留20行实测可知: * 整表仍是 RAM,但用 4 字节索引函数代替 120 行逐字段赋值,代码与 Flash 均更省。 */ @@ -184,10 +184,7 @@ void iec104_source_init(void) { size_t i, a, g, m; iec104_dtu_parameter_t p; uint32_t raw; memset(&bindings, 0, sizeof(bindings)); memset(&stats, 0, sizeof(stats)); - memset(singles, 0, sizeof(singles)); - memset(single_set, 0, sizeof(single_set)); memset(doubles, 0, sizeof(doubles)); memset(steps, 0, sizeof(steps)); memset(bits, 0, sizeof(bits)); - memset(measurements, 0, sizeof(measurements)); memset(measurement_set, 0, sizeof(measurement_set)); clear_stage(); clock_utc = UINT64_C(946684800000); clock_mono = 0U; #ifndef IEC104_SOURCE_NO_VALUE_STORE memset(values, 0, sizeof(values)); @@ -228,18 +225,15 @@ bool iec104_source_point(size_t index, iec104_source_object_t *out) if (bindings.signal != NULL && !bindings.signal(bindings.context, p.source_addr, &v, &q)) { v = 0U; q = NO_SOURCE_QUALITY; } - if (single_set[index]) { v = singles[index]; q = SIM_QUALITY; } return IEC60870_SinglePointInformation_Create(&out->single, p.ioa, v, q) == IEC60870_ASDU_OK; } if (p.type == 3U) { - n = index - 59U; v = doubles[n]; q = v == 0U ? NO_SOURCE_QUALITY : SIM_QUALITY; + v = 0U; q = NO_SOURCE_QUALITY; return IEC60870_DoublePointInformation_Create(&out->double_point, p.ioa, v, q) == IEC60870_ASDU_OK; } - n = index - 75U; if (bindings.measurement != NULL && !bindings.measurement(bindings.context, p.source_addr, &f, &q)) { f = 0.0f; q = NO_SOURCE_QUALITY; } - if (measurement_set[n]) { f = measurements[n]; q = SIM_QUALITY; } return IEC60870_MeasuredValueShort_Create(&out->measurement, p.ioa, f, q) == IEC60870_ASDU_OK; } n = index - 105U; @@ -370,9 +364,13 @@ const IEC104_CommandPoint_t *iec104_source_commands(uint16_t ca, size_t *count) * 回 IEC104_COMMAND_ACTION_NOT_STARTED:vendor 据此回否定确认(COT 7 + P/N=1) * 并结束事务,既不产生返回信息也不排 ACT_TERM,与割接前"除 YK11/YK12 外一律否定 * 确认"的对外行为对齐。 - * 恢复真实出口时:把有出口的分支改成调用对应驱动并返回 STARTED 即可,模拟状态数组 - * (singles/doubles/steps/measurements/bits)保留未删可直接复用;当前无人置位, - * 它们的读出恒为"零值 + IV/SB"。 */ + * 恢复真实出口时:把有出口的分支改成调用对应驱动并返回 STARTED 即可;模拟注入通道 + * 已随"无写者"核实删除(iec104_source.o 的 ZI 5912 -> 5624,省 288B;比数组 + * 名义总和 284B 多 4B,因为两处 2 字节对齐空隙一并消失:doubles 之后到 bits、 + * measurement_set 之后到 standard_points 各 2B),故恢复出口须重新引入所需状态表。 + * 仅保留仍被 iec104_source_find() 读取的 steps/bits(IOA 0x1201..0x1208 与 + * 0x1301..0x1308 的返回信息),其余注入通道已删除;当前无人置位, + * steps/bits 的读出恒为"零值 + IV/SB"。 */ IEC104_CommandActionResult_t iec104_source_command(void *context, const IEC104_CommandRequest_t *r) { (void)context; (void)r; diff --git a/App/task/iec104_serv.c b/App/task/iec104_serv.c index e32dab44..269f520f 100644 --- a/App/task/iec104_serv.c +++ b/App/task/iec104_serv.c @@ -137,9 +137,10 @@ static bool s_measure(void *ctx, uint16_t source_addr, float *value, uint8_t *qu * 入口参数:ctx / source_addr / v / q(同 s_measure) * 返回值:恒 false * 限定条件:无 - * 函数说明:docs/硬件平台/开入开出实施说明.md:28 明确"104 遥信点表未接开入、 - * 继电器动作语义未定义"。板端 8 路开入是 bit0=A..bit7=H 的无语义电平, - * 点表 59 个遥信 source_addr 是 0x9146/... 具体业务点。硬接 = 编造。 + * 函数说明:docs/硬件平台/开入开出实施说明.md 的「1.2 现在能不能用」一节明确 + * "104 遥信点表未接开入、继电器动作语义未定义"。板端 8 路开入是 + * bit0=A..bit7=H 的无语义电平,点表 59 个遥信 source_addr 是 0x9146/... + * 具体业务点。硬接 = 编造。 * 将来 Lead/用户给出对照表后,只在本函数查一张 static const 映射表 * (读 ioboard_di_snap_lookup() + ioboard_di_snap_read()),函数签名与 * bind 流程均不用改;详见 ci-artifacts/iec104-cutover/source-bind-plan.md §3.3。 */ @@ -155,7 +156,7 @@ static bool s_signal(void *ctx, uint16_t source_addr, uint8_t *value, uint8_t *q * 限定条件:仅 netTask,在 iec104_core_start() 成功分支、首次 poll 之前 * 函数说明:**为什么不能在系统初始化时绑一次就完事**—— * iec104_source_init() 的首条语句就是 memset(&bindings, 0, ...),而它唯一的 - * 产品侧调用点在 iec104_core.c:573 initialize_core(),由 iec104_core_start() + * 产品侧调用点是 iec104_core.c 的 initialize_core(),由 iec104_core_start() * 每次 start 触发(网络代次变化 / poll 服务级失败都会 stop→start)。 * 若只在开机时绑一次,第一次重连后 bindings 被清零且再无人重绑, * 主站又退回"0 + IV"且无任何日志——这是下一个接手人最容易踩的坑。 diff --git a/docs/内存管理/RAM使用分析与优化方案.md b/docs/内存管理/RAM使用分析与优化方案.md index 91669bd6..7b9cd196 100644 --- a/docs/内存管理/RAM使用分析与优化方案.md +++ b/docs/内存管理/RAM使用分析与优化方案.md @@ -47,10 +47,10 @@ dhara 失败类 +84;RO 另 +208,全是该失败类名表)→ `ER_IROM1` | 区域 | 用量 | 容量 | 占比 | |---|---|---|---| -| ER_IROM1 | 413,416 B (403.73 KB) | 1,048,576 B (1024 KB) | 39.4% | -| RW_IRAM1 | 118,120 B (115.35 KB) | 131,072 B (128 KB) | 90.1% | +| ER_IROM1 | 413,392 B (403.70 KB) | 1,048,576 B (1024 KB) | 39.4% | +| RW_IRAM1 | 117,304 B (114.55 KB) | 131,072 B (128 KB) | 89.5% | | RW_CCM | 57,376 B (56.03 KB) | 65,280 B (64 KB) | 87.9% | -| **Flash (ROM 合计)** | **416,152 B (406.4 KB)** | 1,048,576 B (1024 KB) | **39.7%** | +| **Flash (ROM 合计)** | **416,128 B (406.4 KB)** | 1,048,576 B (1024 KB) | **39.7%** | 各区的容量与常量来源: diff --git a/docs/内存管理/RAM预算台账.md b/docs/内存管理/RAM预算台账.md index 21385ca6..989acf5f 100644 --- a/docs/内存管理/RAM预算台账.md +++ b/docs/内存管理/RAM预算台账.md @@ -15,10 +15,10 @@ | 区域 | 用量 | 容量 | 占比 | 门禁(≤92%) | |---|---|---|---|---| -| ER_IROM1 (Flash) | 413,416 B | 1,048,576 B | 39.4% | 参考 | +| ER_IROM1 (Flash) | 413,392 B | 1,048,576 B | 39.4% | 参考 | | RW_CCM | 57,376 B | 65,280 B | 87.9% | PASS | | UNINIT_CCM | 48 B | 256 B | 18.8% | 参考 | -| RW_IRAM1 | 118,120 B | 131,072 B | 90.1% | PASS | +| RW_IRAM1 | 117,304 B | 131,072 B | 89.5% | PASS | | 子系统(静态 RW+ZI;除 RTOS 堆在 CCM 外均在 SRAM1) | 现值 | 配额 | 状态 | |---|---|---|---| @@ -26,7 +26,7 @@ | 存储 | 9,144 B | 12 KB | OK | | UI | 36,791 B | 16 KB | ⚠ 超 19.9 KB | | RTOS 堆 | 57,376 B | 56 KB | 堆=配额 | -| 应用 | 47,403 B | 8 KB | ⚠ 超 38.3 KB | +| 应用 | 46,587 B | 8 KB | ⚠ 超 37.5 KB | | 其它 | 10,797 B | — | 参考 | diff --git a/scripts/ram_baseline.tsv b/scripts/ram_baseline.tsv index be4c0ee0..07c22ab3 100644 --- a/scripts/ram_baseline.tsv +++ b/scripts/ram_baseline.tsv @@ -24,4 +24,4 @@ date code ro rw zi er_irom1 er_pct iram1 iram1_pct ccm ccm_pct top_rwzi 2026-11-13 256592 32036 2088 152584 288628 27.5 97248 74.2 57376 87.9 heap_4.o=57376;lv_mem_core_builtin.o=16384;nand_ftl.o=8288;lftpd.o=7884;ui_net_sink.o=6802;ui_port.o=6432;wave_ring.o=5332;sb_link.o=4376;ch395f.o=4162;console_log.o=4132 2026-11-15 256592 32036 2088 152584 288628 27.5 97248 74.2 57376 87.9 heap_4.o=57376;lv_mem_core_builtin.o=16384;nand_ftl.o=8288;lftpd.o=7884;ui_net_sink.o=6802;ui_port.o=6432;wave_ring.o=5332;sb_link.o=4376;ch395f.o=4162;console_log.o=4132 2026-11-18 365896 48336 2736 173104 414232 39.5 118416 90.3 57376 87.9 heap_4.o=57376;lv_mem_core_builtin.o=16384;nand_ftl.o=8288;lftpd.o=7884;iec104_tcpserver.o=7656;ui_net_sink.o=6802;ui_port.o=6432;iec104_source.o=5944;wave_ring.o=5332;sb_link.o=4376 -2026-11-19 365080 48336 2736 172808 413416 39.4 118120 90.1 57376 87.9 heap_4.o=57376;lv_mem_core_builtin.o=16384;nand_ftl.o=8288;lftpd.o=7884;iec104_tcpserver.o=7360;ui_net_sink.o=6802;ui_port.o=6432;iec104_source.o=5944;wave_ring.o=5332;sb_link.o=4376 +2026-11-19 365056 48336 2736 171992 413392 39.4 117304 89.5 57376 87.9 heap_4.o=57376;lv_mem_core_builtin.o=16384;nand_ftl.o=8288;lftpd.o=7884;iec104_tcpserver.o=7360;ui_net_sink.o=6802;ui_port.o=6432;iec104_source.o=5656;wave_ring.o=5332;sb_link.o=4376 diff --git a/scripts/size_attestation.json b/scripts/size_attestation.json index c3ae39e5..c61002cd 100644 --- a/scripts/size_attestation.json +++ b/scripts/size_attestation.json @@ -1,25 +1,25 @@ { - "built_at": "2026-11-18T22:22:18+08:00", - "fingerprint": "256d83d9b538cf07128939875d5be8c19b63937dbb183d69d3228d8dbcf2e5c9", - "fingerprint_files": 1564, + "built_at": "2026-11-19T12:39:05+08:00", + "fingerprint": "3cf7eb47ff97d4e8bca135c8bd81d0b47f6824b8bf42541108b0b0d3c9ade85a", + "fingerprint_files": 1563, "fingerprint_source": "git-index", "gated_regions": [ "RW_IRAM1", "RW_CCM" ], - "git_head": "be18b81e82ad300c9132ec48781eac40e7b42402", + "git_head": "f23d30111d3201cbccdef2b42866015e5fb10033", "map": "MDK-ARM/STM32F407-Demo/STM32F407-Demo.map", - "map_mtime": 1795011694, + "map_mtime": 1795062995, "pct": { - "ER_IROM1": 39.5, + "ER_IROM1": 39.42, "RW_CCM": 87.89, - "RW_IRAM1": 90.34, + "RW_IRAM1": 89.5, "UNINIT_CCM": 18.75 }, "regions": { "ER_IROM1": { "max": 1048576, - "size": 414232 + "size": 413392 }, "RW_CCM": { "max": 65280, @@ -27,7 +27,7 @@ }, "RW_IRAM1": { "max": 131072, - "size": 118416 + "size": 117304 }, "UNINIT_CCM": { "max": 256, @@ -37,10 +37,10 @@ "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": 365896, + "code": 365056, "ro_data": 48336, "rw_data": 2736, - "zi_data": 173104 + "zi_data": 171992 }, "threshold_pct": 92.0, "worktree_dirt_at_stamp": 0, From a40d52a116d28fc1c325e0804e5864cb0d5ac4b5 Mon Sep 17 00:00:00 2001 From: Wanderingss <1624155937@qq.com> Date: Thu, 19 Nov 2026 13:12:07 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix(iec104):=20=E4=B8=89=E4=B8=AA=20transpo?= =?UTF-8?q?rt=20=E5=A4=B9=E5=85=B7=E8=A1=A5=2032=20=E4=BD=8D=E6=97=B6?= =?UTF-8?q?=E5=88=BB=E8=BD=AC=E6=8D=A2=EF=BC=8C=E4=BF=AE=E5=A4=8D=20/WX=20?= =?UTF-8?q?=E4=B8=8B=E7=BC=96=E8=AF=91=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 上一提交把 104 的毫秒时刻从 uint64 收到 uint32(各 API 形参已是 uint32_t now_ms),夹具没同步:三个夹具在 MSVC /W3 /WX 下触发 C4244「从 uint64_t 转换到 uint32_t,可能丢失数据」,被 /WX 升级为 C2220 后整体 build failed。因这三个夹具只被手工/文档路径调用 (test/host/iec104_dtu/run_transport_test.py 与 vendor 快照自带的 build.ps1),pre-commit 与 CI 都不编译它们,所以红了整整两天没被发现。 修法:在 15 个调用点把实参写成 (uint32_t)fake.now,与上一提交在 iec104_idle_transport_test 第 96 行立下的 (uint32_t) 先例一致。 为什么不改夹具时钟的类型:fake.now 定义在 21 个 TU 共用的 iec104_tcp_fixture.h,其中 iec104_periodic_scan_test 用 fake.now = UINT64_MAX - N 构造 64 位回绕、iec104_spontaneous_test 用 fake.now = UINT64_MAX 取边界。改类型会破坏这些用例的语义;而产品侧 时钟源 IEC104_Net_Now_Ms() 本身仍是 uint64,窄化只该发生在形参边界。 值域安全性(非形式检查):三夹具里 fake.now 的所有赋值逐函数提取, 最坏上界 4,020,150 ms,余量约为 UINT32_MAX 的千分之一;三处 UINT64_MAX 命中分别作用于 ticket 与 next_frame_serial,与时刻无关。 另按参数位置审计了 60 个 TU 的 16 个 now_ms 调用点, 三个目标文件内 15 处即全部调用点,无宏、函数指针或条件分支旁路。 实测: run_transport_test.py 10/10 run_rc=0(修复前 3 条 build failed) 10 份 build.log 全部 warnings=0 errors=0 pre-commit 暂存口径通过 0 失败 改动仅限三个夹具的实参转换,无期望值、断言、控制流或注释改动。 --- IEC60870-Slave/test/iec104_idle_transport_test.c | 12 ++++++------ .../test/iec104_response_transport_test.c | 2 +- IEC60870-Slave/test/iec104_tcp_scheduler_test.c | 16 ++++++++-------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/IEC60870-Slave/test/iec104_idle_transport_test.c b/IEC60870-Slave/test/iec104_idle_transport_test.c index f1454aa3..e57f5c34 100644 --- a/IEC60870-Slave/test/iec104_idle_transport_test.c +++ b/IEC60870-Slave/test/iec104_idle_transport_test.c @@ -138,10 +138,10 @@ static void test_capacity_and_admission(void) CHECK(IEC104_TcpServer_Query_Idle_Send(sut, sut->generation, 0U) == IEC104_TCP_SUBMIT_WAIT); flush(); push_ack(2U); flush(); CHECK(IEC104_Connection_Begin_Receive_Batch(&sut->connection, sut->generation) == IEC104_CONNECTION_OK); - CHECK(IEC104_Connection_Can_Submit_Idle(&sut->connection, sut->generation, fake.now, 0U) == IEC104_CONNECTION_ERROR); + CHECK(IEC104_Connection_Can_Submit_Idle(&sut->connection, sut->generation, (uint32_t)fake.now, 0U) == IEC104_CONNECTION_ERROR); CHECK(IEC104_Connection_Submit_Idle(&sut->connection, sut->generation, asdu, sizeof(asdu), - 0U, fake.now, &head) == IEC104_CONNECTION_ERROR); - CHECK(IEC104_Connection_Tick(&sut->connection, sut->generation, fake.now) == IEC104_CONNECTION_OK); + 0U, (uint32_t)fake.now, &head) == IEC104_CONNECTION_ERROR); + CHECK(IEC104_Connection_Tick(&sut->connection, sut->generation, (uint32_t)fake.now) == IEC104_CONNECTION_OK); fake.now += sut->config.protocol.link.t3_ms; CHECK(IEC104_TcpServer_Query_Idle_Send(sut, sut->generation, 0U) == IEC104_TCP_SUBMIT_WAIT); CHECK(IEC104_TcpServer_Send_Idle(sut, sut->generation, asdu, sizeof(asdu), 0U) == IEC104_TCP_SUBMIT_WAIT); @@ -253,7 +253,7 @@ static void test_record_reserve_and_tail_notification(void) CHECK(IEC104_TcpServer_Send_Idle(sut, sut->generation, asdu, sizeof(asdu), IEC104_TCP_RECORD_CAPACITY - 1U) == IEC104_TCP_SUBMIT_OK); memset(&ack, 0, sizeof(ack)); ack.frame_type = IEC104_FRAME_TYPE_S; ack.receive_number = 1U; - CHECK(IEC104_SendManager_Handle_I_S_Frame(&sut->connection.send_manager, sut->generation, &ack, fake.now) == + CHECK(IEC104_SendManager_Handle_I_S_Frame(&sut->connection.send_manager, sut->generation, &ack, (uint32_t)fake.now) == IEC104_SEND_MANAGER_OK); CHECK(sut->connection.send_manager.idle_unacked_count == 0U && sut->connection.send_manager.record_count == 1U); CHECK(IEC104_TcpServer_Query_Idle_Send(sut, sut->generation, IEC104_TCP_RECORD_CAPACITY - 1U) == @@ -267,7 +267,7 @@ static void test_record_reserve_and_tail_notification(void) CHECK(IEC60870_Asdu_Create_From_Buffer(&object, IEC104_Slave_Get_Application_Layer_Parameters(slave), bytes, sizeof(bytes)) == IEC60870_ASDU_OK); CHECK(IEC104_Slave_Send_Idle(slave, &identity, &object, 1U) == IEC104_TCP_SUBMIT_OK); - CHECK(IEC104_SendManager_Handle_I_S_Frame(&sut->connection.send_manager, sut->generation, &ack, fake.now) == + CHECK(IEC104_SendManager_Handle_I_S_Frame(&sut->connection.send_manager, sut->generation, &ack, (uint32_t)fake.now) == IEC104_SEND_MANAGER_OK); CHECK(IEC104_Slave_Query_Idle_Send(slave, &identity, 1U) == IEC104_TCP_SUBMIT_OK); CHECK(IEC104_Slave_Send_Idle(slave, &identity, &object, 1U) == IEC104_TCP_SUBMIT_OK); @@ -343,7 +343,7 @@ static void test_retained_request_resume(void) gi[2] = (uint8_t)(count << 1); gi[3] = (uint8_t)(count >> 7); push(gi, sizeof(gi)); for (i = 0U; i < count + 16U && !sut->rx_event_pending; ++i) { poll_once(); } CHECK(sut->rx_event_pending != 0U && sut->connection.rx_link_applied != 0U); - CHECK(IEC104_Connection_Can_Submit_Idle(&sut->connection, sut->generation, fake.now, 1U) == + CHECK(IEC104_Connection_Can_Submit_Idle(&sut->connection, sut->generation, (uint32_t)fake.now, 1U) == IEC104_CONNECTION_WAIT); while (IEC104_Slave_NextEvent(slave, &event) == IEC104_TCP_EVENT_READY) {} CHECK(IEC104_Slave_Check_Request(slave, &identity) == IEC104_SLAVE_REQUEST_READY); diff --git a/IEC60870-Slave/test/iec104_response_transport_test.c b/IEC60870-Slave/test/iec104_response_transport_test.c index e1a22085..9d1477db 100644 --- a/IEC60870-Slave/test/iec104_response_transport_test.c +++ b/IEC60870-Slave/test/iec104_response_transport_test.c @@ -348,7 +348,7 @@ static void test_response_sustained_bidirectional_fairness(void) frame[4] = (uint8_t)(nr << 1); frame[5] = (uint8_t)(nr >> 7); CHECK(IEC104_Parse_APCI(frame, sizeof(frame), &ack) == 1); CHECK(IEC104_SendManager_Handle_I_S_Frame(&sut->connection.send_manager, - sut->generation, &ack, fake.now) == IEC104_SEND_MANAGER_OK); + sut->generation, &ack, (uint32_t)fake.now) == IEC104_SEND_MANAGER_OK); /* Model a fresh receive/record batch without flushing extra I frames. */ sut->event_budget = TCP_EVENT_BUDGET; sut->event_yield = 0U; diff --git a/IEC60870-Slave/test/iec104_tcp_scheduler_test.c b/IEC60870-Slave/test/iec104_tcp_scheduler_test.c index af020fd0..db91e500 100644 --- a/IEC60870-Slave/test/iec104_tcp_scheduler_test.c +++ b/IEC60870-Slave/test/iec104_tcp_scheduler_test.c @@ -533,7 +533,7 @@ static void check_testfr_wait_without_probe(void) { uint32_t wait_ms = 0; CHECK(IEC104_Connection_Get_Wait_Time(&sut->connection, sut->generation, - fake.now, 60000, &wait_ms) == IEC104_CONNECTION_OK); + (uint32_t)fake.now, 60000, &wait_ms) == IEC104_CONNECTION_OK); CHECK(wait_ms == 60000); CHECK(sut->connection.link_state.testfr_state == IEC104_TESTFR_IDLE); CHECK(!sut->connection.testfr_timer_active); @@ -746,23 +746,23 @@ static void test_peer_testfr_manager_contract(void) apci.u_function = IEC104_U_TESTFR_ACT; saved = sut->connection.link_state; CHECK(IEC104_SendManager_Handle_Testfr_Act(&sut->connection.send_manager, - sut->generation + 1U, &apci, fake.now) == IEC104_SEND_MANAGER_ERROR); + sut->generation + 1U, &apci, (uint32_t)fake.now) == IEC104_SEND_MANAGER_ERROR); CHECK(memcmp(&sut->connection.link_state, &saved, sizeof(saved)) == 0); apci.u_function = IEC104_U_TESTFR_CON; CHECK(IEC104_SendManager_Handle_Testfr_Act(&sut->connection.send_manager, - sut->generation, &apci, fake.now) == IEC104_SEND_MANAGER_ERROR); + sut->generation, &apci, (uint32_t)fake.now) == IEC104_SEND_MANAGER_ERROR); CHECK(memcmp(&sut->connection.link_state, &saved, sizeof(saved)) == 0); CHECK(sut->connection.send_buffer.control_count == 0); apci.u_function = IEC104_U_TESTFR_ACT; CHECK(IEC104_SendManager_Handle_Testfr_Act(&sut->connection.send_manager, - sut->generation, &apci, fake.now) == IEC104_SEND_MANAGER_QUEUED); + sut->generation, &apci, (uint32_t)fake.now) == IEC104_SEND_MANAGER_QUEUED); CHECK(sut->connection.link_state.peer_testfr_seen == 1); CHECK(IEC104_SendManager_Queue_Testfr_Act(&sut->connection.send_manager, - sut->generation, fake.now) == IEC104_SEND_MANAGER_WAIT); + sut->generation, (uint32_t)fake.now) == IEC104_SEND_MANAGER_WAIT); CHECK(IEC104_SendManager_Queue_T3_Testfr(&sut->connection.send_manager, - sut->generation, 40000, 20000, fake.now) == IEC104_SEND_MANAGER_WAIT); + sut->generation, 40000, 20000, (uint32_t)fake.now) == IEC104_SEND_MANAGER_WAIT); CHECK(IEC104_SendManager_Queue_T3_Testfr(&sut->connection.send_manager, - sut->generation, 40000, 0, fake.now) == IEC104_SEND_MANAGER_ERROR); + sut->generation, 40000, 0, (uint32_t)fake.now) == IEC104_SEND_MANAGER_ERROR); CHECK(sut->connection.send_buffer.control_count == 1); poll_once(); CHECK(fake.sent_bytes == sizeof(start_act) + sizeof(scheduler_test_con)); @@ -781,7 +781,7 @@ static void test_peer_testfr_reservation_failure(void) apci.u_function = IEC104_U_TESTFR_ACT; sut->connection.send_buffer.next_frame_serial = UINT64_MAX; CHECK(IEC104_SendManager_Handle_Testfr_Act(&sut->connection.send_manager, - sut->generation, &apci, fake.now) == IEC104_SEND_MANAGER_FATAL); + sut->generation, &apci, (uint32_t)fake.now) == IEC104_SEND_MANAGER_FATAL); CHECK(sut->connection.link_state.peer_testfr_seen == 1); CHECK(sut->connection.send_buffer.control_count == 0 && !sut->connection.send_buffer.has_reservation); end(); From 7d1db02164fed90d8c2ec4fa8db978df310deb73 Mon Sep 17 00:00:00 2001 From: Wanderingss <1624155937@qq.com> Date: Thu, 19 Nov 2026 15:48:21 +0800 Subject: [PATCH 5/5] =?UTF-8?q?perf(iec104):=20=E5=8F=82=E6=95=B0=E5=8C=BA?= =?UTF-8?q?=E6=8C=89=2017=20=E9=A1=B9=E7=9C=9F=E5=AE=9E=E6=B6=88=E8=B4=B9?= =?UTF-8?q?=E8=80=85=E6=94=B6=E7=AA=84=E5=B9=B6=E6=8E=A5=E4=B8=8A=E7=9C=9F?= =?UTF-8?q?=E5=AE=9E=E5=AE=9A=E5=80=BC=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 104 协议侧参数通道此前镜像了厂商点表的全部 430 条参数(697 槽), 但其中 413 条在本设备上没有任何消费者——104 与设备侧真实定值模型 prot_set 之间零调用,主站改定值只落在无人读的 RAM 镜像里,保护功能 毫无感知。本次按"严格按消费者收窄"口径收口: 可见性以 iec104_dtu_protection_mapping() 语义桥表为唯一判据,只放行 三段过流投退/定值/延时(9 项)、低压与过压定值/延时(4 项)、PT 与 CT 一次/二次额定(4 项)。其余参数在位表枚举层即不可见,主站读取 得到 COT=47 + P/N=1 的显式否定确认,不静默丢弃。values[697]→values[53]、 staged[264]→staged[17],并删除生成式 iec104_source_ranks.h。 桥表接真实源:iec104_serv 的 parameter_read/apply 从 NULL 改为直读 prot_set 与整批原子提交,Q10 量化后一次事务落地,持久化仍由 defaultTask 的脏标志闭环负责。 prot_set 因此出现两个运行时写者(netTask 的 104 与 uiTask 的本地整 定),原"写者靠启动时序串行"的约定失效。加入写事务互斥与 seqlock 序号:四个写入口全部进锁,校验与提前返回一律在 enter 之前;序号卡 奇数连续 8 拍即判保护闭锁,避免自检被永久跳过而静默失去防篡改能力。 锁的安装在 defaultTask 的存储 bring-up 阶段,不在 app_main_init—— 后者早于 osKernelInitialize,内核启动前禁止任何 RTOS 创建类 API。 实测:RW_IRAM1 117,304→113,720 B(−3,584 B,89.50%→86.76%); ER_IROM1 413,392→411,668 B(−1,724 B);iec104_source.o 5,656→2,056 B; prot_set.o 344→352 B(+8 B,写事务序号与锁句柄)。Keil 构建 0 错误 0 警告;主机侧 prot_set 175/175、iec104_dtu 7/7;真实 TCP 验收 13/13;暂存口径门禁 18 项全通过。 已知边界:模拟器不链接 iec104_serv.c,TCP 验收不覆盖 prot_set 绑定, 板端需实机确认主站写入能反映到本地定值页;17 项中 15 项的出厂默认 值与点表字面量不同,主站读到的是真实模型的值;绑定真实源后定值区 切换一律拒绝(单套活跃值无原子整区事务)。 --- App/algo/prot_set.c | 354 ++++++++++-- App/algo/prot_set.h | 99 +++- App/cfg/prot_set_store.c | 57 ++ App/cfg/prot_set_store.h | 8 + App/iec60870/104/iec104_dtu_table.c | 67 ++- App/iec60870/104/iec104_dtu_table.h | 6 + App/iec60870/104/iec104_source.c | 45 +- App/iec60870/104/iec104_source.h | 4 +- App/iec60870/104/iec104_source_ranks.h | 202 ------- App/task/default_task.c | 5 + App/task/iec104_serv.c | 47 +- docs/内存管理/RAM使用分析与优化方案.md | 6 +- docs/内存管理/RAM预算台账.md | 6 +- test/host/iec104_dtu/core_lifecycle_test.c | 25 +- test/host/iec104_dtu/oracle.py | 9 + test/host/iec104_dtu/run_tcp_test.py | 9 +- test/host/iec104_dtu/run_unit_test.py | 5 +- test/host/iec104_serv/iec104_serv_test.c | 57 ++ test/host/prot_set/prot_set_test.c | 507 ++++++++++++++++++ .../host/prot_set_store/prot_set_store_test.c | 1 + test/host/prot_set_store/stub/cmsis_os2.h | 23 + test/host/prot_set_store/stub/cmsis_stub.c | 21 + 22 files changed, 1235 insertions(+), 328 deletions(-) delete mode 100644 App/iec60870/104/iec104_source_ranks.h create mode 100644 test/host/prot_set_store/stub/cmsis_os2.h create mode 100644 test/host/prot_set_store/stub/cmsis_stub.c diff --git a/App/algo/prot_set.c b/App/algo/prot_set.c index fe9e2d04..f4048ce9 100644 --- a/App/algo/prot_set.c +++ b/App/algo/prot_set.c @@ -1,7 +1,9 @@ /* * 模块名称:保护定值模型(P1,定值校验和 载体)——实现 *(保护功能清单见 docs/算法/继电保护功能复现规划.md) - * 模块功能:见 prot_set.h。纯逻辑,零平台依赖(仅 stdint.h + 自身头)。 + * 模块功能:见 prot_set.h。纯逻辑,零平台依赖(仅 stdint.h + size_t + 自身头); + * 写事务保护只持有**两个函数指针**(prot_set_lock_t),由平台侧在安装时注入, + * 本文件不认识任何 RTOS/HAL 符号——固件、模拟器、主机单测三方共用同一份源码。 * * ⚠ 默认值/范围为拟定值(参考 EEPROM 出厂默认表不在本仓库,规划 §10.3 待补); * 通讯地址逐项对照参考 Comm/Pub/Const_CommSetPara.c g_tCommSetParaTab。 @@ -18,8 +20,6 @@ */ #include "prot_set.h" -#include /* memcpy(set_sealed 影子区拷贝,B7) */ - /* 元数据表:顺序必须与 prot_set_id_t 严格一致(逐行带地址注释,同 phasor * k_inst 的朴素行式风格) */ const prot_set_meta_t g_prot_set_meta[PS_ID_COUNT] = { @@ -69,22 +69,41 @@ const prot_set_meta_t g_prot_set_meta[PS_ID_COUNT] = { { 0x0000, 0u, PROT_SET_Q10(1.01), PROT_SET_Q10(1.0), PROT_SET_Q10(1.1) }, /* 低频返回系数 */ }; -static uint32_t s_val[2][PS_ID_COUNT]; /* 双缓冲值区(uint32 承载 int32,校验和按字覆盖) +static volatile uint32_t s_val[2][PS_ID_COUNT]; + /* 双缓冲值区(uint32 承载 int32,校验和按字覆盖) * B7:写者改影子区后单字交换 s_act, - * 读侧(protectTask selfcheck/get)永远看到一致快照 */ + * 读侧(protectTask selfcheck/get)永远看到一致快照 + * 带 volatile:提交顺序(影子区写完 → 发布封存对 → + * 交换活跃区)必须真的按这个顺序落到内存,编译器 + * 不得把值区读写挪到提交序号前后 */ static volatile uint8_t s_act; /* 活跃区下标(0/1);交换 = 单字存储 */ -static uint32_t s_sum; /* 封存的正码 */ -static uint32_t s_sumn; /* 封存的反码 */ -static uint64_t s_bad_mask; /* load_raw/parse 越界位图(B8:40 项 → 64 位) */ -static uint8_t s_locked; /* 定值非法 → 闭锁(定值校验和) */ +static volatile uint32_t s_sum; /* 封存的正码(提交窗口内与 s_seq 配对发布) */ +static volatile uint32_t s_sumn; /* 封存的反码 */ +static volatile uint32_t s_seq; /* 提交序号:奇数 = 提交进行中;见 prot_write_enter */ +static uint8_t s_odd_streak; /* 连续撞见奇数序号的次数(自检的 fail-safe 计数) */ +static uint64_t s_bad_mask; /* 只由整表装载/解析写(见 prot_set_bad_mask) */ +static volatile uint8_t s_locked; /* 定值非法 → 闭锁(定值校验和) */ static uint8_t s_dirty; /* 未落盘定值改动(B7 持久化脏标志) */ +static prot_set_lock_t s_lock = { 0, 0 };/* 写事务锁钩子(成员为 0 = 未安装) */ + +/* 连续撞见"提交序号为奇"的容忍上限。正常提交窗口是微秒级,而 selfcheck 由 + * protectTask 按 20 ms 节拍调用——连撞 8 拍(约 160 ms)还停在奇数,说明写者 + * 不是"正在提交",而是死锁、被锁内异常路径卡住、或进入了永不返回的钩子。 + * 此时值区的可信度无从判断,**闭锁保护是唯一 fail-safe 的选择**:宁可保护停走, + * 也不能带着不可信的定值继续判据。取值理由:8 远大于任何真实临界区时长 + * (微秒级 × 8 拍 = 160 ms 已是五个数量级的余量),又远小于"现场容忍保护 + * 带着坏定值运行"的时长。 */ +#define PROT_SET_ODD_STREAK_MAX 8u /* * 函数功能:sum32 覆盖指定值区(参考 Fun_CalSum32 同款:32 位字累加自然回绕) * 入口参数:vals - PS_ID_COUNT 个字的值区 * 返 回 值:校验和正码 + * 函数说明:形参带 volatile——读侧拿提交序号做 seqlock,求和若被编译器整体 + * 提到序号读之前,序号校验就形同虚设(非 volatile 的数组访问没有 + * 与 volatile 访问之间的顺序约束) */ -static uint32_t prot_sum_buf(const uint32_t *vals) { +static uint32_t prot_sum_buf(const volatile uint32_t *vals) { uint32_t sum = 0u; uint32_t i; @@ -94,6 +113,93 @@ static uint32_t prot_sum_buf(const uint32_t *vals) { return sum; } +/* ==================== 写事务(多写者 + 读侧无锁快照) ==================== + * 双缓冲只保证"读侧看到完整快照",不保证写者之间不交错。三个写入口 + * (set_sealed / apply_batch / load_raw)统一这样进提交: + * enter:先拿平台锁(若已装钩子)→ 提交序号变奇(标记"提交进行中") + * 提交:影子区改值 → 写 s_sum/s_sumn → s_locked=0 → 单字交换 s_act + * exit :提交序号回偶 → 放平台锁 + * 读侧(selfcheck)靠序号奇偶+双读判定"这轮撞上提交窗口",只跳过不判失配; + * 写者之间靠平台锁串行——否则两方会同时改同一块影子区,交换出撕裂值区。 + * 单核 Cortex-M4 上对齐 32 位读写在指令级原子,序号发布无需屏障指令。 + */ + +/* + * 函数功能:进入写事务(拿平台锁 + 提交序号变奇) + * 入口参数:无 + * 返 回 值:无 + * 函数说明:调用方保证 enter/exit 严格成对——本模块把全部校验放在 enter 之前, + * enter 之后不存在"提前返回"分支,因此不需要成对清账的失败路径 + */ +static void prot_write_enter(void) { + if (s_lock.enter != 0) { + s_lock.enter(); + } + s_seq = s_seq + 1u; /* 奇数:从现在起读侧看到的可能是中间态 */ +} + +/* + * 函数功能:退出写事务(提交序号回偶 + 放平台锁) + * 入口参数:无 + * 返 回 值:无 + * 函数说明:先发布偶数(值区与封存对此刻已一致),再放锁——读侧不会读到 + * "锁已放、序号仍奇"的稳态;本函数与 prot_write_enter 一一对应 + */ +static void prot_write_exit(void) { + s_seq = s_seq + 1u; /* 偶数:提交完成 */ + if (s_lock.exit != 0) { + s_lock.exit(); + } +} + +/* + * 函数功能:安装/卸载写事务锁钩子 + * 入口参数:lock - 钩子(NULL = 卸载回单写者假设) + * 返 回 值:无 + * 限定条件:任何写者启动前安装;本函数不加锁、不可重入(改的是两个函数指针) + */ +void prot_set_lock_install(const prot_set_lock_t *lock) { + if (lock == 0) { + s_lock.enter = 0; + s_lock.exit = 0; + return; + } + s_lock.enter = lock->enter; + s_lock.exit = lock->exit; +} + +/* + * 函数功能:定值编号是否在表内(批量接口的守门) + * 入口参数:id - 待查编号 + * 返 回 值:1 合法 / 0 越界 + * 函数说明:只守上界。prot_set_id_t 的底层类型是无符号的(枚举成员全非负, + * ARMCC/MSVC 都取 unsigned int),负值强转进来会被解释成一个巨大的 + * 无符号数,同样落在 >= PS_ID_COUNT 这一侧,由这条判据一并拦下—— + * 所以不需要也不该写 (int32_t)id < 0 那种恒假分支。 + */ +static uint8_t prot_id_valid(prot_set_id_t id) { + if ((uint32_t)id >= (uint32_t)PS_ID_COUNT) { + return 0u; + } + return 1u; +} + +/* + * 函数功能:整块复制值区(影子区 ← 活跃区) + * 入口参数:dst - 目标值区;src - 源值区 + * 返 回 值:无 + * 函数说明:不用 memcpy——两个值区都是 volatile(见 s_val 的注释),memcpy 的 + * 形参是普通指针,塞进去等于把 volatile 语义丢掉、编译器还可自由 + * 重排;40 个字的手写循环一样短,顺序也一眼可读 + */ +static void prot_copy_buf(volatile uint32_t *dst, const volatile uint32_t *src) { + uint32_t i; + + for (i = 0u; i < (uint32_t)PS_ID_COUNT; i++) { + dst[i] = src[i]; + } +} + /* * 函数功能:把元数据表默认值刷进 RAM 值区 * 入口参数:无 @@ -117,13 +223,18 @@ void prot_set_init(void) { s_bad_mask = 0u; s_locked = 0u; s_dirty = 0u; + s_seq = 0u; /* 装载期不属于"提交",序号回静止态(偶数) */ + s_odd_streak = 0u; /* 宽限计数同步归零:init 是唯一的重来一次入口 */ prot_set_seal(); } /* - * 函数功能:取最近一次 load_raw 的越界位图 + * 函数功能:取最近一次**整表装载/解析**的越界位图 * 入口参数:无 - * 返 回 值:bit i = 第 i 项越界(load_raw 失败后有效) + * 返 回 值:bit i = 第 i 项越界 + * 函数说明:只由 prot_set_load_raw / prot_set_store_parse 写(头文件把这条 + * 契约写死了)。单项/批量增量写入既不写也不清它——增量写入失败一律 + * 以返回值表达,看位图会读到上一次整表装载的旧结果。 */ uint64_t prot_set_bad_mask(void) { return s_bad_mask; @@ -139,7 +250,7 @@ uint64_t prot_set_bad_mask(void) { int prot_set_load_raw(const int32_t *vals) { uint64_t mask = 0u; uint32_t cur_act; - uint32_t *shadow; + volatile uint32_t *shadow; uint32_t i; if (vals == 0) { @@ -154,7 +265,9 @@ int prot_set_load_raw(const int32_t *vals) { if (mask != 0u) { return -1; } - /* 原子装载(B7):写影子区 → 封存 → 单字交换;读侧无中间态 */ + /* 原子装载(B7):写影子区 → 封存 → 单字交换;读侧无中间态。 + * 写事务(多写者):校验全在锁外,锁内只做提交,出锁即完成 */ + prot_write_enter(); cur_act = s_act; shadow = s_val[cur_act ^ 1u]; for (i = 0u; i < (uint32_t)PS_ID_COUNT; i++) { @@ -164,6 +277,7 @@ int prot_set_load_raw(const int32_t *vals) { s_sumn = ~s_sum; s_locked = 0u; s_act = (uint8_t)(cur_act ^ 1u); + prot_write_exit(); return 0; } @@ -196,23 +310,121 @@ int prot_set_set(prot_set_id_t id, int32_t q10) { */ int prot_set_set_sealed(prot_set_id_t id, int32_t q10) { uint32_t cur_act; - uint32_t *shadow; + volatile uint32_t *shadow; - if (id >= PS_ID_COUNT) { + if (!prot_id_valid(id)) { return -1; } if ((q10 < g_prot_set_meta[id].min) || (q10 > g_prot_set_meta[id].max)) { return -1; } + /* 校验在锁外(失败不进锁);锁内只有提交,无提前返回 */ + prot_write_enter(); cur_act = s_act; shadow = s_val[cur_act ^ 1u]; - (void)memcpy(shadow, s_val[cur_act], sizeof(s_val[0])); + prot_copy_buf(shadow, s_val[cur_act]); shadow[(uint32_t)id] = (uint32_t)q10; s_sum = prot_sum_buf(shadow); s_sumn = ~s_sum; s_locked = 0u; s_act = (uint8_t)(cur_act ^ 1u); /* 单字交换:读侧原子切换 */ s_dirty = 1u; + prot_write_exit(); + return 0; +} + +/* + * 函数功能:读一批定值当前值(Q10 工程量) + * 入口参数:ids - 编号数组;n - 个数;out - 输出数组(out[i] 对应 ids[i]) + * 返 回 值:0 成功 / -1 参数非法(空指针、n 为 0、n 超上限、任一号越界) + * 限定条件:任意上下文安全,不持锁、不进写事务、**绝不无界等待** + * 函数说明:先捕获提交序号与活跃区下标,整批都从这**同一块**值区取; + * 取完复核序号——期间发生过提交即重取(有限次)。写者只有 104 下发 + * 与本地整定两类人工操作,重取次数实际为 0 或 1;不无界自旋是因为 + * 读侧可能是高优先级任务,而它等的写者正被自己抢占——自旋就是死等。 + * 连续多次提交时退化为"跨提交的混合值",与此前逐项 prot_set_get 的 + * 语义同级,不会撕裂结构、更不会触发闭锁。 + */ +int prot_set_read_batch(const prot_set_id_t *ids, size_t n, int32_t *out) { + uint32_t seq_a; + uint32_t seq_b; + const volatile uint32_t *row; + uint32_t tries = 0u; + size_t i; + + if ((ids == 0) || (out == 0)) { + return -1; + } + if ((n == 0u) || (n > PROT_SET_BATCH_MAX)) { + return -1; + } + for (i = 0u; i < n; i++) { + if (!prot_id_valid(ids[i])) { + return -1; + } + } + do { + seq_a = s_seq; + row = s_val[s_act]; + for (i = 0u; i < n; i++) { + out[i] = (int32_t)row[(uint32_t)ids[i]]; + } + seq_b = s_seq; + tries++; + } while ((((seq_a & 1u) != 0u) || (seq_a != seq_b)) && (tries < 3u)); + return 0; +} + +/* + * 函数功能:原子写入一批定值 + * 入口参数:changes - 变更数组;n - 个数;validate_only - 非 0 只校验 + * 返 回 值:0 整批合法 / -1 有非法项(值区一字未改) + * 限定条件:validate_only 分支零副作用——不置脏、不动值区、不动闭锁位、不进写事务 + * 函数说明:校验全在锁外(元数据表是 ROM 常量,校验不碰 RAM 状态); + * 提交在写事务锁内一次完成:拷活跃区到影子 → 改 n 项 → 重算封存对 → + * 清闭锁 → 单字交换 → 置脏。任一项非法即一字未改地返回。 + * ⚠ 基准值必须**在锁内**取:若在锁外先把活跃区抄到栈上再进锁, + * 这中间被另一个写者提交,就会用旧基准覆盖掉它的改动(丢写)。 + */ +int prot_set_apply_batch(const prot_set_change_t *changes, size_t n, int validate_only) { + uint32_t cur_act; + volatile uint32_t *shadow; + size_t i; + size_t j; + + if ((changes == 0) || (n == 0u) || (n > PROT_SET_BATCH_MAX)) { + return -1; + } + for (i = 0u; i < n; i++) { + if (!prot_id_valid(changes[i].id)) { + return -1; + } + if ((changes[i].q10 < g_prot_set_meta[changes[i].id].min) + || (changes[i].q10 > g_prot_set_meta[changes[i].id].max)) { + return -1; + } + for (j = i + 1u; j < n; j++) { + if (changes[j].id == changes[i].id) { + return -1; /* 同批同项两条:语义不确定,拒整批 */ + } + } + } + if (validate_only != 0) { + return 0; /* 预检到此为止:以上只有局部变量与 ROM 表,零副作用 */ + } + prot_write_enter(); + cur_act = s_act; + shadow = s_val[cur_act ^ 1u]; + prot_copy_buf(shadow, s_val[cur_act]); + for (i = 0u; i < n; i++) { + shadow[(uint32_t)changes[i].id] = (uint32_t)changes[i].q10; + } + s_sum = prot_sum_buf(shadow); + s_sumn = ~s_sum; + s_locked = 0u; + s_act = (uint8_t)(cur_act ^ 1u); /* 单字交换:读侧原子切换 */ + s_dirty = 1u; + prot_write_exit(); return 0; } @@ -222,7 +434,8 @@ int prot_set_set_sealed(prot_set_id_t id, int32_t q10) { * 返 回 值:peek/take = 1 存在未落盘改动 / 0 干净;mark 无返回 * 函数说明:peek 非消费(iec104Task 每轮通知,直到落盘成功); * take 消费(defaultTask 落盘前);mark 写盘失败回置(等下轮重试)。 - * 单字节标志,多读者安全;写者只有 set_sealed(置)与属主任务(清/置)。 + * 单字节标志,多读者安全;写者只有 set_sealed/apply_batch(置)与 + * 属主任务(清/置)。 */ uint8_t prot_set_dirty_peek(void) { return s_dirty; @@ -299,17 +512,46 @@ void prot_set_seal(void) { * 返 回 值:0 通过 / -1 失配(已置闭锁) * 函数说明:失配 → s_locked 置位并保持,直到下一次 seal; * 元件层每拍读 prot_set_locked() 决定整体复位(联动闭锁)。 - * B7 双缓冲 + seqlock 式复核:先读封存和、再读值区、再读封存和, - * 两次不同 = 检查期间发生了原子提交 → 本轮不作数(下拍再查), - * 杜绝"提交瞬间被巡检撞见"的误锁(收口 B5 竞态窗口)。 + * 读侧无锁,靠两重旁证识别"提交进行中": + * ① 提交序号 s_seq 为奇 = 有写者在提交窗口内 → 本轮不作数; + * ② 起止各读一次序号与封存和,任一变化 = 期间发生过提交 → 本轮不作数。 + * 两者只**跳过本轮**,绝不据此判失配——提交途中被巡检撞见就闭锁整台 + * 保护,正是多写者引入的安全级风险。真正的失配(值区与封存对不符且 + * 没有提交在飞)仍照常闭锁。 + * ⚠ fail-safe:跳过必须**有界**。若写者在 prot_write_enter 之后走进 + * 永不返回的路径(锁内提前 return 忘了 exit、钩子死锁、被永久抢占), + * s_seq 会永远停在奇数,而"跳过本轮"会让防篡改自检永久失效且无人察觉 + * ——保护静默失去整台闭锁能力。故连撞 PROT_SET_ODD_STREAK_MAX 拍即判 + * 闭锁:那时已不是"正在提交",而是写者已死,值区不可信。 */ int prot_set_selfcheck(void) { - uint32_t sum_a = s_sum; - uint32_t calc = prot_sum_buf(s_val[s_act]); - uint32_t sum_b = s_sum; + uint32_t seq_a = s_seq; + uint32_t sum_a; + uint32_t sum_b; + uint32_t seq_b; + uint8_t act_a; + uint8_t act_b; + uint32_t calc; - if (sum_a != sum_b) { - /* 检查期间有 set_sealed/load_raw 提交:快照不一致,本轮跳过 */ + if ((seq_a & 1u) != 0u) { + if (s_odd_streak < 255u) { + s_odd_streak++; + } + if (s_odd_streak >= (uint8_t)PROT_SET_ODD_STREAK_MAX) { + s_locked = 1u; /* 写者长期停在提交窗口内:值区不可信 → 闭锁 */ + } + return (s_locked != 0u) ? -1 : 0; + } + s_odd_streak = 0u; /* 序号已回静止态:宽限期重新开始计 */ + sum_a = s_sum; + act_a = s_act; /* 先固定值区:下面的求和只依赖这一个 volatile 读 */ + calc = prot_sum_buf(s_val[act_a]); + act_b = s_act; + sum_b = s_sum; + seq_b = s_seq; + + if ((seq_a != seq_b) || (sum_a != sum_b) || (act_a != act_b)) { + /* 检查期间有 set_sealed/apply_batch/load_raw 提交:本轮跳过 */ return (s_locked != 0u) ? -1 : 0; } if ((calc != sum_a) || (sum_a != ~s_sumn)) { @@ -376,22 +618,35 @@ static uint32_t s_get32(const uint8_t *p) { * 函数功能:把当前值区序列化为 blob(校验和按值区现算,不依赖封存值) * 入口参数:p_buf - 输出缓冲;cap - 容量;p_len - 实际长度输出 * 返 回 值:0 / -1 参数非法或容量不足 + * 函数说明:落盘是整表字节流,混进两次提交的值就会被原样写进文件、下次开机 + * 当合法档案装载回来(校验对是按同一份混合值算的,自洽)。故与 + * prot_set_read_batch 同用提交序号做有限次重取:期间有提交即重来。 */ int prot_set_store_serialize(uint8_t *p_buf, uint32_t cap, uint32_t *p_len) { - const uint32_t *vals = s_val[s_act]; + uint32_t seq_a = 0u; + uint32_t seq_b; + const volatile uint32_t *vals; uint32_t sum = 0u; + uint32_t tries = 0u; uint32_t i; if ((p_buf == 0) || (p_len == 0) || (cap < PROT_SET_BLOB_SZ)) { return -1; } + do { + seq_a = s_seq; + vals = s_val[s_act]; + sum = 0u; + for (i = 0u; i < (uint32_t)PS_ID_COUNT; i++) { + s_put32(p_buf + PROT_SET_BLOB_HDR_SZ + 4u * i, vals[i]); + sum += vals[i]; + } + seq_b = s_seq; + tries++; + } while ((((seq_a & 1u) != 0u) || (seq_a != seq_b)) && (tries < 3u)); s_put32(p_buf, PROT_SET_BLOB_MAGIC); s_put16(p_buf + 4u, (uint16_t)PROT_SET_BLOB_VER); s_put16(p_buf + 6u, (uint16_t)PS_ID_COUNT); - for (i = 0u; i < (uint32_t)PS_ID_COUNT; i++) { - s_put32(p_buf + PROT_SET_BLOB_HDR_SZ + 4u * i, vals[i]); - sum += vals[i]; - } s_put32(p_buf + PROT_SET_BLOB_SZ - 8u, sum); s_put32(p_buf + PROT_SET_BLOB_SZ - 4u, ~sum); *p_len = PROT_SET_BLOB_SZ; @@ -403,12 +658,15 @@ int prot_set_store_serialize(uint8_t *p_buf, uint32_t cap, uint32_t *p_len) { * 入口参数:p_buf/len - blob 字节流 * 返 回 值:0 已装载并封存 / -1 拒绝(magic/版本/长度/校验对不符或任一项 * 越界 → 活跃值区一字不动;越界项经 prot_set_bad_mask() 指认) - * 函数说明:解码/校验全在影子区进行,只有全部通过才交换活跃区—— - * 损坏 blob 不可能污染在用的定值(掉电/写坏/版本换代同一路径)。 + * 函数说明:校验在写事务之外完成(只读入参字节流,不碰任何 RAM 状态), + * 全部通过才进锁把值写进影子区并交换——损坏 blob 不可能污染在用的 + * 定值(掉电/写坏/版本换代同一路径),也不可能在锁内做无用功。 + * ⚠ 校验必须**不写影子区**:影子区是与其他写者共享的暂存面, + * 锁外往里写就等于绕过写事务(另一写者的提交会被覆盖)。 */ int prot_set_store_parse(const uint8_t *p_buf, uint32_t len) { uint32_t cur_act; - uint32_t *shadow; + volatile uint32_t *shadow; uint32_t sum = 0u; uint64_t mask = 0u; uint32_t i; @@ -425,33 +683,37 @@ int prot_set_store_parse(const uint8_t *p_buf, uint32_t len) { if (s_get16(p_buf + 6u) != (uint16_t)PS_ID_COUNT) { return -1; } - cur_act = s_act; - shadow = s_val[cur_act ^ 1u]; + /* 第一遍:只算和 + 查范围,不落任何 RAM */ for (i = 0u; i < (uint32_t)PS_ID_COUNT; i++) { uint32_t v = s_get32(p_buf + PROT_SET_BLOB_HDR_SZ + 4u * i); - shadow[i] = v; sum += v; + if (((int32_t)v < g_prot_set_meta[i].min) + || ((int32_t)v > g_prot_set_meta[i].max)) { + mask |= (1uLL << i); + } } if (sum != s_get32(p_buf + PROT_SET_BLOB_SZ - 8u)) { - return -1; /* 校验和正码不符(影子区未交换前不可见,无害) */ + return -1; /* 校验和正码不符 */ } if (~sum != s_get32(p_buf + PROT_SET_BLOB_SZ - 4u)) { return -1; /* 反码对不符 */ } - for (i = 0u; i < (uint32_t)PS_ID_COUNT; i++) { - if (((int32_t)shadow[i] < g_prot_set_meta[i].min) - || ((int32_t)shadow[i] > g_prot_set_meta[i].max)) { - mask |= (1uLL << i); - } - } s_bad_mask = mask; if (mask != 0u) { return -1; /* 校验对一致但含越界项:同样整表拒绝 */ } - s_sum = sum; - s_sumn = ~sum; + /* 第二遍:锁内写入影子区并交换(无提前返回,enter/exit 天然成对) */ + prot_write_enter(); + cur_act = s_act; + shadow = s_val[cur_act ^ 1u]; + for (i = 0u; i < (uint32_t)PS_ID_COUNT; i++) { + shadow[i] = s_get32(p_buf + PROT_SET_BLOB_HDR_SZ + 4u * i); + } + s_sum = prot_sum_buf(shadow); + s_sumn = ~s_sum; s_locked = 0u; s_act = (uint8_t)(cur_act ^ 1u); + prot_write_exit(); return 0; } diff --git a/App/algo/prot_set.h b/App/algo/prot_set.h index 3893f358..19fcecea 100644 --- a/App/algo/prot_set.h +++ b/App/algo/prot_set.h @@ -13,17 +13,28 @@ * - ⚠ 默认值/范围为**拟定值**:参考 EEPROM 出厂默认表未在本仓库, * 待对照后逐项修订(规划 §10.3 待补项);范围先按 DTU 馈线典型量级。 * - * 线程约定(B7 定):装载(init/store_parse)在 defaultTask(存储 bring-up, - * STORAGE_READY 前);单项写在 iec104Task(C_SE/YK12,经 set_sealed 原子路径); - * 落盘在 defaultTask(配置引擎属主)。读在保护消费者任务(快照值原子)。 - * 双缓冲交换 = 单字写,读侧永远看到一致快照;写者之间靠启动时序串行 - * (装载先于 NET_READY,104 写在其后)。 + * 线程约定(多写者 + 写事务锁): + * 装载(init/store_parse)在 defaultTask(存储 bring-up);落盘在 defaultTask + * (配置引擎属主);读在保护消费者任务(快照值原子,读接口一律不加锁)。 + * 运行时写者有两个——netTask(104 定值下发,走 apply_batch / set_sealed)与 + * uiTask(本地整定,经 ui_data 注入的 set_sealed)。 + * 双缓冲 + 单字交换只保证"读侧看到完整快照",**不保证写者之间不交错**:一方 + * 已写封存对、尚未交换活跃区时被另一方抢占,后者再交换一次,最终值区与封存 + * 对失配 → selfcheck 判"定值被非法改写" → 整台保护闭锁。所以写入口统一走 + * 写事务:可选 enter/exit 钩子(prot_set_lock_install 安装,板端接 RTOS 互斥 + * 量;模拟器与主机单测不装 = 单写者假设)包住"影子区改值 + 封存 + 交换", + * 同时把提交序号置奇/回偶,selfcheck 借它识别"提交进行中"而不误判失配。 + * 跳过本轮是**有界**的:连撞 8 拍仍是奇数 → 判写者已死 → 闭锁(fail-safe, + * 否则一条"锁内提前返回"的 bug 就会让防篡改自检永久静默失效)。 + * 本模块只持有两个函数指针,不 include 任何 RTOS/HAL 头——纯逻辑三方编译 + * (固件 / 模拟器 / 主机单测)不受影响。 * * 创建日期:2026-10-11 */ #ifndef PROT_SET_H #define PROT_SET_H +#include /* size_t(批量接口) */ #include /* Q10 定点:工程量 × 1024(与参考 2^10 口径一致)。 @@ -115,8 +126,18 @@ void prot_set_init(void); */ int prot_set_load_raw(const int32_t *vals); -/* 越界位图(bit i = 第 i 项越界;load_raw 失败后有效。B8:项数 32→40, - * 位图随项数扩为 64 位——消费方仅主机单测,板端闭锁走 prot_set_locked()) */ +/* 越界位图(bit i = 第 i 项越界)。 + * + * ⚠ 契约(调用方必读):本函数返回的位图**只反映整表装载/解析** + * (prot_set_load_raw / prot_set_store_parse)的越界结果, + * 最后一次整表操作失败后有效,直到下一次整表操作或 prot_set_init 覆写。 + * **不随单项写入(prot_set_set / prot_set_set_sealed)或批量写入 + * (prot_set_apply_batch)变化**:增量写入的失败一律以函数返回 -1 表达, + * 既不置位也不清位。 + * 推论:一笔成功的批量提交**不会**清掉历史上整表装载留下的越界位; + * 反过来,一笔失败的批量提交也**不会**在位图上留下痕迹。拿位图反显 + * "刚才那批哪几项越界"是误用——请用 apply_batch 的返回值。 + * B8:项数 32→40,位图随项数扩为 64 位;板端闭锁走 prot_set_locked()。 */ uint64_t prot_set_bad_mask(void); /* @@ -133,7 +154,11 @@ uint8_t prot_set_get_ctl(prot_set_id_t id); /* 投退项:!=0 视为投入 /* 校验和(定值校验和):sum32 覆盖 RAM 值区;seal 封存正/反码对 */ uint32_t prot_set_checksum(void); void prot_set_seal(void); -/* 自检:重算并与封存值比对,失配 → 置闭锁并返回 -1(已闭锁也返回 -1) */ +/* 自检:重算并与封存值比对,失配 → 置闭锁并返回 -1(已闭锁也返回 -1)。 + * 提交进行中(写者正在改值区/发封存对)撞见的中间态**只跳过本轮、不判失配**; + * 但跳过是有界的:连续撞见"提交进行中"达 8 拍(约 160 ms)即视为写者已死, + * 置闭锁并返回 -1(fail-safe:宁可保护停走,不可带不可信定值判据)。 + * 解锁的唯一合法路径是 prot_set_seal()(或 prot_set_init() 重装)。 */ int prot_set_selfcheck(void); uint8_t prot_set_locked(void); @@ -148,6 +173,64 @@ uint8_t prot_set_locked(void); */ int prot_set_set_sealed(prot_set_id_t id, int32_t q10); +/* ---------------- 批量读写(104 定值下发:PRE 预检 + SOL 原子提交) ---------------- + * 协议一次改 1..17 项,两段式:第一段只校验(不落任何状态),第二段整批提交。 + * 与单项 set_sealed 同一原子口径:任一项非法则整批一项都不改。 + */ + +/* 一批定值变更(Q10 工程量)。同一批内 id 不得重复。 */ +typedef struct { + prot_set_id_t id; + int32_t q10; +} prot_set_change_t; + +/* 单批上限 = 整表 40 项(算法侧上限)。超过上限返回 -1,不做任何改动。 + * ⚠ 与协议上限的关系:40 是**本模型能接受的最大批量**(整表就 40 项); + * IEC 60870-5-104 参数区另有 **17 项**的消费者上限,那是协议/调用方的 + * 约束,由调用方自己拦——本层不代拦。所以 18 项的一批在这里是合法的, + * 接线方若想守 17 项,必须在上层先判,别指望这里替它拒。 */ +#define PROT_SET_BATCH_MAX ((size_t)PS_ID_COUNT) + +/* + * 函数功能:读一批定值当前值(Q10 工程量) + * 入口参数:ids - 编号数组;n - 个数;out - 输出数组(out[i] 对应 ids[i]) + * 返 回 值:0 成功 / -1 参数非法(空指针、n 为 0、n 超过上限、任一号越界) + * 限定条件:任意上下文安全——双缓冲保证读侧只看到完整快照,不需要持锁 + */ +int prot_set_read_batch(const prot_set_id_t *ids, size_t n, int32_t *out); + +/* + * 函数功能:原子写入一批定值 + * 入口参数:changes - 变更数组;n - 个数;validate_only - 非 0 只校验 + * 返 回 值:0 整批合法(validate_only 时仅为"预检通过")/ -1 有非法项 + * 限定条件:两段式第一段(validate_only 非 0)**零副作用**——不置脏、不动值区、 + * 不动闭锁位、不进写事务锁;第二段(validate_only 为 0)先整批校验, + * 任一项非法即一字未改地返回,全部合法才提交并置脏。 + * 函数说明:失败条件 = changes 为空、n 为 0、n 超上限、任一号越界、任一值越出 + * 该项 min/max、同批 id 重复。提交在写事务锁内完成(见下方钩子)。 + * 返 回 值补充(与 prot_set_bad_mask 的关系):**任何失败都不会反映到位图上** + * ——成功也不清、失败也不置。要定位是哪一项不合法,请在调用前自己 + * 对照 g_prot_set_meta[id] 的 min/max 逐项查,或改用两段式第一段 + * 预检后自行分组重试;位图上看到的内容属于更早的整表装载。 + */ +int prot_set_apply_batch(const prot_set_change_t *changes, size_t n, int validate_only); + +/* 写事务锁钩子(可选)。未安装 = 调用方保证单写者(模拟器 / 主机单测即如此)。 + * enter/exit 必须成对;enter 允许阻塞,不得用关中断实现。 */ +typedef struct { + void (*enter)(void); + void (*exit)(void); +} prot_set_lock_t; + +/* + * 函数功能:安装/卸载写事务锁 + * 入口参数:lock - 钩子(传 NULL = 卸载,退回单写者假设) + * 返 回 值:无 + * 限定条件:应在任何写者启动前安装;本函数本身不加锁、不可重入。 + * 钩子只在"值区提交"这段临界区里被调用,读接口永不进入。 + */ +void prot_set_lock_install(const prot_set_lock_t *lock); + /* 脏标志(存在未落盘的定值改动):set_sealed 置位;load/init 不置 */ uint8_t prot_set_dirty_peek(void); /* 非消费(生产者用它通知属主任务) */ uint8_t prot_set_dirty_take(void); /* 消费(属主任务落盘前取) */ diff --git a/App/cfg/prot_set_store.c b/App/cfg/prot_set_store.c index 3ecd85b4..e0c8909f 100644 --- a/App/cfg/prot_set_store.c +++ b/App/cfg/prot_set_store.c @@ -7,11 +7,15 @@ * 原子写临时名由 cfg_store_write_atomic 按目标目录推导 * (固定 config.TMP),与 /config.ini 的保存同在 defaultTask * 串行执行,无并发竞争。 + * 本文件同时是 prot_set 写事务互斥钩子的平台胶水:内核启动后由 + * defaultTask 安装 osMutex,netTask 的 104 整定写与本地整定共用 + * 同一把锁,保证“取影子—改—封存—切区”全程互斥。 * 创建日期:2026-10-12(B7) */ #include "prot_set_store.h" #include +#include "cmsis_os2.h" #define DBG_TAG "[CFG]" #include "dbg_log.h" @@ -25,6 +29,59 @@ * B8 定值表 32→40 项 → blob 144→176 B,随 PROT_SET_BLOB_SZ 自动适配) */ static uint8_t s_blob[PROT_SET_BLOB_SZ]; +/* prot_set 写事务钩子:未安装时 enter/exit 都是空操作,保持单任务构建可用。 */ +static osMutexId_t s_prot_set_mutex; + +/* + * 函数功能:进入 prot_set 写事务(拿互斥) + * 入口参数:无 + * 返 回 值:无 + * 函数说明:未安装互斥时为空操作,退化为单写者行为; + * 不得在中断上下文调用(osWaitForever 会阻塞)。 + */ +static void s_prot_set_lock_enter(void) +{ + if (s_prot_set_mutex != NULL) { + (void)osMutexAcquire(s_prot_set_mutex, osWaitForever); + } +} + +/* + * 函数功能:退出 prot_set 写事务(放互斥) + * 入口参数:无 + * 返 回 值:无 + * 函数说明:与 s_prot_set_lock_enter 成对出现,未安装互斥时为空操作。 + */ +static void s_prot_set_lock_exit(void) +{ + if (s_prot_set_mutex != NULL) { + (void)osMutexRelease(s_prot_set_mutex); + } +} + +/* + * 函数功能:安装 prot_set 写事务互斥(幂等) + * 入口参数:无 + * 返 回 值:0 已安装或重复调用 / -1 创建失败(无锁降级) + * 函数说明:仅在内核启动后的 defaultTask 上下文调用;创建失败时不安装钩子, + * 写事务退化为无锁(单写者时代的行为),不把启动拖死。 + */ +int prot_set_store_lock_init(void) +{ + static const prot_set_lock_t lock = { s_prot_set_lock_enter, s_prot_set_lock_exit }; + osMutexId_t mutex; + + if (s_prot_set_mutex != NULL) { return 0; } + mutex = osMutexNew(NULL); + if (mutex == NULL) { + DBG_ERROR("prot set lock create failed, no-lock fallback"); + return -1; + } + s_prot_set_mutex = mutex; + prot_set_lock_install(&lock); + return 0; +} + /* * 函数功能:从小端缓冲读 16 位值(仅头部判别用,与 prot_set.c 内部同字节序) * 入口参数:p - 读位置 diff --git a/App/cfg/prot_set_store.h b/App/cfg/prot_set_store.h index c4570709..cc6a1581 100644 --- a/App/cfg/prot_set_store.h +++ b/App/cfg/prot_set_store.h @@ -28,4 +28,12 @@ int prot_set_store_load(void); */ int prot_set_store_save(void); +/* + * 函数功能:安装 prot_set 写事务的跨任务互斥(幂等) + * 返回值:0 - 已安装或重复调用;-1 - 内核对象创建失败(保持无锁降级) + * 限定条件:必须在内核启动后、首个运行时写者之前调用一次 + * (defaultTask 存储 bring-up);内核前调用会直接拉死启动。 + */ +int prot_set_store_lock_init(void); + #endif /* PROT_SET_STORE_H */ diff --git a/App/iec60870/104/iec104_dtu_table.c b/App/iec60870/104/iec104_dtu_table.c index d5e9ab09..72720cd9 100644 --- a/App/iec60870/104/iec104_dtu_table.c +++ b/App/iec60870/104/iec104_dtu_table.c @@ -6,6 +6,26 @@ typedef char profile_sp_count[(DTU_SIGNAL_COUNT == IEC104_DTU_SP_COUNT) ? 1 : -1]; typedef char profile_me_count[(DTU_MEASUREMENT_COUNT == IEC104_DTU_ME_COUNT) ? 1 : -1]; typedef char profile_param_count[(DTU_PARAMETER_COUNT == IEC104_DTU_PARAMETER_COUNT) ? 1 : -1]; +/* Authorized consumer semantic bridge; activated by iec104_serv bindings on MCU. No mapping for alarm-enable (not overall enable), + * low-frequency blocking (not underfrequency trip), zero drift (not ADC offset), + * or remote-control permission (not protection global enable). + * Existing model IDs 0..39 are stable persistent IDs; COUNT is not a parameter. + * PT1 and phase-CT refer to the one existing feeder, secondary units A/V. + * Other phases/bays MUST NOT silently share these IDs. + * This is the entire accepted consumer set: every other profile row is refused. */ +static const struct { uint16_t ioa, id; float scale; } s_consumer_map[] = { + {0x8841U, 1U, 1.0f}, {0x8842U, 2U, 1.0f}, {0x8843U, 3U, 1000.0f}, + {0x8845U, 5U, 1.0f}, {0x8846U, 6U, 1.0f}, {0x8847U, 7U, 1000.0f}, + {0x8849U, 9U, 1.0f}, {0x884aU, 10U, 1.0f}, {0x884bU, 11U, 1000.0f}, + {0x8027U, 20U, 1.0f}, {0x8028U, 21U, 1000.0f}, + {0x8029U, 17U, 1.0f}, {0x802aU, 18U, 1000.0f}, + {0x8024U, 27U, 1000.0f}, {0x8025U, 28U, 1.0f}, + {0x8040U, 29U, 1.0f}, {0x8041U, 30U, 1.0f} + /* 8046/8047 are load-limit alarms, not the existing overload trip + * model. Do not map those by a superficially similar threshold. */ +}; +typedef char consumer_map_count[ + (sizeof(s_consumer_map) / sizeof(s_consumer_map[0]) == IEC104_DTU_CONSUMER_COUNT) ? 1 : -1]; /* 函数功能:按稳定索引查询标准监视点元数据。 */ bool iec104_dtu_point(size_t index, iec104_dtu_point_t *out) { @@ -57,37 +77,38 @@ size_t iec104_dtu_parameter_index(uint32_t ioa) } return i; } -/* 函数功能:依据原表配置状态和区域判定参数可见性。 */ +/* 函数功能:依据消费集合与区域判定参数可见性。 */ bool iec104_dtu_parameter_visible(size_t index, uint16_t area) { - iec104_dtu_parameter_t p; + iec104_dtu_parameter_t p; uint16_t id; float scale; return area < IEC104_DTU_AREA_COUNT && iec104_dtu_parameter(index, &p) && - p.configured && (area == 0U || p.area_scoped); + p.configured && (area == 0U || p.area_scoped) && + iec104_dtu_protection_mapping(p.ioa, &id, &scale); } -/* Candidate semantic bridge, not an activated platform binding. No mapping for alarm-enable (not overall enable), - * low-frequency blocking (not underfrequency trip), zero drift (not ADC offset), - * or remote-control permission (not protection global enable). - * Existing model IDs 0..39 are stable persistent IDs; COUNT is not a parameter. - * PT1 and phase-CT refer to the one existing feeder, secondary units A/V. - * Other phases/bays MUST NOT silently share these IDs. */ -/* 函数功能:查询未激活的候选语义桥及单位比例。 */ +/* 函数功能:把可见消费者索引换算成密集槽位;非消费者返回无槽位。 + * area_zero 非 0 = SN0 全体 17 项排名;为 0 = 区域 1..4 的 9 项局部排名。 */ +uint16_t iec104_dtu_parameter_rank(size_t index, uint8_t area_zero) +{ + iec104_dtu_parameter_t p; uint16_t rank = 0U; size_t i; + if (!iec104_dtu_parameter_visible(index, area_zero != 0U ? 0U : 1U) || + !iec104_dtu_parameter(index, &p)) { return IEC104_DTU_NO_RANK; } + for (i = 0U; i < IEC104_DTU_CONSUMER_COUNT; ++i) { + uint32_t ioa = s_consumer_map[i].ioa; + if (area_zero == 0U && !(ioa >= 0x8820U && ioa <= 0x88ffU)) { continue; } + if (ioa == p.ioa) { return rank; } + ++rank; + } + return IEC104_DTU_NO_RANK; +} +/* 函数功能:查询真实消费者的语义桥及单位比例。 */ bool iec104_dtu_protection_mapping(uint32_t ioa, uint16_t *id, float *source_scale) { - static const struct { uint16_t ioa, id; float scale; } map[] = { - {0x8841U, 1U, 1.0f}, {0x8842U, 2U, 1.0f}, {0x8843U, 3U, 1000.0f}, - {0x8845U, 5U, 1.0f}, {0x8846U, 6U, 1.0f}, {0x8847U, 7U, 1000.0f}, - {0x8849U, 9U, 1.0f}, {0x884aU, 10U, 1.0f}, {0x884bU, 11U, 1000.0f}, - {0x8027U, 20U, 1.0f}, {0x8028U, 21U, 1000.0f}, - {0x8029U, 17U, 1.0f}, {0x802aU, 18U, 1000.0f}, - {0x8024U, 27U, 1000.0f}, {0x8025U, 28U, 1.0f}, - {0x8040U, 29U, 1.0f}, {0x8041U, 30U, 1.0f} - /* 8046/8047 are load-limit alarms, not the existing overload trip - * model. Do not map those by a superficially similar threshold. */ - }; size_t i; if (id == NULL || source_scale == NULL) { return false; } - for (i = 0U; i < sizeof(map) / sizeof(map[0]); ++i) { - if (map[i].ioa == ioa) { *id = map[i].id; *source_scale = map[i].scale; return true; } + for (i = 0U; i < sizeof(s_consumer_map) / sizeof(s_consumer_map[0]); ++i) { + if (s_consumer_map[i].ioa == ioa) { + *id = s_consumer_map[i].id; *source_scale = s_consumer_map[i].scale; return true; + } } return false; } diff --git a/App/iec60870/104/iec104_dtu_table.h b/App/iec60870/104/iec104_dtu_table.h index 0c1779de..916e5d17 100644 --- a/App/iec60870/104/iec104_dtu_table.h +++ b/App/iec60870/104/iec104_dtu_table.h @@ -10,6 +10,9 @@ #define IEC104_DTU_ME_COUNT 30U #define IEC104_DTU_ENERGY_COUNT 8U #define IEC104_DTU_PARAMETER_COUNT 430U +#define IEC104_DTU_CONSUMER_COUNT 17U +#define IEC104_DTU_SCOPED_CONSUMER_COUNT 9U +#define IEC104_DTU_NO_RANK 0xFFFFU #define IEC104_DTU_STANDARD_COUNT 120U #define IEC104_DTU_COMMAND_COUNT 65U #define IEC104_DTU_AREA_COUNT 5U @@ -31,6 +34,9 @@ typedef struct { bool iec104_dtu_point(size_t index, iec104_dtu_point_t *out); bool iec104_dtu_parameter(size_t index, iec104_dtu_parameter_t *out); size_t iec104_dtu_parameter_index(uint32_t ioa); +/* Returns a dense rank for a visible consumer, or IEC104_DTU_NO_RANK. + * area_zero selects the SN0 value slot; otherwise rank is within one scoped area. */ +uint16_t iec104_dtu_parameter_rank(size_t index, uint8_t area_zero); bool iec104_dtu_parameter_visible(size_t index, uint16_t area); /* IDs are existing prot_set_id_t values, not legacy communication addresses. * wire_value * source_scale = source engineering value. */ diff --git a/App/iec60870/104/iec104_source.c b/App/iec60870/104/iec104_source.c index 6d9ca1ef..abf1acec 100644 --- a/App/iec60870/104/iec104_source.c +++ b/App/iec60870/104/iec104_source.c @@ -14,14 +14,15 @@ * - 预置(PRE/SOL)与标准参数装载:显式拒绝并计数,不静默丢弃。 * 全功能档(模拟器/产品默认面)不受影响。 */ #ifndef IEC104_SOURCE_NO_VALUE_STORE -/* 槽位密集化(包 B):rank 表把"索引 -> 槽位"从循环换算改成 O(1) 查表。 - * values 只保留真实可见的槽(configured 345 + area_scoped 88 x 4 区 = 697), - * staged/dirty 只保留可写参数(writable 264),省 1025B RAM,代价 2580B Flash。 */ -#include "iec104_source_ranks.h" -#define VALUE_SLOTS IEC104_SOURCE_VALUE_SLOTS +/* 消费者收窄:只保留 17 个真实消费者的值/预置槽位。 + * SN0 全体 17 个;SN1..4 各 9 个区域消费者,合计 53 个值槽; + * staged/dirty 覆盖同一 17 项,对应 68B + 3B RAM。 */ +#define VALUE_SLOTS (IEC104_DTU_CONSUMER_COUNT + 4U * IEC104_DTU_SCOPED_CONSUMER_COUNT) +#define STAGE_SLOTS IEC104_DTU_CONSUMER_COUNT +#define DIRTY_BYTES ((STAGE_SLOTS + 7U) / 8U) static uint32_t values[VALUE_SLOTS]; -static uint32_t staged[IEC104_SOURCE_STAGE_SLOTS]; -static uint8_t dirty[IEC104_SOURCE_DIRTY_BYTES]; +static uint32_t staged[STAGE_SLOTS]; +static uint8_t dirty[DIRTY_BYTES]; #endif static IEC104_RemoteParameterRequest_t owner; static bool stage_active, stage_complete; @@ -40,7 +41,7 @@ static IEC104_ParameterPoint_t standard_points[IEC104_DTU_STANDARD_COUNT]; static IEC104_ParameterValue_t standard_values[IEC104_DTU_STANDARD_COUNT]; static uint64_t clock_utc, clock_mono; #ifndef IEC104_SOURCE_NO_VALUE_STORE -static iec104_source_change_t changes[17]; +static iec104_source_change_t changes[IEC104_DTU_CONSUMER_COUNT]; #endif static void increment(uint32_t *value) { if (*value != UINT32_MAX) { ++*value; } } static uint32_t float_bits(float v) { uint32_t b; memcpy(&b, &v, 4U); return b; } @@ -51,11 +52,10 @@ static float bits_float(uint32_t b) { float v; memcpy(&v, &b, 4U); return v; } #ifndef IEC104_SOURCE_NO_VALUE_STORE static size_t slot(size_t index, uint16_t area) { - uint16_t r; - if (area == 0U) { return iec104_source_value_rank[index]; } - r = iec104_source_scope_rank[index]; - if (r == IEC104_SOURCE_STAGE_NO_RANK) { r = 0U; } - return IEC104_SOURCE_CONFIGURED_TOTAL + (size_t)(area - 1U) * (size_t)IEC104_SOURCE_SCOPED_TOTAL + (size_t)r; + uint16_t r = iec104_dtu_parameter_rank(index, area == 0U ? 1U : 0U); + if (r == IEC104_DTU_NO_RANK) { return 0U; } /* caller only passes visible consumers */ + return area == 0U ? (size_t)r : + (size_t)IEC104_DTU_CONSUMER_COUNT + (size_t)(area - 1U) * (size_t)IEC104_DTU_SCOPED_CONSUMER_COUNT + (size_t)r; } /* 裁剪档无压缩槽位表,slot() 不参与编译。 */ #endif @@ -80,12 +80,16 @@ static bool same_owner(const IEC104_RemoteParameterRequest_t *r) /* 函数功能:判定参数是否处于已预置未固化状态(按 stage_rank 映射到位)。 */ static bool is_dirty(size_t i) { - uint16_t r = iec104_source_stage_rank[i]; - if (r == IEC104_SOURCE_STAGE_NO_RANK) { return false; } + uint16_t r = iec104_dtu_parameter_rank(i, 1U); + if (r == IEC104_DTU_NO_RANK) { return false; } return (dirty[r >> 3] & (1U << (r & 7U))) != 0U; } /* 函数功能:把参数索引换算成 staged/dirty 的密集槽位。 */ -static size_t stage_slot(size_t i) { return (size_t)iec104_source_stage_rank[i]; } +static size_t stage_slot(size_t i) +{ + uint16_t r = iec104_dtu_parameter_rank(i, 1U); + return r == IEC104_DTU_NO_RANK ? 0U : (size_t)r; +} #endif /* 函数功能:判定参数是否由完整的真实源回调对负责。 */ static bool mapped(const iec104_dtu_parameter_t *p, uint16_t area, uint16_t *id, float *scale) @@ -123,7 +127,8 @@ static bool read_bits(size_t index, uint16_t area, uint32_t *out) static bool valid_bits(size_t index, uint32_t raw) { iec104_dtu_parameter_t p; double v; - if (!iec104_dtu_parameter(index, &p) || !p.writable) { return false; } + if (!iec104_dtu_parameter(index, &p) || !p.writable || + iec104_dtu_parameter_rank(index, 1U) == IEC104_DTU_NO_RANK) { return false; } v = p.tag == 38U ? (double)bits_float(raw) : (double)raw; if (!(v >= 0.0)) { return false; } if ((p.tag == 1U && raw > 1U) || (p.tag == 45U && raw > 65535U) || @@ -149,9 +154,7 @@ static bool candidate(uint32_t ioa, uint16_t area, float *out) static bool commit_stage(uint16_t area) { size_t i, n = 0U; iec104_dtu_parameter_t p; uint16_t id; float scale; - float high, low, residual; - if (!candidate(0x8833U, area, &high) || !candidate(0x8834U, area, &low) || - !candidate(0x8835U, area, &residual) || high < low || low < residual) { return false; } + float high, low; if (area == 0U && (!candidate(0x8027U, 0U, &low) || !candidate(0x8029U, 0U, &high) || low > high)) { return false; } for (i = 0U; i < IEC104_DTU_PARAMETER_COUNT; ++i) { @@ -190,7 +193,7 @@ void iec104_source_init(void) memset(values, 0, sizeof(values)); for (i = 0U; i < IEC104_DTU_PARAMETER_COUNT; ++i) { (void)iec104_dtu_parameter(i, &p); - if (!p.configured) { continue; } + if (!p.configured || !iec104_dtu_parameter_visible(i, 0U)) { continue; } raw = initial_bits(&p); for (a = 0U; a < IEC104_DTU_AREA_COUNT; ++a) { if (iec104_dtu_parameter_visible(i, (uint16_t)a)) { values[slot(i, (uint16_t)a)] = raw; } diff --git a/App/iec60870/104/iec104_source.h b/App/iec60870/104/iec104_source.h index c4a9c976..558520cf 100644 --- a/App/iec60870/104/iec104_source.h +++ b/App/iec60870/104/iec104_source.h @@ -21,8 +21,8 @@ typedef union { IEC60870_BitString32_t bits; IEC60870_IntegratedTotalsShort_t energy; } iec104_source_object_t; -/* All 345 visible profile entries have numeric tags 1/35/38/45 and width <=4. - * Tag4 metadata remains unconfigured and invisible, never silently truncated. */ +/* The 17 accepted consumer entries have numeric tags 1/38 and width <=4. + * Every other profile row is refused, never silently truncated. */ typedef struct { uint8_t tag, length, bytes[4]; } iec104_source_value_t; typedef struct { uint16_t id; float value; } iec104_source_change_t; /* All callbacks run serially in the protocol owner. NULL means unavailable. diff --git a/App/iec60870/104/iec104_source_ranks.h b/App/iec60870/104/iec104_source_ranks.h deleted file mode 100644 index 0b569bd1..00000000 --- a/App/iec60870/104/iec104_source_ranks.h +++ /dev/null @@ -1,202 +0,0 @@ -/* 模块名称:参数值槽 rank 映射表(生成文件,勿手改)。 */ -/* GENERATED FILE - do not edit by hand. - * Source: App/iec60870/104/iec104_dtu_profile.h (const profile table). - * Generator: ci-artifacts/iec104-cutover/gen_source_ranks.py - * Design: ci-artifacts/iec104-cutover/package-b-design.md - * Include exactly once, from App/iec60870/104/iec104_source.c only. - * - * Ranks are uint16_t because the largest rank is 344 (configured) / 263 (writable), - * both above 0xFF. A uint8_t table would alias sentinel 0xFF with rank 255 and - * silently mis-map one parameter, so uint8_t is not an option here. - */ -#ifndef IEC104_SOURCE_RANKS_H -#define IEC104_SOURCE_RANKS_H - -#include - -#define IEC104_SOURCE_CONFIGURED_TOTAL 345U -#define IEC104_SOURCE_SCOPED_TOTAL 88U -#define IEC104_SOURCE_WRITABLE_TOTAL 264U -#define IEC104_SOURCE_STAGE_NO_RANK 0xFFFFU - -/* Dense value slots: configured in area 0, area_scoped in areas 1..4. */ -#define IEC104_SOURCE_VALUE_SLOTS \ - (IEC104_SOURCE_CONFIGURED_TOTAL + 4U * IEC104_SOURCE_SCOPED_TOTAL) -#define IEC104_SOURCE_STAGE_SLOTS IEC104_SOURCE_WRITABLE_TOTAL -#define IEC104_SOURCE_DIRTY_BYTES ((IEC104_SOURCE_WRITABLE_TOTAL + 7U) / 8U) - -/* rank among configured parameters -> area-0 value slot (0xFFFF = not visible) */ -static const uint16_t iec104_source_value_rank[430] = { - 0U, 1U, 2U, 3U, 4U, 5U, 6U, 7U, - 8U, 9U, 10U, 11U, 12U, 13U, 14U, 15U, - 16U, 17U, 18U, 19U, 20U, 21U, 22U, 23U, - 24U, 25U, 26U, 27U, 28U, 29U, 30U, 31U, - 32U, 33U, 34U, 35U, 36U, 37U, 38U, 39U, - 40U, 41U, 42U, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 43U, 44U, 45U, 46U, 47U, 48U, 49U, - 50U, 51U, 52U, 53U, 54U, 55U, 56U, 57U, - 58U, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 59U, - 60U, 61U, 62U, 63U, 64U, 65U, 66U, 67U, - 68U, 69U, 70U, 71U, 72U, 73U, 74U, 75U, - 76U, 77U, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 78U, 79U, - 80U, 81U, 82U, 83U, 84U, 85U, 86U, 87U, - 88U, 89U, 90U, 91U, 92U, 93U, 94U, 95U, - 96U, 97U, 98U, 99U, 100U, 101U, 102U, 103U, - 104U, 105U, 106U, 107U, 108U, 109U, 110U, 111U, - 112U, 113U, 114U, 115U, 116U, 117U, 118U, 119U, - 120U, 121U, 122U, 123U, 124U, 125U, 126U, 127U, - 128U, 129U, 130U, 131U, 132U, 133U, 134U, 135U, - 136U, 137U, 138U, 139U, 140U, 141U, 142U, 143U, - 144U, 145U, 146U, 147U, 148U, 149U, 150U, 151U, - 152U, 153U, 154U, 155U, 156U, 157U, 158U, 159U, - 160U, 161U, 162U, 163U, 164U, 165U, 166U, 167U, - 168U, 169U, 170U, 171U, 172U, 173U, 174U, 175U, - 176U, 177U, 178U, 179U, 180U, 181U, 182U, 183U, - 184U, 185U, 186U, 187U, 188U, 189U, 190U, 191U, - 192U, 193U, 194U, 195U, 196U, 197U, 198U, 199U, - 200U, 201U, 202U, 203U, 204U, 205U, 206U, 207U, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 208U, 209U, 210U, - 211U, 212U, 213U, 214U, 215U, 216U, 217U, 218U, - 219U, 220U, 221U, 222U, 223U, 224U, 225U, 226U, - 227U, 228U, 229U, 230U, 231U, 232U, 233U, 234U, - 235U, 236U, 237U, 238U, 239U, 240U, 241U, 242U, - 243U, 244U, 245U, 246U, 247U, 248U, 249U, 250U, - 251U, 252U, 253U, 254U, 255U, 256U, 257U, 258U, - 259U, 260U, 261U, 262U, 263U, 264U, 265U, 266U, - 267U, 268U, 269U, 270U, 271U, 272U, 273U, 274U, - 275U, 276U, 277U, 278U, 279U, 280U, 281U, 282U, - 283U, 284U, 285U, 286U, 287U, 288U, 289U, 290U, - 291U, 292U, 293U, 294U, 295U, 296U, 297U, 298U, - 299U, 300U, 301U, 302U, 303U, 304U, 305U, 306U, - 307U, 308U, 309U, 310U, 311U, 312U, 313U, 314U, - 315U, 316U, 317U, 318U, 319U, 320U, 321U, 322U, - 323U, 324U, 325U, 326U, 327U, 328U, 329U, 330U, - 331U, 332U, 333U, 334U, 335U, 336U, 337U, 338U, - 339U, 340U, 341U, 342U, 343U, 344U, -}; - -/* rank among area_scoped parameters -> offset inside one area bank */ -static const uint16_t iec104_source_scope_rank[430] = { - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0U, 1U, - 2U, 3U, 4U, 5U, 6U, 7U, 8U, 9U, - 10U, 11U, 12U, 13U, 14U, 15U, 16U, 17U, - 18U, 19U, 20U, 21U, 22U, 23U, 24U, 25U, - 26U, 27U, 28U, 29U, 30U, 31U, 32U, 33U, - 34U, 35U, 36U, 37U, 38U, 39U, 40U, 41U, - 42U, 43U, 44U, 45U, 46U, 47U, 48U, 49U, - 50U, 51U, 52U, 53U, 54U, 55U, 56U, 57U, - 58U, 59U, 60U, 61U, 62U, 63U, 64U, 65U, - 66U, 67U, 68U, 69U, 70U, 71U, 72U, 73U, - 74U, 75U, 76U, 77U, 78U, 79U, 80U, 81U, - 82U, 83U, 84U, 85U, 86U, 87U, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, -}; - -/* rank among writable parameters -> staged[] slot and dirty bit index */ -static const uint16_t iec104_source_stage_rank[430] = { - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0U, 1U, - 2U, 3U, 4U, 5U, 6U, 7U, 8U, 9U, - 10U, 11U, 12U, 13U, 14U, 15U, 16U, 17U, - 18U, 19U, 20U, 21U, 22U, 23U, 24U, 25U, - 26U, 27U, 28U, 29U, 30U, 31U, 32U, 33U, - 34U, 35U, 36U, 37U, 38U, 39U, 40U, 41U, - 42U, 43U, 44U, 45U, 46U, 47U, 48U, 49U, - 50U, 51U, 52U, 53U, 54U, 55U, 56U, 57U, - 58U, 59U, 60U, 61U, 62U, 63U, 64U, 65U, - 66U, 67U, 68U, 69U, 70U, 71U, 72U, 73U, - 74U, 75U, 76U, 77U, 78U, 79U, 80U, 81U, - 82U, 83U, 84U, 85U, 86U, 87U, 88U, 89U, - 90U, 91U, 92U, 93U, 94U, 95U, 96U, 97U, - 98U, 99U, 100U, 101U, 102U, 103U, 104U, 105U, - 106U, 107U, 108U, 109U, 110U, 111U, 112U, 113U, - 114U, 115U, 116U, 117U, 118U, 119U, 120U, 121U, - 122U, 123U, 124U, 125U, 126U, 127U, 128U, 129U, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 130U, 131U, 132U, 133U, 134U, 135U, 136U, 137U, - 138U, 139U, 140U, 141U, 142U, 143U, 144U, 145U, - 146U, 147U, 148U, 149U, 150U, 151U, 152U, 153U, - 154U, 155U, 156U, 157U, 158U, 159U, 160U, 161U, - 162U, 163U, 164U, 165U, 166U, 167U, 168U, 169U, - 170U, 171U, 172U, 173U, 174U, 175U, 176U, 177U, - 178U, 179U, 180U, 181U, 182U, 183U, 184U, 185U, - 186U, 187U, 188U, 189U, 190U, 191U, 192U, 193U, - 194U, 195U, 196U, 197U, 198U, 199U, 200U, 201U, - 202U, 203U, 204U, 205U, 206U, 207U, 208U, 209U, - 210U, 211U, 212U, 213U, 214U, 215U, 216U, 217U, - 218U, 219U, 220U, 221U, 222U, 223U, 224U, 225U, - 226U, 227U, 228U, 229U, 230U, 231U, 232U, 233U, - 234U, 235U, 236U, 237U, 238U, 239U, 240U, 241U, - 242U, 243U, 244U, 245U, 246U, 247U, 248U, 249U, - 250U, 251U, 252U, 253U, 254U, 255U, 256U, 257U, - 258U, 259U, 260U, 261U, 262U, 263U, -}; - -#endif /* IEC104_SOURCE_RANKS_H */ diff --git a/App/task/default_task.c b/App/task/default_task.c index 6eaf5533..cd908b11 100644 --- a/App/task/default_task.c +++ b/App/task/default_task.c @@ -544,6 +544,11 @@ static FRESULT storage_bring_up(FATFS *fs) { * 操作受 STORAGE_READY 屏障门控,屏障在本函数末尾才置位,时序天然安全 */ (void)vol_lock_init(); + /* prot_set 写事务跨任务锁:必须在内核启动后安装(kernel 前调用 + * osMutexNew 会拉死启动),且早于 STORAGE_READY/NET_READY 的任何 + * 104 远程整定或本地整定写者。创建失败保持无锁降级,不阻断存储启动。 */ + (void)prot_set_store_lock_init(); + fr = f_mount(fs, "", 1); if (fr == FR_NO_FILESYSTEM) { diff --git a/App/task/iec104_serv.c b/App/task/iec104_serv.c index 269f520f..1e468aa7 100644 --- a/App/task/iec104_serv.c +++ b/App/task/iec104_serv.c @@ -23,7 +23,7 @@ #include "adc_cal.h" /* 标定有效性:adc_cal_flags() 未标定闭锁判据 */ #include "ioboard_di.h" /* 开入快照读口(TODO 段预留,当前 s_signal 恒 false) */ #include "net_socket.h" /* net_get_generation():网络代次自愈 */ -#include "prot_set.h" /* 定值脏标志 peek(B7 落盘通知) */ +#include "prot_set.h" /* 定值语义读、批量写事务与脏标志 peek(B7 落盘通知) */ #include "run_par.h" /* 运行参数脏 peek(运行参数段落盘通知) */ #include "sys_events.h" #include "task_watchdog.h" @@ -150,6 +150,43 @@ static bool s_signal(void *ctx, uint16_t source_addr, uint8_t *value, uint8_t *q return false; } +/* 函数功能:104 定值源回调,按语义 ID 从 prot_set 实时读 Q10 工程量。 + * 入口参数:ctx - 未用;id - 语义编号(保护映射表保证有效);value - 输出值 + * 返回值:true = 读到;false = 语义号越界或模型读失败 + * 限定条件:仅 netTask(core poll 串行调用);禁止任何配置 I/O 或阻塞 + * 函数说明:ID 先按 PS_ID_COUNT 复核,再走 prot_set 的无锁一致读; + * 比例换算仍由 source 层按参数表的 source_scale 完成。 */ +static bool s_parameter_read(void *ctx, uint16_t id, float *value) +{ + (void)ctx; + if (value == NULL || id >= (uint16_t)PS_ID_COUNT) { return false; } + *value = prot_set_get_f((prot_set_id_t)id); + return true; +} + +/* 函数功能:104 定值整批 apply 回调,把语义变更翻译成 prot_set 原子事务。 + * 入口参数:ctx - 未用;v/n - 变更数组;validate_only - 只校验不提交 + * 返回值:true = 整批合法(校验阶段零副作用);false = 任一项越界/非法 + * 限定条件:仅 netTask(core poll 串行调用);禁止逐项写和阻塞等待 + * 函数说明:先拒空批与超过 17 项消费者上限的批次;栈上 17×8=136 B 的 + * prot_set_change_t 在 netTask 960 words 栈预算内可控;Q10 量化后 + * 交给 prot_set_apply_batch 一次提交,校验/提交两阶段由 source 层调用。 */ +static bool s_parameter_apply(void *ctx, const iec104_source_change_t *v, + size_t n, bool validate_only) +{ + prot_set_change_t batch[IEC104_DTU_CONSUMER_COUNT]; + size_t i; + + (void)ctx; + if (v == NULL || n == 0U || n > IEC104_DTU_CONSUMER_COUNT) { return false; } + for (i = 0U; i < n; ++i) { + if (v[i].id >= (uint16_t)PS_ID_COUNT) { return false; } + batch[i].id = (prot_set_id_t)v[i].id; + batch[i].q10 = PROT_SET_Q10(v[i].value); + } + return prot_set_apply_batch(batch, n, validate_only ? 1 : 0) == 0; +} + /* 函数功能:绑定板端数据源到 104 source(每次 core_start 成功后调用)。 * 入口参数:无 * 返回值:无 @@ -159,13 +196,13 @@ static bool s_signal(void *ctx, uint16_t source_addr, uint8_t *value, uint8_t *q * 产品侧调用点是 iec104_core.c 的 initialize_core(),由 iec104_core_start() * 每次 start 触发(网络代次变化 / poll 服务级失败都会 stop→start)。 * 若只在开机时绑一次,第一次重连后 bindings 被清零且再无人重绑, - * 主站又退回"0 + IV"且无任何日志——这是下一个接手人最容易踩的坑。 - * parameter_read/parameter_apply 两个都保持 NULL:source.h 要求成对注册, - * 而 NOSTORE 档明确禁止写,只注册 read 会破坏配对语义、掩盖参数整定不可用。 */ + * 主站又退回"0 + IV"且无任何日志。 + * 17 个消费者的 read/apply 在此成对注册:read 直读 prot_set 当前值, + * apply 只构造批量事务,持久化仍由 defaultTask 的脏标志闭环负责。 */ static void s_bind_mcu_source(void) { static const iec104_source_bindings_t bindings = { - NULL, s_measure, s_signal, NULL, NULL + NULL, s_measure, s_signal, s_parameter_read, s_parameter_apply }; iec104_source_bind(&bindings); } diff --git a/docs/内存管理/RAM使用分析与优化方案.md b/docs/内存管理/RAM使用分析与优化方案.md index 7b9cd196..b4b9dc28 100644 --- a/docs/内存管理/RAM使用分析与优化方案.md +++ b/docs/内存管理/RAM使用分析与优化方案.md @@ -47,10 +47,10 @@ dhara 失败类 +84;RO 另 +208,全是该失败类名表)→ `ER_IROM1` | 区域 | 用量 | 容量 | 占比 | |---|---|---|---| -| ER_IROM1 | 413,392 B (403.70 KB) | 1,048,576 B (1024 KB) | 39.4% | -| RW_IRAM1 | 117,304 B (114.55 KB) | 131,072 B (128 KB) | 89.5% | +| ER_IROM1 | 411,668 B (402.02 KB) | 1,048,576 B (1024 KB) | 39.3% | +| RW_IRAM1 | 113,720 B (111.05 KB) | 131,072 B (128 KB) | 86.8% | | RW_CCM | 57,376 B (56.03 KB) | 65,280 B (64 KB) | 87.9% | -| **Flash (ROM 合计)** | **416,128 B (406.4 KB)** | 1,048,576 B (1024 KB) | **39.7%** | +| **Flash (ROM 合计)** | **414,420 B (404.7 KB)** | 1,048,576 B (1024 KB) | **39.5%** | 各区的容量与常量来源: diff --git a/docs/内存管理/RAM预算台账.md b/docs/内存管理/RAM预算台账.md index 989acf5f..31b797a6 100644 --- a/docs/内存管理/RAM预算台账.md +++ b/docs/内存管理/RAM预算台账.md @@ -15,10 +15,10 @@ | 区域 | 用量 | 容量 | 占比 | 门禁(≤92%) | |---|---|---|---|---| -| ER_IROM1 (Flash) | 413,392 B | 1,048,576 B | 39.4% | 参考 | +| ER_IROM1 (Flash) | 411,668 B | 1,048,576 B | 39.3% | 参考 | | RW_CCM | 57,376 B | 65,280 B | 87.9% | PASS | | UNINIT_CCM | 48 B | 256 B | 18.8% | 参考 | -| RW_IRAM1 | 117,304 B | 131,072 B | 89.5% | PASS | +| RW_IRAM1 | 113,720 B | 131,072 B | 86.8% | PASS | | 子系统(静态 RW+ZI;除 RTOS 堆在 CCM 外均在 SRAM1) | 现值 | 配额 | 状态 | |---|---|---|---| @@ -26,7 +26,7 @@ | 存储 | 9,144 B | 12 KB | OK | | UI | 36,791 B | 16 KB | ⚠ 超 19.9 KB | | RTOS 堆 | 57,376 B | 56 KB | 堆=配额 | -| 应用 | 46,587 B | 8 KB | ⚠ 超 37.5 KB | +| 应用 | 42,999 B | 8 KB | ⚠ 超 34.0 KB | | 其它 | 10,797 B | — | 参考 | diff --git a/test/host/iec104_dtu/core_lifecycle_test.c b/test/host/iec104_dtu/core_lifecycle_test.c index 22c4cf82..e2ae4ba3 100644 --- a/test/host/iec104_dtu/core_lifecycle_test.c +++ b/test/host/iec104_dtu/core_lifecycle_test.c @@ -22,7 +22,7 @@ static bool parameter_apply(void *ctx, const iec104_source_change_t *v, size_t n { (void)ctx; (void)v; (void)n; (void)validate; ++apply_count; return true; } -static void exchange(const uint8_t *frame, size_t length, uint8_t expected_cot) +static void exchange(const uint8_t *frame, size_t length, uint8_t expected_type, uint8_t expected_cot) { size_t start = fake.sent_bytes, at; unsigned i; bool found = false; @@ -30,7 +30,7 @@ static void exchange(const uint8_t *frame, size_t length, uint8_t expected_cot) for (i = 0U; i < 20U; ++i) { turn(); } for (at = start; at + 6U <= fake.sent_bytes; at += (size_t)fake.output[at + 1U] + 2U) { CHECK(fake.output[at] == 0x68U); - if (at + 12U <= fake.sent_bytes && !(fake.output[at + 2U] & 1U) && fake.output[at + 6U] == 203U) { + if (at + 12U <= fake.sent_bytes && !(fake.output[at + 2U] & 1U) && fake.output[at + 6U] == expected_type) { CHECK(fake.output[at + 8U] == expected_cot); found = true; } } @@ -39,16 +39,23 @@ static void exchange(const uint8_t *frame, size_t length, uint8_t expected_cot) static void borrowed_failure(void) { iec104_source_bindings_t bind = {0}; - iec104_source_value_t before, after; - static const uint8_t preset[] = {0x68,19,0,0,0,0,203,1,6,17,1,0,0,0,128,0x20,0x88,0,1,1,0}; + size_t i; uint16_t area0 = 0U, area1 = 0U; + /* While real bindings are installed, the area-0 low<=high cross-check reads + * semantic id 17 (PS_OV_VOL) through parameter_read. The fake fails id 17, + * so a staged 0x8027 preset must be refused at solidify with no apply. */ + static const uint8_t preset[] = {0x68,22,0,0,0,0,203,1,6,17,1,0,0,0,128,0x27,0x80,0,38,4,0,0,200,0x42}; static const uint8_t solidify[] = {0x68,13,2,0,0,0,203,0,6,17,1,0,0,0,0}; bind.parameter_read = parameter_read; bind.parameter_apply = parameter_apply; iec104_source_bind(&bind); - CHECK(iec104_source_remote_read(0U, 0x8820U, &before)); - exchange(preset, sizeof(preset), 7U); - exchange(solidify, sizeof(solidify), 0x47U); - CHECK(iec104_source_remote_read(0U, 0x8820U, &after)); - CHECK(before.bytes[0] == after.bytes[0] && apply_count == 0U); + exchange(preset, sizeof(preset), 203U, 7U); + exchange(solidify, sizeof(solidify), 203U, 0x47U); + CHECK(apply_count == 0U); + for (i = 0U; i < IEC104_DTU_PARAMETER_COUNT; ++i) { + if (iec104_dtu_parameter_visible(i, 0U)) { ++area0; } + if (iec104_dtu_parameter_visible(i, 1U)) { ++area1; } + } + CHECK(area0 == IEC104_DTU_CONSUMER_COUNT); + CHECK(area1 == IEC104_DTU_SCOPED_CONSUMER_COUNT); } int main(void) { diff --git a/test/host/iec104_dtu/oracle.py b/test/host/iec104_dtu/oracle.py index 2c2521da..8ccec4f7 100644 --- a/test/host/iec104_dtu/oracle.py +++ b/test/host/iec104_dtu/oracle.py @@ -20,6 +20,15 @@ def reference(): parameters[int(ioa, 16)] = (int(tag), value.strip('"')) assert [len(tables[x]) for x in tables] == [59, 30, 4, 19, 430] assert len(parameters) == 345 + # Accepted consumer subset. This list is the acceptance specification and + # must match the semantic bridge map in iec104_dtu_table.c item for item. + # Every other configured profile row must be refused by the protocol layer. + consumer_ioas = frozenset(( + 0x8841, 0x8842, 0x8843, 0x8845, 0x8846, 0x8847, 0x8849, 0x884A, 0x884B, + 0x8027, 0x8028, 0x8029, 0x802A, 0x8024, 0x8025, 0x8040, 0x8041, + )) + parameters = {ioa: row for ioa, row in parameters.items() if ioa in consumer_ioas} + assert len(parameters) == 17 assert set(tables["signals"]) == set(range(1, 0x42)) - set(range(0x2C, 0x32)) assert set(tables["measurements"]) == set(range(0x4001, 0x401F)) gi = {ioa: 1 for ioa in tables["signals"]} diff --git a/test/host/iec104_dtu/run_tcp_test.py b/test/host/iec104_dtu/run_tcp_test.py index caf3698b..49d641a5 100644 --- a/test/host/iec104_dtu/run_tcp_test.py +++ b/test/host/iec104_dtu/run_tcp_test.py @@ -186,9 +186,9 @@ class Acceptance: assert self.client.response(201, 7)[9:11] == b"\x00\x00" def test_typed_preset_commit_cancel_readback(self): - addresses = (0x8820, 0x8823, 0x882D, 0x802E) + addresses = (0x8841, 0x8842, 0x8843, 0x8027) before = self.remote_read(addresses) - change = [(0x8820, 1, 0), (0x8823, 38, 8.25), (0x882D, 45, 2), (0x802E, 35, 16777217)] + change = [(0x8841, 1, 1), (0x8842, 38, 2.5), (0x8843, 38, 0.75), (0x8027, 38, 90.0)] original = [(ioa, before[ioa]["tag"], before[ioa]["value"]) for ioa in addresses] try: self.preset(change) @@ -200,6 +200,7 @@ class Acceptance: assert self.remote_read(addresses) == after, "TCP reconnect lost committed RAM values" self.preset(original) self.connect() + self.remote_read(addresses) self.finish(pn=True) assert self.remote_read(addresses) == after, "disconnected stage became active" self.preset(original) @@ -214,10 +215,10 @@ class Acceptance: def test_unknown_and_bad_typed_requests(self): self.client.request(asdu(102, u24(0xFFFFFF), cot=5)) self.client.response(102, 47, True) - for ioa in (0xFFFFFF, 0x9601): + for ioa in (0xFFFFFF, 0x9601, 0x8820, 0x8823): self.client.request(asdu(202, b"\x00\x00" + u24(ioa))) self.client.response(202, 47, True) - for value in ([(0x8820, 1, 2)], [(0x8823, 45, 8)], [(0x8823, 38, float("nan"))]): + for value in ([(0x8841, 1, 2)], [(0x8842, 45, 8)], [(0x8842, 38, float("nan"))]): self.preset(value, pn=True) self.finish(cancel=True) diff --git a/test/host/iec104_dtu/run_unit_test.py b/test/host/iec104_dtu/run_unit_test.py index 996de33a..8fd9bc4e 100644 --- a/test/host/iec104_dtu/run_unit_test.py +++ b/test/host/iec104_dtu/run_unit_test.py @@ -21,10 +21,11 @@ class WireOracleTests(unittest.TestCase): self.assertEqual(len(ref["gi"]), 225) self.assertEqual(len(ref["read"]), 121) self.assertEqual(len(ref["counters"]), 8) - self.assertEqual(len(ref["remote"]), 345) + self.assertEqual(len(ref["remote"]), 17) self.assertEqual(len(ref["diagnostic_aliases_pending_scope"]), 150) self.assertNotIn(0x9601, ref["remote"]) - self.assertEqual(ref["remote"][0x8858], (38, "25")) + self.assertNotIn(0x8858, ref["remote"]) + self.assertEqual(ref["remote"][0x8842], (38, "1.2")) def test_pn_zero_positive_and_one_negative(self): self.assertFalse(header(bytes.fromhex("64010711010000000014"))["pn"]) diff --git a/test/host/iec104_serv/iec104_serv_test.c b/test/host/iec104_serv/iec104_serv_test.c index 2563f377..2bf3a16e 100644 --- a/test/host/iec104_serv/iec104_serv_test.c +++ b/test/host/iec104_serv/iec104_serv_test.c @@ -116,6 +116,26 @@ static uint8_t g_prot_dirty, g_run_dirty; uint8_t prot_set_dirty_peek(void) { return g_prot_dirty; } uint8_t run_par_dirty_peek(void) { return g_run_dirty; } +static float g_prot_value; +static prot_set_change_t g_last_batch[PROT_SET_BATCH_MAX]; +static size_t g_last_batch_n; +static int g_last_validate_only, g_apply_batch_calls; + +float prot_set_get_f(prot_set_id_t id) +{ + (void)id; + return g_prot_value; +} +int prot_set_apply_batch(const prot_set_change_t *changes, size_t n, int validate_only) +{ + size_t i; + g_apply_batch_calls++; + g_last_batch_n = n; + g_last_validate_only = validate_only; + for (i = 0U; i < n && i < PROT_SET_BATCH_MAX; ++i) { g_last_batch[i] = changes[i]; } + return 0; +} + static int g_wd_beats; static task_wd_id_t g_last_wd; void task_wd_beat(task_wd_id_t id) { g_wd_beats++; g_last_wd = id; } @@ -139,6 +159,11 @@ static void reset_all(void) g_meas_result = 0; memset(g_cal_flags, 0, sizeof(g_cal_flags)); g_prot_dirty = g_run_dirty = 0u; + g_prot_value = 0u; + g_apply_batch_calls = 0; + g_last_batch_n = 0u; + g_last_validate_only = 0; + memset(g_last_batch, 0, sizeof(g_last_batch)); g_wd_beats = 0; g_i104_info_count = g_i104_error_count = 0; g_cfg_register_calls = g_cfg_save_calls = 0; @@ -161,6 +186,37 @@ static void reset_all(void) g_i104_info_count = g_i104_error_count = 0; } +static void tc_parameter_binding(void) +{ + iec104_source_change_t changes[2]; + float value = 0.0f; + + reset_all(); + CHECK(g_bound.parameter_read != NULL && g_bound.parameter_apply != NULL, + "parameter callbacks installed as a pair"); + g_prot_value = 12.5f; + CHECK(g_bound.parameter_read(NULL, (uint16_t)PS_ID_COUNT, &value) == false, + "out-of-range semantic id refused"); + CHECK(g_bound.parameter_read(NULL, 2u, &value) == true && value == 12.5f, + "valid semantic id reads live prot_set value"); + CHECK(g_bound.parameter_read(NULL, 2u, NULL) == false, + "null output refused"); + changes[0].id = 2u; changes[0].value = 1.25f; + changes[1].id = 3u; changes[1].value = 500.0f; + CHECK(g_bound.parameter_apply(NULL, changes, 2u, true) == true, + "validate-only batch accepted"); + CHECK(g_apply_batch_calls == 1 && g_last_batch_n == 2u && g_last_validate_only == 1, + "validate-only forwarded once without commit"); + CHECK(g_last_batch[0].id == 2u && g_last_batch[0].q10 == PROT_SET_Q10(1.25f) && + g_last_batch[1].id == 3u && g_last_batch[1].q10 == PROT_SET_Q10(500.0f), + "semantic values quantized into prot_set batch"); + CHECK(g_bound.parameter_apply(NULL, changes, 0u, false) == false, + "empty batch refused"); + CHECK(g_bound.parameter_apply(NULL, changes, 2u + IEC104_DTU_CONSUMER_COUNT, false) == false, + "over-capacity batch refused"); + CHECK(g_apply_batch_calls == 1, "rejected batches never reach prot_set"); +} + static void tc_monotonic(void) { uint32_t last = 100u, carry = 7u; @@ -381,6 +437,7 @@ int main(void) printf("=== IEC104 Service Host Unit Tests ===\n"); tc_monotonic(); tc_measure(); + tc_parameter_binding(); tc_stats_and_link(); tc_tick_control(); printf("=== IEC104 Serv Tests: %d/%d PASSED (failed=%d) ===\n", diff --git a/test/host/prot_set/prot_set_test.c b/test/host/prot_set/prot_set_test.c index df809982..625fd387 100644 --- a/test/host/prot_set/prot_set_test.c +++ b/test/host/prot_set/prot_set_test.c @@ -23,6 +23,21 @@ * TC-PROTSET-011 OF/UF 定值行(B8):40 项 / blob 版本 2 / 本地项地址 0 / * 默认值与范围 / 返回系数独立性 / 64 位 bad_mask(bit 39)/ * B7 旧档(32 项)换代拒绝 + * 批量原子写与写事务锁(104 定值下发接线): + * tc_batch_write_and_seal 整批写 3 项 → 读回 / 自检通过 / 未闭锁 / 置脏 + * tc_batch_reject_is_all_or_nothing 一项越界 → 整批拒且值区一字未改 + * tc_batch_reject_duplicate_id 同批重复 id → 拒 + * tc_batch_reject_over_limit 项数超上限 → 拒 + * tc_validate_only_has_no_side_effect 预检全合法 → 值区/脏位/锁位/钩子全不动 + * tc_validate_only_reports_bad_item 预检有越界 → 拒且全不动 + * tc_read_batch_guards 正常读回;越界 id / n 为 0 / 空指针 → 拒 + * tc_write_lock_pairs 成功写 enter/exit 各一次;预检与失败分支不进钩子 + * tc_selfcheck_tolerates_commit_window 提交窗口内自检只跳过、不误锁 + * tc_lock_uninstall 卸载钩子后仍能正常写 + * tc_selfcheck_odd_streak_failsafe 写者永久停在提交窗口内 → 8 拍宽限后闭锁 + * (fail-safe;用故意漏 exit 的缺陷写者样本驱动) + * tc_bad_mask_tracks_whole_table_only 位图只跟整表装载/解析走,增量写入 + * 既不置也不清(契约钉死) * * 通过:全部 TC PASS(main 返回 0)。 * 创建日期:2026-10-11;2026-10-12 扩 OF/UF(B8) @@ -321,6 +336,486 @@ static void tc_of_uf_meta(void) { CHECK(prot_set_selfcheck() == 0, "TC-PROTSET-011 active table intact after legacy reject"); } +/* 整表快照:值区 + 脏位 + 闭锁位("一字未改"与"零副作用"的比对基准) */ +typedef struct { + int32_t vals[PS_ID_COUNT]; + uint8_t dirty; + uint8_t locked; +} tc_snapshot_t; + +/* + * 函数功能:把当前定值状态拍成快照 + * 入口参数:s - 输出快照 + * 返 回 值:无 + */ +static void tc_snapshot(tc_snapshot_t *s) { + uint32_t i; + + for (i = 0u; i < (uint32_t)PS_ID_COUNT; i++) { + s->vals[i] = prot_set_get((prot_set_id_t)i); + } + s->dirty = prot_set_dirty_peek(); + s->locked = prot_set_locked(); +} + +/* + * 函数功能:比对两份快照是否逐字相同 + * 入口参数:a/b - 待比快照 + * 返 回 值:1 完全相同 / 0 有差异 + */ +static int tc_snapshot_same(const tc_snapshot_t *a, const tc_snapshot_t *b) { + uint32_t i; + + if ((a->dirty != b->dirty) || (a->locked != b->locked)) { + return 0; + } + for (i = 0u; i < (uint32_t)PS_ID_COUNT; i++) { + if (a->vals[i] != b->vals[i]) { + return 0; + } + } + return 1; +} + +/* 计数版写事务钩子:证明"哪条分支真的进了临界区" */ +static int s_hook_enter = 0; +static int s_hook_exit = 0; + +/* + * 函数功能:计数钩子——进入写事务 + * 入口参数:无 + * 返 回 值:无 + */ +static void tc_hook_enter(void) { + s_hook_enter++; +} + +/* + * 函数功能:计数钩子——退出写事务 + * 入口参数:无 + * 返 回 值:无 + */ +static void tc_hook_exit(void) { + s_hook_exit++; +} + +static const prot_set_lock_t s_test_lock = { tc_hook_enter, tc_hook_exit }; + +/* + * 函数功能:装钩子并清零计数 + * 入口参数:无 + * 返 回 值:无 + */ +static void tc_lock_on(void) { + s_hook_enter = 0; + s_hook_exit = 0; + prot_set_lock_install(&s_test_lock); +} + +/* 批量写:正常整批提交的闭环(值/自检/闭锁/脏位) */ +static void tc_batch_write_and_seal(void) { + prot_set_change_t chg[3]; + prot_set_id_t ids[3]; + int32_t got[3]; + + prot_set_init(); + prot_set_lock_install(0); + CHECK(prot_set_dirty_peek() == 0u, "batch write: clean table before commit"); + + chg[0].id = PS_OC1_CUR; chg[0].q10 = PROT_SET_Q10(7.5); + chg[1].id = PS_OC2_DLY; chg[1].q10 = PROT_SET_Q10(250.0); + chg[2].id = PS_GLOBAL_EN; chg[2].q10 = 0; + CHECK(prot_set_apply_batch(chg, 3u, 0) == 0, "batch write: three items committed"); + + CHECK(prot_set_get(PS_OC1_CUR) == PROT_SET_Q10(7.5), "batch write: OC1 current updated"); + CHECK(prot_set_get(PS_OC2_DLY) == PROT_SET_Q10(250.0), "batch write: OC2 delay updated"); + CHECK(prot_set_get_ctl(PS_GLOBAL_EN) == 0u, "batch write: global plate switched out"); + CHECK(prot_set_selfcheck() == 0, "batch write: selfcheck passes right after commit"); + CHECK(prot_set_locked() == 0u, "batch write: no lock after commit"); + CHECK(prot_set_dirty_peek() == 1u, "batch write: commit marks dirty for persistence"); + + ids[0] = PS_OC1_CUR; + ids[1] = PS_OC2_DLY; + ids[2] = PS_GLOBAL_EN; + CHECK(prot_set_read_batch(ids, 3u, got) == 0, "batch write: read back same three items"); + CHECK((got[0] == PROT_SET_Q10(7.5)) && (got[1] == PROT_SET_Q10(250.0)) && (got[2] == 0), + "batch write: read-back values match what was written"); +} + +/* 批量写:一项越界 → 整批拒绝且值区一字未改(all-or-nothing) */ +static void tc_batch_reject_is_all_or_nothing(void) { + prot_set_change_t chg[3]; + tc_snapshot_t before; + tc_snapshot_t after; + + prot_set_init(); + prot_set_lock_install(0); + (void)prot_set_set_sealed(PS_OC1_CUR, PROT_SET_Q10(9.0)); /* 先建立一个非默认现状 */ + (void)prot_set_dirty_take(); + tc_snapshot(&before); + + chg[0].id = PS_OC2_CUR; chg[0].q10 = PROT_SET_Q10(6.0); /* 合法 */ + chg[1].id = PS_OC3_DLY; chg[1].q10 = PROT_SET_Q10(60001.0); /* 越上限 */ + chg[2].id = PS_OL_CUR; chg[2].q10 = PROT_SET_Q10(2.0); /* 合法 */ + CHECK(prot_set_apply_batch(chg, 3u, 0) == -1, "batch reject: one bad item rejects the batch"); + + tc_snapshot(&after); + CHECK(tc_snapshot_same(&before, &after), + "batch reject: every item, dirty flag and lock state untouched"); + CHECK(prot_set_get(PS_OC1_CUR) == PROT_SET_Q10(9.0), + "batch reject: pre-existing value survives the rejected batch"); + CHECK(prot_set_selfcheck() == 0, "batch reject: table still self-consistent"); +} + +/* 批量写:同批重复编号 → 拒(语义不确定) */ +static void tc_batch_reject_duplicate_id(void) { + prot_set_change_t chg[2]; + tc_snapshot_t before; + tc_snapshot_t after; + + prot_set_init(); + prot_set_lock_install(0); + tc_snapshot(&before); + + chg[0].id = PS_OC2_CUR; chg[0].q10 = PROT_SET_Q10(6.0); + chg[1].id = PS_OC2_CUR; chg[1].q10 = PROT_SET_Q10(7.0); + CHECK(prot_set_apply_batch(chg, 2u, 0) == -1, "batch reject: duplicate id rejected"); + + tc_snapshot(&after); + CHECK(tc_snapshot_same(&before, &after), "batch reject duplicate: table untouched"); +} + +/* 批量写:项数超上限 → 拒(整表只有 40 项,批量接口不接受更多) */ +static void tc_batch_reject_over_limit(void) { + prot_set_change_t chg[PROT_SET_BATCH_MAX + 1u]; + tc_snapshot_t before; + tc_snapshot_t after; + size_t i; + + prot_set_init(); + prot_set_lock_install(0); + tc_snapshot(&before); + + for (i = 0u; i < (PROT_SET_BATCH_MAX + 1u); i++) { + chg[i].id = (prot_set_id_t)(i % (size_t)PS_ID_COUNT); + chg[i].q10 = prot_set_get(chg[i].id); /* 值全合法,只考项数 */ + } + CHECK(prot_set_apply_batch(chg, PROT_SET_BATCH_MAX + 1u, 0) == -1, + "batch reject: item count above limit rejected"); + CHECK(prot_set_apply_batch(chg, 0u, 0) == -1, "batch reject: empty batch rejected"); + CHECK(prot_set_apply_batch(0, 1u, 0) == -1, "batch reject: NULL change list rejected"); + + tc_snapshot(&after); + CHECK(tc_snapshot_same(&before, &after), "batch reject over limit: table untouched"); +} + +/* 预检(validate_only):全合法时零副作用——值区、脏位、闭锁位、钩子全不动 */ +static void tc_validate_only_has_no_side_effect(void) { + prot_set_change_t chg[2]; + tc_snapshot_t before; + tc_snapshot_t after; + + prot_set_init(); + (void)prot_set_set_sealed(PS_OC1_CUR, PROT_SET_Q10(8.0)); + (void)prot_set_dirty_take(); + tc_lock_on(); + tc_snapshot(&before); + + chg[0].id = PS_OC1_CUR; chg[0].q10 = PROT_SET_Q10(9.0); + chg[1].id = PS_UF_HZ; chg[1].q10 = PROT_SET_Q10(47.0); + CHECK(prot_set_apply_batch(chg, 2u, 1) == 0, "validate only: valid batch reported OK"); + + tc_snapshot(&after); + CHECK(tc_snapshot_same(&before, &after), + "validate only: values, dirty flag and lock state all unchanged"); + CHECK(prot_set_get(PS_OC1_CUR) == PROT_SET_Q10(8.0), + "validate only: proposed value NOT applied"); + CHECK(prot_set_get(PS_UF_HZ) == PROT_SET_Q10(49.0), + "validate only: untouched item keeps its old value"); + CHECK((s_hook_enter == 0) && (s_hook_exit == 0), + "validate only: write lock hook never entered"); + prot_set_lock_install(0); +} + +/* 预检(validate_only):有越界项 → 拒,同样全不动 */ +static void tc_validate_only_reports_bad_item(void) { + prot_set_change_t chg[2]; + tc_snapshot_t before; + tc_snapshot_t after; + + prot_set_init(); + tc_lock_on(); + tc_snapshot(&before); + + chg[0].id = PS_OC1_CUR; chg[0].q10 = PROT_SET_Q10(9.0); + chg[1].id = PS_UF_HZ; chg[1].q10 = PROT_SET_Q10(44.0); /* 低于下限 45 */ + CHECK(prot_set_apply_batch(chg, 2u, 1) == -1, "validate only: out-of-range item reported"); + + tc_snapshot(&after); + CHECK(tc_snapshot_same(&before, &after), "validate only reject: nothing changed"); + CHECK((s_hook_enter == 0) && (s_hook_exit == 0), + "validate only reject: write lock hook never entered"); + prot_set_lock_install(0); +} + +/* 批量读:正常读回;越界编号 / 零项 / 空指针 → 拒 */ +static void tc_read_batch_guards(void) { + prot_set_id_t ids[2]; + prot_set_id_t bad[1]; + int32_t got[2]; + + prot_set_init(); + (void)prot_set_set_sealed(PS_OC2_CUR, PROT_SET_Q10(6.5)); + + ids[0] = PS_OC2_CUR; + ids[1] = PS_RET_UF; + got[0] = 0; + got[1] = 0; + CHECK(prot_set_read_batch(ids, 2u, got) == 0, "read batch: two items read"); + CHECK(got[0] == PROT_SET_Q10(6.5), "read batch: first value matches"); + CHECK(got[1] == PROT_SET_Q10(1.01), "read batch: second value matches"); + + bad[0] = PS_ID_COUNT; + CHECK(prot_set_read_batch(bad, 1u, got) == -1, "read batch: out-of-range id rejected"); + CHECK(prot_set_read_batch(ids, 0u, got) == -1, "read batch: zero count rejected"); + CHECK(prot_set_read_batch(0, 2u, got) == -1, "read batch: NULL id list rejected"); + CHECK(prot_set_read_batch(ids, 2u, 0) == -1, "read batch: NULL output rejected"); +} + +/* 写事务锁:成功写 enter/exit 各一次;预检与失败分支不进钩子 */ +static void tc_write_lock_pairs(void) { + prot_set_change_t chg[2]; + int32_t tbl[PS_ID_COUNT]; + uint32_t i; + + prot_set_init(); + tc_lock_on(); + + chg[0].id = PS_OC1_CUR; chg[0].q10 = PROT_SET_Q10(7.0); + chg[1].id = PS_OL_CUR; chg[1].q10 = PROT_SET_Q10(1.2); + CHECK(prot_set_apply_batch(chg, 2u, 0) == 0, "lock pairs: batch commit succeeds"); + CHECK((s_hook_enter == 1) && (s_hook_exit == 1), + "lock pairs: batch commit enters and exits the write lock exactly once"); + + s_hook_enter = 0; + s_hook_exit = 0; + chg[0].id = PS_OC1_CUR; chg[0].q10 = PROT_SET_Q10(999.0); /* 越界 */ + CHECK(prot_set_apply_batch(chg, 1u, 0) == -1, "lock pairs: out-of-range batch rejected"); + CHECK((s_hook_enter == 0) && (s_hook_exit == 0), + "lock pairs: rejected batch never enters the write lock"); + + s_hook_enter = 0; + s_hook_exit = 0; + CHECK(prot_set_set_sealed(PS_OC2_CUR, PROT_SET_Q10(4.0)) == 0, + "lock pairs: single item write succeeds"); + CHECK((s_hook_enter == 1) && (s_hook_exit == 1), + "lock pairs: single item write enters and exits exactly once"); + + s_hook_enter = 0; + s_hook_exit = 0; + CHECK(prot_set_set_sealed(PS_ID_COUNT, 0) == -1, "lock pairs: bad id rejected"); + CHECK((s_hook_enter == 0) && (s_hook_exit == 0), + "lock pairs: rejected single write never enters the write lock"); + + for (i = 0u; i < (uint32_t)PS_ID_COUNT; i++) { + tbl[i] = prot_set_get((prot_set_id_t)i); + } + tbl[PS_OC3_CUR] = PROT_SET_Q10(3.0); + s_hook_enter = 0; + s_hook_exit = 0; + CHECK(prot_set_load_raw(tbl) == 0, "lock pairs: whole table load succeeds"); + CHECK((s_hook_enter == 1) && (s_hook_exit == 1), + "lock pairs: whole table load enters and exits exactly once"); + + s_hook_enter = 0; + s_hook_exit = 0; + tbl[PS_OC3_CUR] = PROT_SET_Q10(999.0); + CHECK(prot_set_load_raw(tbl) == -1, "lock pairs: bad table rejected"); + CHECK((s_hook_enter == 0) && (s_hook_exit == 0), + "lock pairs: rejected table load never enters the write lock"); + + prot_set_lock_install(0); +} + +/* 提交窗口内自检不得误判失配(多写者引入的安全级风险) */ +static void tc_selfcheck_tolerates_commit_window(void) { + uint32_t keep_sum; + uint32_t keep_sumn; + + prot_set_init(); + + /* 模拟"封存对已改、活跃区未交换"的窗口:这是另一写者抢占时的真实中间态, + * 巡检撞上它绝不能闭锁整台保护 */ + keep_sum = s_sum; + keep_sumn = s_sumn; + prot_write_enter(); + s_sum = prot_sum_buf(s_val[s_act]) + 1u; + s_sumn = ~s_sum; + CHECK(prot_set_selfcheck() == 0, "commit window: selfcheck skips instead of latching"); + CHECK(prot_set_locked() == 0u, "commit window: no lock latched during commit"); + s_sum = keep_sum; + s_sumn = keep_sumn; + prot_write_exit(); + CHECK(prot_set_selfcheck() == 0, "commit window: selfcheck passes once commit settles"); + + /* 无提交在飞时的真失配仍必须闭锁(防篡改语义不许被上述跳过放宽) */ + s_val[s_act][(uint32_t)PS_OC1_CUR] ^= 1u; + CHECK(prot_set_selfcheck() == -1, "tamper: real mismatch still caught when idle"); + CHECK(prot_set_locked() == 1u, "tamper: real mismatch still latches the lock"); + prot_set_init(); + CHECK(prot_set_selfcheck() == 0, "tamper: re-init clears the lock"); +} + +/* 卸载钩子后仍能正常写(模拟器 / 主机单测的单写者假设) */ +static void tc_lock_uninstall(void) { + prot_set_change_t chg[1]; + + prot_set_init(); + tc_lock_on(); + prot_set_lock_install(0); + s_hook_enter = 0; + s_hook_exit = 0; + + chg[0].id = PS_OC1_CUR; chg[0].q10 = PROT_SET_Q10(6.25); + CHECK(prot_set_apply_batch(chg, 1u, 0) == 0, "lock uninstall: batch commit works without hook"); + CHECK(prot_set_get(PS_OC1_CUR) == PROT_SET_Q10(6.25), "lock uninstall: value applied"); + CHECK(prot_set_selfcheck() == 0, "lock uninstall: table self-consistent"); + CHECK((s_hook_enter == 0) && (s_hook_exit == 0), "lock uninstall: hook not called anymore"); +} + +/* + * 缺陷写者样本:**故意**在 prot_write_enter() 之后提前 return、忘了 exit。 + * 这是 prot_set.c 里明令禁止的形态(四条真实路径都把校验放在 enter 之前), + * 但"以后有人加路径时忘了这条纪律"是真实可能——本用例用它把自检的 fail-safe + * 兜底钉死:序号一旦永久停在奇数,防篡改自检必须自己发现写者已死、置闭锁, + * 而不是永远"本轮跳过"。 + */ +static int tc_buggy_writer_early_return(const prot_set_change_t *changes, size_t n) { + uint32_t cur_act; + + prot_write_enter(); + if ((n == 0u) || (changes == 0)) { + return -1; /* 缺陷:锁内提前返回,没有 prot_write_exit() */ + } + if ((changes[0].q10 < g_prot_set_meta[changes[0].id].min) + || (changes[0].q10 > g_prot_set_meta[changes[0].id].max)) { + return -1; /* 缺陷同上 */ + } + cur_act = s_act; + prot_copy_buf(s_val[cur_act ^ 1u], s_val[cur_act]); + s_val[cur_act ^ 1u][(uint32_t)changes[0].id] = (uint32_t)changes[0].q10; + s_sum = prot_sum_buf(s_val[cur_act ^ 1u]); + s_sumn = ~s_sum; + s_locked = 0u; + s_act = (uint8_t)(cur_act ^ 1u); + s_dirty = 1u; + prot_write_exit(); + return 0; +} + +/* 自检 fail-safe:写者永久停在提交窗口内 → 有界宽限后必须闭锁 */ +static void tc_selfcheck_odd_streak_failsafe(void) { + prot_set_change_t chg[1]; + uint32_t i; + int early_ok = 1; + int all_clear = 1; + + prot_set_init(); + CHECK(prot_set_selfcheck() == 0, "odd streak: healthy table selfchecks clean"); + + /* 真实缺陷路径:enter 之后越界提前 return → 序号永久停在奇数 */ + chg[0].id = PS_OC1_CUR; + chg[0].q10 = g_prot_set_meta[PS_OC1_CUR].max + 1; + CHECK(tc_buggy_writer_early_return(chg, 1u) == -1, "odd streak: buggy writer returns -1"); + CHECK((s_seq & 1u) == 1u, "odd streak: sequence number left permanently odd"); + + /* ① 宽限期内的前 7 拍:跳过但不误锁 */ + for (i = 0u; i < (uint32_t)(PROT_SET_ODD_STREAK_MAX - 1u); i++) { + if ((prot_set_selfcheck() != 0) || (prot_set_locked() != 0u)) { + early_ok = 0; + } + } + CHECK(early_ok, "odd streak: first seven ticks skip WITHOUT latching the lock"); + + /* ② 第 8 拍起:判写者已死 → 闭锁并返回 -1 */ + CHECK(prot_set_selfcheck() == -1, "odd streak: eighth tick trips the fail-safe lock"); + CHECK(prot_set_locked() == 1u, "odd streak: fail-safe latches the protection lock"); + CHECK(prot_set_selfcheck() == -1, "odd streak: lock stays latched on later ticks"); + + /* ③ 恢复偶数(写者"复活")→ 宽限计数归零,但闭锁仍按既有语义保持到 seal/init */ + prot_write_exit(); + CHECK((s_seq & 1u) == 0u, "odd streak: sequence number back to even after recovery"); + CHECK(prot_set_selfcheck() == -1, "odd streak: lock latched until an explicit seal"); + CHECK(s_odd_streak == 0u, "odd streak: grace counter cleared once sequence settles even"); + + /* ④ fail-safe 的闭锁必须是**可恢复**的:写者恢复后走合法封存路径能解锁, + * 否则一次写者崩溃就等于设备永久报废,现场只能整机返修 */ + prot_set_seal(); + CHECK(prot_set_locked() == 0u, "odd streak: seal is the documented unlock path after a fail-safe lock"); + CHECK(prot_set_selfcheck() == 0, "odd streak: selfcheck clean after re-seal"); + + prot_set_init(); + CHECK(s_odd_streak == 0u, "odd streak: init also zeroes the grace counter"); + CHECK(prot_set_locked() == 0u, "odd streak: init clears the fail-safe lock"); + CHECK(prot_set_selfcheck() == 0, "odd streak: selfcheck healthy again after init"); + + /* 反复"撞一下立刻恢复"的健康抖动不该累积:每拍都能看到偶数就每次归零 */ + for (i = 0u; i < (uint32_t)(PROT_SET_ODD_STREAK_MAX * 3u); i++) { + prot_write_enter(); + prot_write_exit(); + if ((prot_set_selfcheck() != 0) || (prot_set_locked() != 0u)) { + all_clear = 0; + } + } + CHECK(all_clear, "odd streak: short commit windows never accumulate into a false lock"); +} + +/* 契约:bad_mask 只跟整表装载/解析走,增量写入既不置也不清 */ +static void tc_bad_mask_tracks_whole_table_only(void) { + int32_t tbl[PS_ID_COUNT]; + prot_set_change_t chg[2]; + uint64_t bad_before; + uint32_t i; + + prot_set_init(); + CHECK(prot_set_bad_mask() == 0u, "bad mask: clean after init"); + + for (i = 0u; i < (uint32_t)PS_ID_COUNT; i++) { + tbl[i] = prot_set_get((prot_set_id_t)i); + } + tbl[PS_OC3_DLY] = PROT_SET_Q10(60001.0); /* 越上限 */ + CHECK(prot_set_load_raw(tbl) == -1, "bad mask: whole-table load with a bad item rejected"); + CHECK(prot_set_bad_mask() == (1uLL << PS_OC3_DLY), + "bad mask: whole-table load reports the offending item"); + bad_before = prot_set_bad_mask(); + + /* 一笔成功的批量提交不碰位图——这是刻意契约(不是漏刷) */ + chg[0].id = PS_OC1_CUR; chg[0].q10 = PROT_SET_Q10(7.0); + chg[1].id = PS_OL_CUR; chg[1].q10 = PROT_SET_Q10(1.5); + CHECK(prot_set_apply_batch(chg, 2u, 0) == 0, "bad mask: successful batch committed"); + CHECK(prot_set_bad_mask() == bad_before, + "bad mask: successful batch leaves the stale bitmap untouched (by contract)"); + + /* 一笔失败的批量提交同样不碰位图 */ + chg[0].id = PS_OC1_CUR; chg[0].q10 = PROT_SET_Q10(999.0); + CHECK(prot_set_apply_batch(chg, 1u, 0) == -1, "bad mask: bad batch rejected"); + CHECK(prot_set_bad_mask() == bad_before, + "bad mask: failed batch does not record anything in the bitmap"); + + /* 单项写入同理 */ + CHECK(prot_set_set_sealed(PS_OC2_CUR, PROT_SET_Q10(3.0)) == 0, "bad mask: single write ok"); + CHECK(prot_set_bad_mask() == bad_before, "bad mask: single write leaves the bitmap untouched"); + + /* 只有整表操作与 init 会覆写它(用各项出厂默认值组一张必然合法的表) */ + for (i = 0u; i < (uint32_t)PS_ID_COUNT; i++) { + tbl[i] = g_prot_set_meta[i].def; + } + CHECK(prot_set_load_raw(tbl) == 0, "bad mask: all-legal table load accepted"); + CHECK(prot_set_bad_mask() == 0u, "bad mask: successful whole-table load rewrites it to clean"); + prot_set_init(); + CHECK(prot_set_bad_mask() == 0u, "bad mask: init clears it"); +} + int main(void) { printf("=== Prot Set Tests ===\n"); tc_init(); @@ -334,6 +829,18 @@ int main(void) { tc_store_roundtrip(); tc_store_corrupt(); tc_of_uf_meta(); + tc_batch_write_and_seal(); + tc_batch_reject_is_all_or_nothing(); + tc_batch_reject_duplicate_id(); + tc_batch_reject_over_limit(); + tc_validate_only_has_no_side_effect(); + tc_validate_only_reports_bad_item(); + tc_read_batch_guards(); + tc_write_lock_pairs(); + tc_selfcheck_tolerates_commit_window(); + tc_lock_uninstall(); + tc_selfcheck_odd_streak_failsafe(); + tc_bad_mask_tracks_whole_table_only(); printf("\n=== Prot Set Tests: %d/%d PASSED (failed=%d) ===\n", s_passed, s_total, s_failed); diff --git a/test/host/prot_set_store/prot_set_store_test.c b/test/host/prot_set_store/prot_set_store_test.c index fe1990bb..bcf6bdc1 100644 --- a/test/host/prot_set_store/prot_set_store_test.c +++ b/test/host/prot_set_store/prot_set_store_test.c @@ -63,6 +63,7 @@ /* 真实定值层(blob 编解码与脏标志在这里)+ 被测胶水层,均原样纳入 */ #include "prot_set.c" +#include "stub/cmsis_stub.c" #include "prot_set_store.c" /* ===================== 断言框架 ===================== */ diff --git a/test/host/prot_set_store/stub/cmsis_os2.h b/test/host/prot_set_store/stub/cmsis_os2.h new file mode 100644 index 00000000..459d596a --- /dev/null +++ b/test/host/prot_set_store/stub/cmsis_os2.h @@ -0,0 +1,23 @@ +/* Host-only stub: CMSIS-RTOS v2 mutex surface used by prot_set_store.c. + * The host build has no kernel; lock init is exercised as no-lock fallback. */ +#ifndef CMSIS_OS2_H +#define CMSIS_OS2_H + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +typedef void *osMutexId_t; +#define osWaitForever 0xFFFFFFFFU + +osMutexId_t osMutexNew(const void *attr); +uint32_t osMutexAcquire(osMutexId_t mutex_id, uint32_t timeout); +uint32_t osMutexRelease(osMutexId_t mutex_id); + +#ifdef __cplusplus +} +#endif + +#endif /* CMSIS_OS2_H */ diff --git a/test/host/prot_set_store/stub/cmsis_stub.c b/test/host/prot_set_store/stub/cmsis_stub.c new file mode 100644 index 00000000..db7f7b91 --- /dev/null +++ b/test/host/prot_set_store/stub/cmsis_stub.c @@ -0,0 +1,21 @@ +/* Host-only CMSIS mutex stub: never creates a lock, so the production + * no-lock fallback remains the exercised path in the pure host test. */ +#include "cmsis_os2.h" + +osMutexId_t osMutexNew(const void *attr) +{ + (void)attr; + return NULL; +} + +uint32_t osMutexAcquire(osMutexId_t mutex_id, uint32_t timeout) +{ + (void)mutex_id; (void)timeout; + return 0U; +} + +uint32_t osMutexRelease(osMutexId_t mutex_id) +{ + (void)mutex_id; + return 0U; +}