Files
leonarski_f 7f2ebd8209
Build Packages / Build documentation (push) Successful in 46s
Build Packages / Create release (push) Successful in 8s
Build Packages / build:portable:macos-arm64:nocuda (push) Successful in 5m25s
Build Packages / build:rugnux:linux-aarch64:cuda (push) Successful in 9m46s
Build Packages / build:portable:linux-x86_64:nocuda (push) Successful in 13m25s
Build Packages / build:portable:linux-x86_64:cuda (push) Successful in 16m41s
Build Packages / build:portable:windows-x86_64:nocuda (push) Successful in 23m46s
Build Packages / HDF5 consumer tests (DIALS, XDS) (push) Successful in 25m37s
Build Packages / build:jfjoch:rocky8:nocuda (push) Successful in 24m31s
Build Packages / build:portable:windows-x86_64:cuda (push) Successful in 28m9s
Build Packages / build:jfjoch:ubuntu2204:nocuda (push) Successful in 20m47s
Build Packages / build:jfjoch:rocky9:nocuda (push) Successful in 26m21s
Build Packages / build:jfjoch:ubuntu2404:nocuda (push) Successful in 27m36s
Build Packages / Generate python client (push) Successful in 31s
Build Packages / build:jfjoch:rocky8:cuda-sls9 (push) Successful in 29m27s
Build Packages / build:jfjoch:rocky9:cuda-sls9 (push) Successful in 31m46s
Build Packages / build:jfjoch:ubuntu2204:cuda (push) Successful in 25m22s
Build Packages / build:jfjoch:rocky8:cuda (push) Successful in 30m36s
Build Packages / build:jfjoch:rocky9:cuda (push) Successful in 31m49s
Build Packages / build:jfjoch:ubuntu2404:cuda (push) Successful in 23m57s
Build Packages / Unit tests (push) Successful in 1h47m52s
Build Packages / Validation Battery (push) Successful in 44m55s
v1.0.0-rc.184 (#95)
* Rugnux: Rotation processing recovers most of the speed lost since 1.0.0-rc.180; live processing in jfjoch_broker finishes sooner.
* Rugnux: More reliable rotation processing and indexing, including small molecules and supercells.
* Rugnux: More robust serial data and model refinement; molecular replacement handles multi-chain models.
* jfjoch_broker (experimental): Live serial processing keeps the detector geometry fixed for the whole run.
* jfjoch_broker: Pixel sum without an FPGA, a mask bit for inactive pixels, and several stability fixes.
* jfjoch_broker: Rotation indexing and quick integration moved to rugnux live mode; their API settings are deprecated and ignored.
* jfjoch_broker, Rugnux: Azimuthal integration can use logarithmic (log10) Q bins or a given number of bins, set from the API, the web interface and the Rugnux command line.
* jfjoch_viewer: Build and display fixes; the README is rewritten.

Reviewed-on: #95
Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
2026-11-10 22:06:51 +01:00

98 lines
3.1 KiB
C++

// SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
// SPDX-License-Identifier: GPL-3.0-only
#pragma once
#include "ThreadSafeFIFO.h"
#include "DiffractionExperiment.h"
class ZeroCopyReturnValue;
enum class ImageBufferEntryStatus {Empty, InPreparation, Sending, Idle};
struct ImageBufferStatus {
std::vector<int64_t> images_in_the_buffer;
int64_t min_image_number;
int64_t max_image_number;
int64_t total_slots;
int64_t available_slots;
int64_t preparation_slots;
int64_t sending_slots;
std::optional<int64_t> current_counter;
};
struct ImageBufferEntry {
int64_t image_number = -1;
size_t image_size = 0;
int64_t readers = 0;
ImageBufferEntryStatus status = ImageBufferEntryStatus::Empty;
bool indexed = false;
};
class ImageBuffer {
mutable std::mutex m;
std::condition_variable cv_preview_done;
std::condition_variable cv_preparation_done;
std::condition_variable cv_send_done;
uint8_t *buffer;
const size_t buffer_size;
size_t slot_size = 0;
int64_t slot_count = 0;
std::queue<uint32_t> free_slots;
std::vector<ImageBufferEntry> v;
std::vector<ZeroCopyReturnValue> send_buffer_zero_copy_ret_val;
int64_t slots_preparation = 0;
int64_t slots_sending = 0;
int64_t slots_in_preview = 0;
int64_t slots_idle = 0;
bool disable_requests = true; // All requests fail in this state
int64_t counter = 0; // Counter is increased when something changes in the image buffer
std::mutex start_message_mutex;
std::vector<uint8_t> start_message;
// Assumes existing lock
bool FinalizeInternal(std::unique_lock<std::mutex> &ul,
std::chrono::microseconds timeout = std::chrono::milliseconds(2500));
std::optional<uint32_t> getHandle(int64_t image_number) const;
std::optional<uint32_t> getHandleMaxImage() const;
std::optional<uint32_t> getHandleMaxIndexedImage() const;
uint8_t *GetBufferLocation(size_t id); // image metadata + image
public:
constexpr static int64_t MaxImage = -1;
constexpr static int64_t MaxIndexedImage = -2;
explicit ImageBuffer(size_t buffer_size_bytes);
~ImageBuffer();
ImageBuffer(const ImageBuffer &) = delete;
ImageBuffer &operator=(const ImageBuffer &) = delete;
void StartMeasurement(size_t buffer_location_size);
void StartMeasurement(const DiffractionExperiment& experiment);
ZeroCopyReturnValue *GetImageSlot();
void ReadyToSend(uint32_t location, int64_t image_number, size_t image_size, bool indexed);
void ReleaseSlot(uint32_t location);
int64_t GetAvailSlots() const;
size_t GetBufferSize() const;
bool CheckIfBufferReturned(std::chrono::microseconds timeout);
bool Finalize(std::chrono::microseconds timeout);
bool GetImage(std::vector<uint8_t> &out_v, int64_t image_number = MaxImage);
void SaveStartMessage(const std::vector<uint8_t> &msg);
void GetStartMessage(std::vector<uint8_t> &out_v);
// Only the slot counters, no image list: cheap enough to call for every image
ImageBufferStatus GetSlotStatus() const;
ImageBufferStatus GetStatus() const;
};