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/CEqReadStep.h | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEqReadStep.h b/SourceCode/Bond/Servo/CEqReadStep.h
index fa9a2b3..bab69cd 100644
--- a/SourceCode/Bond/Servo/CEqReadStep.h
+++ b/SourceCode/Bond/Servo/CEqReadStep.h
@@ -3,7 +3,7 @@
#include <functional>
-#define READ_BUFFER_MAX 1024
+#define READ_BUFFER_MAX 2048
#define ROK 0 /* 读数据OK */
#define RTIMEOUT -1 /* 读数据超时 */
@@ -11,14 +11,14 @@
#define RCOMPLETE 1 /* 读数据流程完成 */
namespace SERVO {
- typedef std::function<int(int code, const char* pszData, size_t size)> ONREAD;
+ typedef std::function<int(void* pFrom, int code, const char* pszData, size_t size)> ONREAD;
class CEqReadStep : public CReadStep
{
public:
CEqReadStep();
CEqReadStep(int dev, size_t readSize, ONREAD onReadBlock);
- ~CEqReadStep();
+ virtual ~CEqReadStep();
public:
virtual void getAttributeVector(CAttributeVector& attrubutes);
--
Gitblit v1.9.3