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/CArm.cpp | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/CArm.cpp b/SourceCode/Bond/Servo/CArm.cpp
index 7ca9be1..c257753 100644
--- a/SourceCode/Bond/Servo/CArm.cpp
+++ b/SourceCode/Bond/Servo/CArm.cpp
@@ -102,4 +102,33 @@
return 0;
}
+
+ int CArm::glassUpdateJobDataS(CJobDataS* pJobDataS)
+ {
+ ASSERT(pJobDataS);
+
+ Lock();
+ CGlass* pGlass = (CGlass*)m_slot[0].getContext();
+ if (pGlass == nullptr) {
+ Unlock();
+ LOGE("<CArm>glassUpdateJobDataS失败，找不到对应的Glass");
+ return -1;
+ }
+
+ CJobDataS* pSrcJs = pGlass->getJobDataS();
+ if (pSrcJs->getCassetteSequenceNo() != pJobDataS->getCassetteSequenceNo()
+ || pSrcJs->getJobSequenceNo() != pJobDataS->getJobSequenceNo()) {
+ Unlock();
+ LOGE("<CArm>glassUpdateJobDataS失败，CassetteNo不匹配([%d,%d] != [%d,%d])",
+ pSrcJs->getCassetteSequenceNo(),
+ pJobDataS->getCassetteSequenceNo(),
+ pSrcJs->getJobSequenceNo(),
+ pJobDataS->getJobSequenceNo());
+ return -2;
+ }
+
+ pGlass->updateJobDataS(pJobDataS);
+ Unlock();
+ return 0;
+ }
}
--
Gitblit v1.9.3