v1.0.0-rc.129 (#36)
Some checks failed
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 11m14s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 10m43s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 11m35s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 9m20s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 10m23s
Build Packages / Generate python client (push) Successful in 39s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 11m24s
Build Packages / Create release (push) Has been skipped
Build Packages / Build documentation (push) Successful in 1m0s
Build Packages / build:rpm (rocky8) (push) Successful in 10m35s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 10m35s
Build Packages / build:rpm (rocky9) (push) Successful in 11m17s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 9m9s
Build Packages / Unit tests (push) Failing after 1h18m57s

This is an UNSTABLE release. The release has significant modifications and bug fixes, if things go wrong, it is better to revert to 1.0.0-rc.124.

* jfjoch_broker: Significant improvements in TCP image socket, as a viable alternative for ZeroMQ sockets (only a single port on broker side, dynamically change number of writers, acknowledgments for written files)
* jfjoch_broker: Delta phi is calculated also for still data in Bragg prediction
* jfjoch_broker: Image pusher statistics are accessible via the REST interface
* jfjoch_writer: Supports TCP image socket and for these auto-forking option

Reviewed-on: #36
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 #36.
This commit is contained in:
2026-03-05 22:13:12 +01:00
committed by leonarski_f
parent 3036b1d37f
commit 64002f1e29
231 changed files with 5401 additions and 1064 deletions

View File

@@ -10,6 +10,7 @@ void HDF5FilePusher::StartDataCollection(StartMessage &message) {
throw JFJochException(JFJochExceptionCategory::WrongDAQState, "Image pusher is already writing images");
writer = std::make_unique<FileWriter>(message);
writer_future = std::async(std::launch::async, &HDF5FilePusher::WriterThread, this);
images_written = 0;
}
bool HDF5FilePusher::EndDataCollection(const EndMessage &message) {
@@ -33,9 +34,10 @@ bool HDF5FilePusher::SendImage(const uint8_t *image_data, size_t image_size, int
throw JFJochException(JFJochExceptionCategory::WrongDAQState, "Image pusher not ready for sending");
auto deserialized = CBORStream2Deserialize(image_data, image_size);
if (deserialized->data_message)
if (deserialized->data_message) {
writer->Write(*deserialized->data_message);
else
images_written++;
} else
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
"HDF5FilePusher::SendImage accepts only data image");
return true;
@@ -70,3 +72,11 @@ std::string HDF5FilePusher::PrintSetup() const {
std::filesystem::path currentPath = std::filesystem::current_path();
return "HDF5FilePusher: Images are written directly to file in base directory " + currentPath.string();
}
std::optional<uint64_t> HDF5FilePusher::GetImagesWritten() const {
return images_written;
}
size_t HDF5FilePusher::GetConnectedWriters() const {
return 1;
}