detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-08-07 23:32:30 +02:00
Code Issues Actions Packages Releases Activity

dev: zmq hwm rebind (#1480)

Browse Source 
* move hwm into the zmq constructor and reconstruct the socket instead of rebind. seems to work better than rebind (most connections cant bind so fast?)

* fix after merge

* added tests to reconnect zmq sockets when setting rx zmqport and rx zmqhwm, changed the tests scripts a bit to make the receiver starting tcp port configurable

* tests: slsreceiver also starting up  with 2000 as default tcp port, using latest cli args for receiver and multi receiver

* releasr notes

---------

Co-authored-by: AliceMazzoleni99 <alice.mazzoleni@psi.ch>
This commit is contained in:
maliakal_d
2026-08-03 09:34:57 +02:00
committed by mazzol_a
co-authored by mazzol_a
parent 3a780271c6
commit 9c0bfe3517
13 changed files with 231 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
slsDetectorSoftware/src/DetectorImpl.cpp
+5 -30
View File
@@ -470,22 +470,13 @@ void DetectorImpl::createReceivingDataSockets() {
size_t numSockets = modules.size() * numUDPInterfaces;
for (size_t iSocket = 0; iSocket < numSockets; ++iSocket) {
uint32_t portnum =
(modules[iSocket / numUDPInterfaces]->getClientStreamingPort());
auto imod = iSocket / numUDPInterfaces;
uint32_t portnum = modules[imod]->getClientStreamingPort();
portnum += (iSocket % numUDPInterfaces);
try {
auto ip = modules[imod]->getClientStreamingIP().str();
zmqSocket.push_back(
make_unique<ZmqSocket>(modules[iSocket / numUDPInterfaces]
->getClientStreamingIP()
.str()
.c_str(),
portnum));
// set high water mark
int hwm = shm()->zmqHwm;
if (hwm >= 0) {
zmqSocket[iSocket]->SetReceiveHighWaterMark(hwm);
// need not reconnect. cannot be connected (detector idle)
}
make_unique<ZmqSocket>(ip.c_str(), portnum, shm()->zmqHwm));
LOG(logINFO) << "Zmq Client[" << iSocket << "] at "
<< zmqSocket.back()->GetZmqServerAddress() << "[hwm: "
<< zmqSocket.back()->GetReceiveHighWaterMark() << "]";
@@ -1064,23 +1055,7 @@ void DetectorImpl::setClientStreamingHwm(const int limit) {
}
// update shm
shm()->zmqHwm = limit;
// streaming enabled
if (client_downstream) {
// custom limit, set it directly
if (limit >= 0) {
for (auto &it : zmqSocket) {
it->SetReceiveHighWaterMark(limit);
// need not reconnect. cannot be connected (detector idle)
}
LOG(logINFO) << "Setting Client Zmq socket rcv hwm to " << limit;
}
// default, disable and enable to get default
else {
setDataStreamingToClient(false);
setDataStreamingToClient(true);
}
}
LOG(logINFO) << "Setting Client Zmq socket rcv hwm to " << limit;
}
void DetectorImpl::registerAcquisitionFinishedCallback(void (*func)(double, int,