v1.0.0-rc.121 (#28)
All checks were successful
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 9m28s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 8m25s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 9m4s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 10m27s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 9m36s
Build Packages / Generate python client (push) Successful in 32s
Build Packages / Build documentation (push) Successful in 45s
Build Packages / Create release (push) Has been skipped
Build Packages / build:rpm (rocky8) (push) Successful in 8m45s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 7m51s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 8m57s
Build Packages / build:rpm (rocky9) (push) Successful in 9m35s
Build Packages / Unit tests (push) Successful in 1h13m45s

This is an UNSTABLE release.

* jfjoch_broker: Report changes in the image buffer, so viewer doesn't reload constantly
* jfjoch_viewer: Improve performance of loading images
* jfjoch_viewer: Auto-throttle image loading in HTTP-sync / movie modes
* jfjoch_viewer: Auto-foreground calculated with histogram
* jfjoch_viewer: Fix rare segmentation fault

Reviewed-on: #28
Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
Co-committed-by: Filip Leonarski <filip.leonarski@psi.ch>
This commit was merged in pull request #28.
This commit is contained in:
2025-12-12 21:24:20 +01:00
committed by leonarski_f
parent a0a659a02c
commit e2b240356c
156 changed files with 732 additions and 260 deletions

View File

@@ -70,6 +70,8 @@ void ImageBuffer::StartMeasurement(size_t in_location_size) {
v.emplace_back();
send_buffer_zero_copy_ret_val.emplace_back(GetBufferLocation(i),*this, i);
}
++counter;
}
void ImageBuffer::StartMeasurement(const DiffractionExperiment &experiment) {
@@ -120,7 +122,7 @@ int64_t ImageBuffer::GetAvailSlots() const {
void ImageBuffer::ReleaseSlot(uint32_t location, int64_t image_number, size_t image_size, bool indexed) {
std::unique_lock ul(m);
++counter;
zeromq_in_process--;
v[location].zeromq_processing = false;
v[location].image_number = image_number;
@@ -185,6 +187,8 @@ bool ImageBuffer::FinalizeInternal(std::unique_lock<std::mutex> &ul, std::chrono
cv_zeromq_done.wait_for(ul, timeout,
[this] {return zeromq_in_process == 0;
});
++counter;
return (preview_in_process == 0) && (zeromq_in_process == 0);
}
@@ -249,6 +253,7 @@ ImageBufferStatus ImageBuffer::GetStatus() const {
ret.min_image_number = INT64_MAX;
ret.max_image_number = 0;
ret.current_counter = counter;
for (int i = 0; i < slot_count; i++) {
if (v[i].image_number >= 0) {