Files
leonarski_f 9aae0c2ba7
Build Packages / Create release (push) Successful in 21s
Build Packages / build:rugnux-tgz (x86_64) (push) Successful in 9m40s
Build Packages / build:rugnux:aarch64 (cross) (push) Successful in 9m49s
Build Packages / build:viewer-tgz:cpu (push) Successful in 11m37s
Build Packages / build:viewer-tgz:cuda (push) Successful in 12m40s
Build Packages / build:windows:nocuda (push) Successful in 17m44s
Build Packages / build:windows:cuda (push) Successful in 20m13s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 14m41s
Build Packages / HDF5 consumer tests (DIALS, XDS) (push) Successful in 25m59s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 15m5s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 14m35s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 15m53s
Build Packages / build:rugnux:windows (push) Successful in 11m29s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 18m51s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 18m43s
Build Packages / Generate python client (push) Successful in 51s
Build Packages / build:rpm (rocky8) (push) Successful in 18m51s
Build Packages / Build documentation (push) Successful in 1m21s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 18m38s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 18m24s
Build Packages / build:rpm (rocky9) (push) Successful in 19m19s
Build Packages / Unit tests (push) Successful in 1h37m15s
v1.0.0-rc.169 (#79)
* Building Jungfraujoch no longer needs zlib or Eigen installed on the machine, and the dependencies the build fetches are pinned and updated to current releases.
* rugnux: improvements in indexing, lattice selection and geometry post-refinement, which index crystals that previously returned no lattice and keep the better of the two geometries a run measures.
* rugnux: improvements in beam-centre measurement, beam-stop detection and space-group determination.
* rugnux: the unit cell reported with a determined space group now obeys that group - a cell whose symmetry was confirmed from the intensities is re-refined under it, and a cell the group cannot describe is reported with a warning rather than as it stands.
* rugnux drops the stretches of a rotation sweep whose removal measurably improves the merged intensities and reports what became of every frame, and decides the resolution cut on the crystal's own diffraction rather than on its ice rings.
* The rugnux results report is machine-readable - every line that is not `KEY= value` data starts with `#` - and states the build it was written by, its authorship and its terms of use (`REPORT_VERSION= 8`).
* `jfjoch_viewer`: improvements in the file manager (CBF frames beside HDF5 datasets, a remembered root), the dataset plots, the inspector and the image statistics, plus a settable font size, a view of the rugnux results report, usable performance over a remote display (`ssh -X`) and a reset of all settings to defaults; the reciprocal-space window is removed.
* Broker fixes around DECTRIS collections and dark-mask calibration: re-initialising after a run that never started no longer freezes the broker, a cancelled calibration is abandoned instead of reported as done, and a collection whose start message never arrives ends by itself.

Reviewed-on: #79
Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
2026-09-15 17:09:31 +02:00

145 lines
4.0 KiB
C++

// SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
// SPDX-License-Identifier: GPL-3.0-only
#pragma once
#include <queue>
#include <mutex>
#include <condition_variable>
#include <set>
template <class T>
class ThreadSafeFIFO {
std::queue<T> queue;
std::condition_variable c_empty, c_full;
mutable std::mutex m;
const size_t max_size;
size_t max_utilization;
size_t utilization;
bool stopped = false;
public:
explicit ThreadSafeFIFO(size_t in_max_size = UINT32_MAX) : max_size(in_max_size), max_utilization(0), utilization(0) {}
// Release every waiter and make all further blocking operations return at once: puts are
// dropped, gets answer with a default-constructed element. Used when the owner of the queue is
// torn down - at that point nobody is going to drain it any more, so a producer blocked on a
// full queue would never return and the thread join in the destructor would deadlock.
void Stop() {
std::unique_lock ul(m);
stopped = true;
c_empty.notify_all();
c_full.notify_all();
}
void Clear() {
std::unique_lock ul(m);
queue = {};
utilization = 0;
max_utilization = 0;
// A producer blocked on the full queue has to be told the room it was waiting for is there;
// nothing else would wake it, as the next Get finds the queue empty and notifies no one.
c_full.notify_all();
}
bool Put(T val) {
std::unique_lock ul(m);
if (queue.size() < max_size) {
queue.push(val);
c_empty.notify_one();
utilization++;
if (utilization > max_utilization)
max_utilization = utilization;
return true;
} else
return false;
};
void PutBlocking(T val) {
std::unique_lock ul(m);
c_full.wait(ul, [&]{return stopped || (queue.size() < max_size);});
if (stopped)
return;
queue.push(val);
utilization++;
if (utilization > max_utilization)
max_utilization = utilization;
c_empty.notify_one();
};
bool PutTimeout(T val, std::chrono::milliseconds timeout) {
std::unique_lock ul(m);
if (!c_full.wait_for(ul, timeout, [&]{ return stopped || (queue.size() < max_size); }))
return false;
if (stopped)
return false;
queue.push(val);
utilization++;
if (utilization > max_utilization)
max_utilization = utilization;
c_empty.notify_one();
return true;
}
int Get(T &val) {
std::unique_lock ul(m);
if (queue.empty())
return 0;
else {
val = queue.front();
queue.pop();
c_full.notify_one();
utilization--;
return 1;
}
}
T GetBlocking() {
std::unique_lock ul(m);
c_empty.wait(ul, [&]{return stopped || !queue.empty();});
if (queue.empty())
return T{};
T tmp = queue.front();
queue.pop();
c_full.notify_one();
utilization--;
return tmp;
};
int GetTimeout(T &val, std::chrono::microseconds timeout) {
std::unique_lock ul(m);
if (queue.empty())
c_empty.wait_for(ul, timeout, [&]{return stopped || !queue.empty();});
if (queue.empty())
return 0;
else {
val = queue.front();
queue.pop();
c_full.notify_one();
utilization--;
return 1;
}
}
[[nodiscard]] size_t Size() const {
std::unique_lock ul(m);
return queue.size();
}
void ClearMaxUtilization() {
std::unique_lock ul(m);
max_utilization = utilization;
}
[[nodiscard]] size_t GetMaxUtilization() const {
std::unique_lock ul(m);
return max_utilization;
}
[[nodiscard]] size_t GetCurrentUtilization() const {
std::unique_lock ul(m);
return utilization;
}
};