Files
Jungfraujoch/image_pusher/ZMQStream2PusherSocket.cpp
leonarski_f f3e0a15d26
All checks were successful
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 10m51s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 8m0s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 9m6s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 10m7s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 9m47s
Build Packages / Generate python client (push) Successful in 29s
Build Packages / Build documentation (push) Successful in 43s
Build Packages / Create release (push) Has been skipped
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 10m46s
Build Packages / build:rpm (rocky8) (push) Successful in 9m33s
Build Packages / Unit tests (push) Has been skipped
Build Packages / build:rpm (ubuntu2204) (push) Successful in 8m47s
Build Packages / build:rpm (rocky9) (push) Successful in 9m55s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 9m4s
v1.0.0-rc.127 (#34)
This is an UNSTABLE release. The release has significant modifications and bug fixes, if things go wrong, it is better to revert to 1.0.0-rc.124.

* jfjoch_broker: Default EIGER readout time is 20 microseconds
* jfjoch_broker: Multiple improvements regarding performance
* jfjoch_broker: Image buffer allows to track frames in preparation and sending
* jfjoch_broker: Dedicated thread for ZeroMQ transmission to better utilize the image buffer
* jfjoch_broker: Experimental implementation of transmission with raw TCP/IP sockets
* jfjoch_writer: Fixes regarding properly closing files in long data collections
* jfjoch_process: Scale & merge has been significantly improved, but it is not yet integrated into mainstream code

Reviewed-on: #34
2026-03-02 15:57:12 +01:00

72 lines
2.4 KiB
C++

// SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
// SPDX-License-Identifier: GPL-3.0-only
#include "ZMQStream2PusherSocket.h"
void zmq_socket_free(void *data, void *hint) {
auto z = (ZeroCopyReturnValue *) hint;
z->release();
}
ZMQStream2PusherSocket::ZMQStream2PusherSocket(const std::string &addr,
std::optional<int32_t> send_buffer_high_watermark,
std::optional<int32_t> send_buffer_size)
: s(ZMQSocketType::Push) {
if (send_buffer_size)
s.SendBufferSize(send_buffer_size.value());
if (send_buffer_high_watermark)
s.SendWaterMark(send_buffer_high_watermark.value());
s.SendTimeout(std::chrono::seconds(1)); // 1 second should be more than enough to flush buffers and to still give fast response
s.Bind(addr);
}
std::string ZMQStream2PusherSocket::GetEndpointName() {
return s.GetEndpointName();
}
bool ZMQStream2PusherSocket::Send(const uint8_t *data, size_t size) {
std::unique_lock ul(m);
return s.Send(data, size, true);
}
void ZMQStream2PusherSocket::StartWriterThread() {
std::unique_lock ul(m);
send_future = std::async(std::launch::async, &ZMQStream2PusherSocket::WriterThread, this);
active = true;
}
void ZMQStream2PusherSocket::StopWriterThread() {
std::unique_lock ul(m);
if (!active)
return; // Not active so no need to stop anything
active = false;
if (send_future.valid()) {
queue.PutBlocking({.end = true});
send_future.get();
} else
throw JFJochException(JFJochExceptionCategory::WrongDAQState, "Image pusher wasn't sending images");
}
void ZMQStream2PusherSocket::WriterThread() {
bool transmission_error = false;
ImagePusherQueueElement e = queue.GetBlocking();
while (!e.end) {
// When hitting timeout on SendZeroCopy consider it a transmission error and switch to non-blocking communication
bool blocking_send = !transmission_error;
if (!s.SendZeroCopy(e.z->GetImage(), e.z->GetImageSize(), zmq_socket_free, e.z, blocking_send))
transmission_error = true;
e = queue.GetBlocking();
}
}
void ZMQStream2PusherSocket::SendImage(ZeroCopyReturnValue &z) {
queue.PutBlocking(ImagePusherQueueElement{
.image_data = static_cast<uint8_t *>(z.GetImage()),
.z = &z,
.end = false
});
}