75e401f0e5
Build Packages / Unit tests (push) Successful in 1h31m59s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 8m43s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 10m5s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 9m27s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 8m56s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 9m24s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 10m27s
Build Packages / build:rpm (rocky8) (push) Successful in 9m20s
Build Packages / build:rpm (rocky9) (push) Successful in 10m50s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 9m54s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 8m38s
Build Packages / DIALS test (push) Successful in 12m13s
Build Packages / XDS test (durin plugin) (push) Successful in 7m8s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 7m8s
Build Packages / XDS test (neggia plugin) (push) Successful in 7m50s
Build Packages / Generate python client (push) Successful in 16s
Build Packages / Build documentation (push) Successful in 50s
Build Packages / Create release (push) Skipped
This is an UNSTABLE release. It includes many experimental features, as well as many AI generated fixes. We recommend using rc.152 for production use. * jfjoch_broker: Add EXPERIMENTAL pixelrefine mode for image processing * jfjoch_broker: Allow to load user mask from 8-bit and 16-bit TIFF files * jfjoch_broker: Add ROI calculation in non-FPGA workflow * jfjoch_broker: Fixes to TCP image pusher * jfjoch_broker: Remove NUMA bindings * jfjoch_broker: Improvements to indexing * jfjoch_broker: For PSI EIGER, trimming energies are taken from the detector configuration (now compulsory) instead of hardcoded values * jfjoch_writer: Save ROI definitions and the per-pixel ROI bitmap in the master file; azimuthal ROIs support phi (angular) sectors * jfjoch_viewer: Major redesign with dockable panels and saved layouts, plus on-canvas creation/move/resize of box, circle and azimuthal ROIs * jfjoch_viewer: Run jfjoch_process reprocessing jobs from inside the GUI and overlay per-run results Reviewed-on: #63
62 lines
1.9 KiB
C++
62 lines
1.9 KiB
C++
// SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#pragma once
|
|
|
|
#include <thread>
|
|
#include <atomic>
|
|
#include <mutex>
|
|
#include <memory>
|
|
#include "ImagePuller.h"
|
|
#include "../common/Logger.h"
|
|
#include "../common/ThreadSafeFIFO.h"
|
|
|
|
class TCPImagePuller : public ImagePuller {
|
|
int fd = -1;
|
|
std::mutex fd_mutex;
|
|
|
|
std::string addr;
|
|
std::string host;
|
|
uint16_t port = 0;
|
|
std::optional<int32_t> receive_buffer_size;
|
|
std::atomic<bool> disconnect{false};
|
|
|
|
ThreadSafeFIFO<ImagePullerOutput> cbor_fifo{200};
|
|
ThreadSafeFIFO<ImagePullerOutput> repub_fifo{200};
|
|
|
|
std::unique_ptr<ZMQSocket> repub_socket;
|
|
|
|
std::thread receiver_thread;
|
|
std::thread cbor_thread;
|
|
std::thread repub_thread;
|
|
std::thread heartbeat_thread;
|
|
|
|
// Serializes all writer->pusher sends (ACKs, keepalive pongs, busy heartbeats)
|
|
// so that concurrently-sent frames cannot interleave on the socket.
|
|
std::mutex send_mutex;
|
|
|
|
Logger logger{"TCPImagePuller"};
|
|
|
|
static constexpr uint32_t default_repub_watermark = 220;
|
|
static constexpr auto RepubTimeout = std::chrono::milliseconds(100);
|
|
static constexpr auto HeartbeatInterval = std::chrono::milliseconds(250);
|
|
|
|
bool ReadExact(void *buf, size_t size);
|
|
bool SendAll(const void *buf, size_t len);
|
|
bool EnsureConnected();
|
|
void CloseSocket();
|
|
void ReceiverThread();
|
|
void CBORThread();
|
|
void RepubThread();
|
|
void HeartbeatThread();
|
|
public:
|
|
explicit TCPImagePuller(const std::string &tcp_addr,
|
|
std::optional<int32_t> rcv_buffer_size = {},
|
|
const std::string &repub_address = "",
|
|
const std::optional<int32_t> &repub_watermark = {});
|
|
|
|
~TCPImagePuller() override;
|
|
bool SupportsAck() const override { return true; }
|
|
bool SendAck(const PullerAckMessage &ack) override;
|
|
void Disconnect() override;
|
|
}; |