Build Packages / build:viewer-tgz:cpu (push) Successful in 8m7s
Build Packages / build:viewer-tgz:cuda (push) Successful in 9m39s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 13m6s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 13m34s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 13m59s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 14m12s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 14m12s
Build Packages / build:windows:nocuda (push) Failing after 15m5s
Build Packages / build:windows:cuda (push) Failing after 15m22s
Build Packages / build:windows:nocuda (pull_request) Failing after 1m26s
Build Packages / build:windows:cuda (pull_request) Failing after 1m11s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 12m30s
Build Packages / build:rpm (rocky8) (push) Successful in 11m17s
Build Packages / XDS test (durin plugin) (push) Successful in 7m18s
Build Packages / Generate python client (push) Successful in 29s
Build Packages / Build documentation (push) Successful in 1m9s
Build Packages / Create release (push) Skipped
Build Packages / build:rpm (ubuntu2404) (push) Successful in 12m26s
Build Packages / build:rpm (rocky9) (push) Successful in 13m29s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 13m23s
Build Packages / DIALS test (push) Successful in 14m21s
Build Packages / XDS test (neggia plugin) (push) Successful in 7m48s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 8m51s
Build Packages / build:viewer-tgz:cpu (pull_request) Successful in 5m56s
Build Packages / build:viewer-tgz:cuda (pull_request) Successful in 6m35s
Build Packages / build:rpm (rocky8_nocuda) (pull_request) Successful in 10m28s
Build Packages / build:rpm (ubuntu2204_nocuda) (pull_request) Successful in 9m26s
Build Packages / build:rpm (ubuntu2404_nocuda) (pull_request) Successful in 9m24s
Build Packages / build:rpm (rocky9_nocuda) (pull_request) Successful in 10m40s
Build Packages / build:rpm (rocky8_sls9) (pull_request) Successful in 10m40s
Build Packages / build:rpm (rocky9_sls9) (pull_request) Successful in 11m34s
Build Packages / build:rpm (rocky8) (pull_request) Successful in 10m31s
Build Packages / build:rpm (rocky9) (pull_request) Successful in 11m35s
Build Packages / build:rpm (ubuntu2404) (pull_request) Successful in 10m35s
Build Packages / build:rpm (ubuntu2204) (pull_request) Successful in 11m9s
Build Packages / Generate python client (pull_request) Successful in 18s
Build Packages / Create release (pull_request) Skipped
Build Packages / Build documentation (pull_request) Successful in 49s
Build Packages / XDS test (durin plugin) (pull_request) Successful in 7m50s
Build Packages / XDS test (JFJoch plugin) (pull_request) Successful in 7m11s
Build Packages / DIALS test (pull_request) Successful in 12m11s
Build Packages / XDS test (neggia plugin) (pull_request) Successful in 6m15s
Build Packages / Unit tests (push) Successful in 2h0m45s
Build Packages / Unit tests (pull_request) Successful in 1h39m47s
JFJochHttpReader::Request previously did curl_easy_init()/curl_easy_cleanup() around every call, which destroys the handle's connection cache -- so each request reconnected from scratch (full TCP + TLS handshake, and a fresh Negotiate/Kerberos round-trip once auth is on). Keep one persistent easy handle instead: create it lazily on the first request (i.e. as soon as an address is selected via ReadURL) and reuse it, calling curl_easy_reset between requests. reset clears the previous request's options but deliberately keeps the live connection and DNS/TLS-session caches, so a same-host request reuses the open socket; if that socket has been closed (idle timeout, server session limit, broker restart) libcurl reconnects and retries on its own -- no manual reconnect logic needed. The handle is torn down on disconnect (Close), when a new address is selected (ReadURL), and in the destructor. Access is serialised by a dedicated leaf mutex, since a single easy handle must not be used from two threads at once. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
83 lines
3.5 KiB
C++
83 lines
3.5 KiB
C++
// SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#pragma once
|
|
|
|
#include <curl/curl.h>
|
|
|
|
#include "../reader/JFJochReader.h"
|
|
#include "../common/BrokerStatus.h"
|
|
#include "../common/ImageBuffer.h"
|
|
#include "../common/ROIDefinition.h"
|
|
|
|
class JFJochHttpReader : public JFJochReader {
|
|
mutable std::mutex http_mutex;
|
|
std::string addr;
|
|
|
|
// Persistent libcurl handle: created lazily on the first request (i.e. as soon as an address
|
|
// is selected) and then reused for every subsequent request so the TCP/TLS connection is kept
|
|
// alive. libcurl transparently reopens the connection if it was dropped (idle timeout,
|
|
// server-side session limit, ...). curl_mutex serialises access because a single easy handle
|
|
// must never be used from two threads at once; it is a leaf lock (nothing else is taken while
|
|
// it is held), so it cannot deadlock with http_mutex.
|
|
mutable std::mutex curl_mutex;
|
|
mutable CURL *curl_handle = nullptr;
|
|
|
|
std::optional<int64_t> last_image_buffer_counter;
|
|
bool last_op_http_sync = false;
|
|
|
|
// Cache of the (constant-per-acquisition) pixel mask, keyed on arm date, so the per-refresh
|
|
// dataset rebuild reuses one shared mask instead of reconstructing it every tick.
|
|
std::shared_ptr<const PixelMask> cached_pixel_mask;
|
|
std::string cached_pixel_mask_arm_date;
|
|
|
|
// Minimal HTTP result: whether a response arrived (transport-level success), the HTTP status
|
|
// code, and the (possibly binary) response body.
|
|
struct HttpResult {
|
|
bool ok = false;
|
|
long status = 0;
|
|
std::string body;
|
|
};
|
|
// Single libcurl request helper behind every endpoint call. method is "GET" or "PUT"; for PUT
|
|
// the body is sent with the given content_type.
|
|
HttpResult Request(const std::string &method, const std::string &path,
|
|
const std::string &body = {}, const std::string &content_type = {}) const;
|
|
|
|
// Tear down the persistent connection (on disconnect, when a new address is selected, and in
|
|
// the destructor); the next Request transparently re-opens it.
|
|
void ResetConnection() const;
|
|
|
|
ImageBufferStatus GetImageBufferStatus() const;
|
|
|
|
bool LoadImage_i(std::shared_ptr<JFJochReaderDataset> &dataset,
|
|
DataMessage& message,
|
|
std::vector<uint8_t> &buffer,
|
|
int64_t image_number,
|
|
bool update_dataset) override;
|
|
std::shared_ptr<JFJochReaderDataset> UpdateDataset_i();
|
|
std::vector<float> GetPlot_i(const std::string &plot_type, float fill_value = 0.0) const;
|
|
public:
|
|
~JFJochHttpReader() override;
|
|
|
|
void ReadURL(const std::string& url);
|
|
uint64_t GetNumberOfImages() const override;
|
|
void Close() override;
|
|
|
|
// Refresh dataset/plots if the image buffer changed since the last poll (returns nullptr if
|
|
// unchanged). Always writes the current number of images to num_images_out. Does not load an image.
|
|
std::shared_ptr<const JFJochReaderDataset> RefreshDatasetIfChanged(int64_t &num_images_out);
|
|
|
|
void UploadUserMask(const std::vector<uint32_t>& mask);
|
|
|
|
[[nodiscard]] ROIDefinition GetROIDefinitions() const; // GET /config/roi
|
|
void UploadROIDefinitions(const ROIDefinition &rois) const; // PUT /config/roi
|
|
|
|
BrokerStatus GetBrokerStatus() const;
|
|
|
|
std::shared_ptr<JFJochReaderRawImage> GetRawImage(int64_t image_number) override;
|
|
std::vector<SpotToSave> ReadSpots(int64_t image) const override;
|
|
};
|
|
|
|
|
|
|