From 1c080b5ca821ef6e1d40025289195b18fa2973b5 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期一, 26 一月 2026 22:46:48 +0800
Subject: [PATCH] 1.把 m_bufGlass 的释放提前到 CMaster::term()，确保在 m_glassPool.term() 之前完成，避免析构时再触碰已被回收的 Glass。析构里仍保留原逻辑，若 term() 已清空则不会重复释放。
---
SourceCode/Bond/Servo/CPin.cpp | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/SourceCode/Bond/Servo/CPin.cpp b/SourceCode/Bond/Servo/CPin.cpp
index ee11e1a..832e74a 100644
--- a/SourceCode/Bond/Servo/CPin.cpp
+++ b/SourceCode/Bond/Servo/CPin.cpp
@@ -53,7 +53,7 @@
// 返回 >= 0连接成功
int CPin::accpetConnect(CPin* pPin)
{
- assert(pPin);
+ ASSERT(pPin);
// 是否已经连接
@@ -73,7 +73,7 @@
int CPin::connectPin(CPin* pPin)
{
- assert(pPin);
+ ASSERT(pPin);
// 是否已经连接
@@ -105,26 +105,25 @@
return -1;
}
- assert(m_pConnectedPin->m_pConnectedPin == this);
+ ASSERT(m_pConnectedPin->m_pConnectedPin == this);
m_pConnectedPin->m_pConnectedPin = NULL;
m_pConnectedPin = NULL;
return 0;
}
- int CPin::sendSample(CSample* pSample)
+ int CPin::sendIntent(CIntent* pIntent)
{
if (m_pConnectedPin != NULL) {
- m_pConnectedPin->recvSample(pSample);
+ return m_pConnectedPin->recvIntent(pIntent);
}
return 0;
}
- int CPin::recvSample(CSample* pSample)
+ int CPin::recvIntent(CIntent* pIntent)
{
- assert(m_pEquipment);
- m_pEquipment->recvSample(this, pSample);
- return 0;
+ ASSERT(m_pEquipment);
+ return m_pEquipment->recvIntent(this, pIntent);
}
}
--
Gitblit v1.9.3