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] =?UTF-8?q?perf(iec104):=20TcpServer=20=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=88=B3=E9=99=8D=E5=88=B0=2032=20=E4=BD=8D=E3=80=81=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E5=B8=A7=E6=A7=BD=208=E2=86=924=EF=BC=8C=E7=9C=81=202?= =?UTF-8?q?96=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