From 0026ea3b1a6588f3e40b8276162f54b2a22bc7ae Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期一, 19 一月 2026 14:32:27 +0800
Subject: [PATCH] 1.修复 ： 多 PJ 支持仍是单槽实现：isProcessJobsEmpty/validate 仍只允许 1 个 PJ/CJ；Host 一次下多 PJ 或运行中追加 PJ 会被拒绝/无明确反馈。需要：协议上明示只支持 1，或补齐 ACK/NAK 与队列管理、PJobSpace 动态更新。
---
SourceCode/Bond/Servo/CSlot.cpp | 54 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 49 insertions(+), 5 deletions(-)
diff --git a/SourceCode/Bond/Servo/CSlot.cpp b/SourceCode/Bond/Servo/CSlot.cpp
index 74a1e57..629f7ac 100644
--- a/SourceCode/Bond/Servo/CSlot.cpp
+++ b/SourceCode/Bond/Servo/CSlot.cpp
@@ -10,11 +10,17 @@
m_pContext = nullptr;
m_bEnable = FALSE;
m_bLock = FALSE;
+ m_pContext = nullptr;
+ m_pTempContext = nullptr;
+ m_nLinkSignalPath = 0;
}
CSlot::~CSlot()
{
-
+ if (m_pContext != nullptr) {
+ m_pContext->release();
+ m_pContext = nullptr;
+ }
}
BOOL CSlot::isEnable()
@@ -92,23 +98,61 @@
return m_pContext == nullptr;
}
+ void CSlot::setContext(CContext* pContext)
+ {
+ if (m_pContext != nullptr) {
+ m_pContext->release();
+ }
+
+ m_pContext = pContext;
+ if (m_pContext != nullptr) {
+ m_pContext->addRef();
+ }
+ }
+
CContext* CSlot::getContext()
{
return m_pContext;
}
- void CSlot::setContext(CContext* pContext)
+ CContext* CSlot::getTempContext()
{
- m_pContext = pContext;
+ return m_pTempContext;
+ }
+
+ void CSlot::setLinkSignalPath(int path)
+ {
+ m_nLinkSignalPath = path;
+ }
+
+ int CSlot::getLinkSignalPath()
+ {
+ return m_nLinkSignalPath;
}
void CSlot::serialize(CArchive& ar)
{
if (ar.IsStoring()) {
-
+ ar << (__int64)m_pContext;
+ ar << m_bLock;
}
else {
-
+ __int64 i64;
+ ar >> i64; m_pTempContext = (CContext*)i64;
+ ar >> m_bLock;
}
}
+
+ void CSlot::WriteString(CArchive& ar, std::string& string)
+ {
+ CString strTemp = string.c_str();
+ ar << strTemp;
+ }
+
+ void CSlot::ReadString(CArchive& ar, std::string& string)
+ {
+ CString strTemp;
+ ar >> strTemp;
+ string = (LPTSTR)(LPCTSTR)strTemp;
+ }
}
--
Gitblit v1.9.3