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

dev: zmq hwm rebind (#1480)
Build on RHEL9 docker image / build (push) Successful in 5m3s
Details
Build on RHEL8 docker image / build (push) Successful in 5m43s
Details
Build and Deploy on local RHEL9 / build (push) Successful in 2m18s
Details
Build and Deploy on local RHEL8 / build (push) Successful in 5m5s
Details
Run Simulator Tests on local RHEL9 / build (push) Successful in 20m8s
Details
Run Simulator Tests on local RHEL8 / build (push) Successful in 23m45s
Details

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-07-21 15:45:56 +02:00
committed by GitHub
co-authored by mazzol_a
parent 7db947e4d2
commit 8a87c83615
13 changed files with 227 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
slsDetectorSoftware/src/Detector.cpp
+18 -6
View File
@@ -1096,28 +1096,35 @@ void Detector::setNumberofUDPInterfaces_(int n) {
if (!size()) {
throw RuntimeError("No modules added.");
}
bool previouslyClientStreaming = pimpl->getDataStreamingToClient();
uint16_t clientStartingPort = getClientZmqPort({0}).squash(0);
// get starting ports and disable zmq streaming
// rx
bool useReceiver = getUseReceiverFlag().squash(false);
bool previouslyReceiverStreaming = false;
uint16_t rxStartingPort = 0;
if (useReceiver) {
previouslyReceiverStreaming = getRxZmqDataStream().squash(true);
setRxZmqDataStream(false);
rxStartingPort = getRxZmqPort({0}).squash(0);
}
// client
bool previouslyClientStreaming = pimpl->getDataStreamingToClient();
uint16_t clientStartingPort = getClientZmqPort({0}).squash(0);
pimpl->setDataStreamingToClient(false);
pimpl->Parallel(&Module::setNumberofUDPInterfaces, {}, n);
// ensure receiver zmq socket ports are multiplied by 2 (2 interfaces)
setClientZmqPort(clientStartingPort, -1);
if (getUseReceiverFlag().squash(false)) {
if (useReceiver) {
setRxZmqPort(rxStartingPort, -1);
}
// redo the zmq sockets if enabled
if (previouslyClientStreaming) {
pimpl->setDataStreamingToClient(false);
pimpl->setDataStreamingToClient(true);
}
if (previouslyReceiverStreaming) {
setRxZmqDataStream(false);
if (useReceiver && previouslyReceiverStreaming) {
setRxZmqDataStream(true);
}
}
@@ -1638,7 +1645,12 @@ void Detector::setClientZmqIp(const IpAddr ip, Positions pos) {
int Detector::getClientZmqHwm() const { return pimpl->getClientStreamingHwm(); }
void Detector::setClientZmqHwm(const int limit) {
bool previouslyClientStreaming = pimpl->getDataStreamingToClient();
pimpl->setClientStreamingHwm(limit);
if (previouslyClientStreaming) {
pimpl->setDataStreamingToClient(false);
pimpl->setDataStreamingToClient(true);
}
}
Result<int> Detector::getRxZmqHwm(Positions pos) const {