From 829fe6c6bc33d53fda9c31fd45a37e1df87befff Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 30 一月 2026 11:16:24 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang

---
 SourceCode/Bond/Servo/HsmsAction.cpp |   77 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 76 insertions(+), 1 deletions(-)

diff --git a/SourceCode/Bond/Servo/HsmsAction.cpp b/SourceCode/Bond/Servo/HsmsAction.cpp
index fb85224..1257696 100644
--- a/SourceCode/Bond/Servo/HsmsAction.cpp
+++ b/SourceCode/Bond/Servo/HsmsAction.cpp
@@ -9,6 +9,7 @@
 	m_nTimeout = 45;
 	m_nResponseTime = 0;
 	m_pContext = NULL;
+	m_pSendMessage = NULL;
 	m_hEvent = ::CreateEvent(NULL, TRUE, FALSE, NULL);
 }
 
@@ -19,6 +20,7 @@
 	m_nTimeout = nTimeout;
 	m_nResponseTime = 0;
 	m_pContext = NULL;
+	m_pSendMessage = NULL;
 	m_hEvent = ::CreateEvent(NULL, TRUE, FALSE, NULL);
 }
 
@@ -41,6 +43,10 @@
 	m_bNeedWaitReply = FALSE;
 	m_nTimeout = 45;
 	m_nResponseTime = 0;
+	if (m_pSendMessage != NULL) {
+		HSMS_Destroy1Message(m_pSendMessage);
+		m_pSendMessage = NULL;
+	}
 	::ResetEvent(m_hEvent);
 }
 
@@ -73,6 +79,9 @@
 
 void CHsmsAction::setSendMessage(IMessage* pMessage)
 {
+	if (m_pSendMessage != NULL && m_pSendMessage != pMessage) {
+		HSMS_Destroy1Message(m_pSendMessage);
+	}
 	m_pSendMessage = pMessage;
 }
 
@@ -104,6 +113,72 @@
 BOOL CHsmsAction::incrementAndCheckTimeout()
 {
 	unsigned int nResponseTime = InterlockedIncrement(&m_nResponseTime);
-	return nResponseTime >= m_nTimeout;
+	return nResponseTime >= m_nTimeout + 1;
+}
+
+int CHsmsAction::serialize(char* pszBuffer, int nBufferSize)
+{
+	int index = 0;
+	if (m_pSendMessage == NULL) {
+		return 0;
+	}
+	if (pszBuffer == nullptr) {
+		index += sizeof(int);
+		index += sizeof(m_nTimeout);
+		index += sizeof(int);
+		index += sizeof(BOOL);
+		index += m_pSendMessage->serialize(nullptr, 0);
+
+		return index;
+	}
+	else {
+		memcpy(&pszBuffer[index], &m_nAction, sizeof(int));
+		index += sizeof(int);
+
+		memcpy(&pszBuffer[index], &m_nTimeout, sizeof(int));
+		index += sizeof(int);
+
+		memcpy(&pszBuffer[index], &m_nResponseTime, sizeof(int));
+		index += sizeof(int);
+
+		memcpy(&pszBuffer[index], &m_bNeedWaitReply, sizeof(BOOL));
+		index += sizeof(BOOL);
+
+		index += m_pSendMessage->serialize(&pszBuffer[index], nBufferSize - index);
+
+		return index;
+	}
+}
+
+int CHsmsAction::unserialize(const char* pszBuffer, int nBufferSize)
+{
+	int index = 0;
+	if (index + sizeof(int) > nBufferSize) return -1;
+	memcpy(&m_nAction, &pszBuffer[index], sizeof(int));
+	index += sizeof(int);
+
+	if (index + sizeof(int) > nBufferSize) return -1;
+	memcpy(&m_nTimeout, &pszBuffer[index], sizeof(int));
+	index += sizeof(int);
+
+	if (index + sizeof(int) > nBufferSize) return -1;
+	memcpy(&m_nResponseTime, &pszBuffer[index], sizeof(int));
+	index += sizeof(int);
+
+	if (index + sizeof(BOOL) > nBufferSize) return -1;
+	memcpy(&m_bNeedWaitReply, &pszBuffer[index], sizeof(BOOL));
+	index += sizeof(BOOL);
+
+	if (m_pSendMessage != NULL) {
+		HSMS_Destroy1Message(m_pSendMessage);
+		m_pSendMessage = NULL;
+	}
+	if (HSMS_Create1Message(m_pSendMessage, 1, 1 | REPLY, 1, 1) != 0 || m_pSendMessage == NULL) {
+		return -1;
+	}
+	int nRet = m_pSendMessage->unserialize(&pszBuffer[index], nBufferSize - index);
+	if (nRet < 0) return nRet;
+
+	return index + nRet;
 }
 

--
Gitblit v1.9.3