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/CBonder.h | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/CBonder.h b/SourceCode/Bond/Servo/CBonder.h
index 4e8edcd..e9a68e0 100644
--- a/SourceCode/Bond/Servo/CBonder.h
+++ b/SourceCode/Bond/Servo/CBonder.h
@@ -22,14 +22,17 @@
virtual void getAttributeVector(CAttributeVector& attrubutes);
virtual int recvIntent(CPin* pPin, CIntent* pIntent);
virtual int onProcessData(CProcessData* pProcessData);
- virtual int onProcessStateChanged(PROCESS_STATE state);
+ virtual int onProcessStateChanged(int slotNo, PROCESS_STATE prevState, PROCESS_STATE state);
virtual int getIndexerOperationModeBaseValue();
+ virtual int parsingParams(const char* pszData, size_t size, std::vector<CParam>& parsms);
+ virtual int parsingProcessData(const char* pszData, size_t size, std::vector<CParam>& parsms);
+ virtual int parsingSVData(const char* pszData, size_t size, std::vector<CParam>& parsms);
public:
void setIndex(unsigned int index);
unsigned int getIndex();
- BOOL hasBondClass();
- BOOL hasG2Class();
+ BOOL hasBondGlass();
+ BOOL hasG2Glass();
private:
unsigned int m_nIndex;
--
Gitblit v1.9.3