Four defects, hit in sequence, that between them stopped eight masters from one beamline before any geometry question was reached. The files are correct NeXus; the reader was assuming one writer's conventions. ReadScalar demanded rank 0. NXmx puts no rank on distance, saturation_value, two_theta or det_z, and these files write them as shape (1,). Any dataspace holding exactly one element is now accepted; a genuine vector is still refused. frame_time was read unconditionally and NXmx does not require it. A virtual-dataset source filename of "." was resolved as a relative path, giving <dir>/. - but "." is HDF5's spelling for THIS file, and these masters compose /entry/data/data as a virtual dataset over datasets in themselves that are external links to the data files. The virtual source's DATASET PATH was parsed and then ignored in favour of a hardcoded /entry/data/data, while these data files keep their images at the root. Fixing that exposed a fifth: the positional-read fast path used the master's own path, but a dataset reached through an external link lives in another file and a chunk address is an offset into THAT file. An audit of all 38 masters in the non-SLS corpus finds exactly these eight need the change and the other 30 need nothing. Corpus A/B over 73 dataset pairs, base and patched back to back: 64 byte-identical results, 9 identical failures, none differing. The blast radius is bounded by construction - JFJochReader is linked only by rugnux and jfjoch_viewer, and the one shared header this touches only ever accepts more, so nothing that opened before can read differently. With it the eight files read completely: 12850 images, no decode errors, seven of them spanning two source datasets through the master's own external links. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Lc5JG6kJqZoCWaoZ43JGTW
136 lines
6.5 KiB
C++
136 lines
6.5 KiB
C++
// SPDX-FileCopyrightText: 2026 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#pragma once
|
|
|
|
#include <cstdint>
|
|
#include <map>
|
|
#include <memory>
|
|
#include <optional>
|
|
#include <string>
|
|
#include <utility>
|
|
#include <vector>
|
|
|
|
#include "HDF5ImageLocator.h"
|
|
#include "../common/CompressedImage.h"
|
|
|
|
// Raw-pixel side of the reader. Turns a global image number into a CompressedImage, using
|
|
// HDF5ImageLocator to find the file (with its open-file cache). This is the part whose "links
|
|
// to files stay" constant: switching which master the per-image metadata is read from never
|
|
// touches it. Caller must hold the global hdf5_mutex (HDF5 is not thread-safe).
|
|
// Bit depth and signedness of /entry/data/data as it is STORED. Deliberately not the same thing as
|
|
// the experiment's image format: the reader hands every image out in a signed 32-bit container
|
|
// whatever the file holds (see HDF5MetadataSource), so an output file that links to the original
|
|
// images rather than writing its own must describe them with this, not with the experiment.
|
|
struct StoredPixelFormat {
|
|
int64_t bit_depth = 0;
|
|
bool is_signed = false;
|
|
};
|
|
|
|
class HDF5ImageSource {
|
|
public:
|
|
// Plain positional-read handle on a data file, opened alongside the HDF5 one. Owns the handle.
|
|
class RawFile {
|
|
public:
|
|
explicit RawFile(const std::string &path);
|
|
~RawFile();
|
|
RawFile(const RawFile &) = delete;
|
|
RawFile &operator=(const RawFile &) = delete;
|
|
|
|
bool IsOpen() const { return handle_ != -1; }
|
|
// Read `size` bytes from byte `address`. Positional and stateless, so any number of threads
|
|
// may call it on the same handle at once. Throws on a short read.
|
|
void ReadAt(void *dst, size_t size, uint64_t address) const;
|
|
|
|
private:
|
|
intptr_t handle_ = -1; // a file descriptor on POSIX, a HANDLE on Windows
|
|
};
|
|
|
|
// Where the bytes of one image are, and what they decode to. Everything needed to read an image
|
|
// without calling HDF5 again.
|
|
struct DirectChunk {
|
|
// Shared, not borrowed: GetRawImage drops the HDF5 lock before reading through this, so a
|
|
// concurrent Clear() - which ReadFile() and Close() both do - would otherwise free the file
|
|
// and close its descriptor under the reader.
|
|
std::shared_ptr<const RawFile> file;
|
|
uint64_t address = 0;
|
|
uint32_t size = 0;
|
|
hsize_t width = 0;
|
|
hsize_t height = 0;
|
|
CompressedImageMode mode{};
|
|
CompressionAlgorithm algorithm = CompressionAlgorithm::NO_COMPRESSION;
|
|
};
|
|
|
|
void Configure(HDF5ImageLocator::Layout layout);
|
|
void Clear();
|
|
|
|
[[nodiscard]] StoredPixelFormat GetStoredPixelFormat() const;
|
|
|
|
// Where image `global` physically lives. Also used by the metadata source to find the data
|
|
// file that holds a legacy/VDS image's per-image metadata.
|
|
HDF5ImageLocator::Location Resolve(int64_t global) const;
|
|
|
|
// Read the pixels at a resolved location into a CompressedImage backed by `buffer`. Templated on
|
|
// the allocator so a caller can hand over a buffer that does not zero what it is about to
|
|
// overwrite (RawByteBuffer).
|
|
template<class Alloc>
|
|
CompressedImage ReadImageAt(std::vector<uint8_t, Alloc> &buffer, const HDF5ImageLocator::Location &loc) const {
|
|
const auto &ds = GetDataset(loc);
|
|
const std::vector<hsize_t> start = {static_cast<hsize_t>(loc.local_index), 0, 0};
|
|
|
|
if (ds.direct_chunk)
|
|
ds.dataset->ReadDirectChunk(buffer, start);
|
|
else
|
|
ds.dataset->ReadVectorToU8(buffer, start, {1, ds.height, ds.width});
|
|
|
|
return {buffer.data(), buffer.size(), ds.width, ds.height, ds.mode, ds.algorithm};
|
|
}
|
|
|
|
// Ask HDF5 where image `loc` is in the file rather than asking it for the image. This is a
|
|
// lookup in the chunk index and nothing else - no read - so the mutex is held for a fraction of
|
|
// what an actual read costs, and the read itself then happens on any number of threads at once
|
|
// through ReadDirect(). Caller must hold hdf5_mutex.
|
|
//
|
|
// Empty when this file cannot be served that way: one chunk per image is what makes an image a
|
|
// single contiguous run of bytes, and a chunk that has never been written has no address at all.
|
|
// The caller falls back to ReadImageAt() then.
|
|
std::optional<DirectChunk> PrepareDirectRead(const HDF5ImageLocator::Location &loc) const;
|
|
|
|
// Read what PrepareDirectRead() found. Touches no HDF5 and no shared state, so it needs no
|
|
// mutex; this is the whole point of the two-step split.
|
|
static CompressedImage ReadDirect(RawByteBuffer &buffer, const DirectChunk &chunk);
|
|
|
|
std::vector<HDF5DataSourceMessage> GetSourceMapping(uint64_t first_image,
|
|
std::optional<uint64_t> image_count,
|
|
uint64_t total_images,
|
|
uint64_t stride = 1) const;
|
|
|
|
private:
|
|
HDF5ImageLocator locator_;
|
|
|
|
// /entry/data/data and everything asked of it here - its rank and dimensions, its element type,
|
|
// its chunking, its compression - are properties of the file, identical for every image in it.
|
|
// They used to be looked up again for each image: four HDF5 object opens per frame, inside the
|
|
// global hdf5_mutex that every worker thread queues on. Resolve them once per file instead.
|
|
//
|
|
// The entry keeps the file alive, so the pointer it is keyed by cannot be recycled underneath it
|
|
// and the dataset handle cannot outlive the file it belongs to.
|
|
struct OpenDataset {
|
|
std::shared_ptr<HDF5ReadOnlyFile> file;
|
|
std::unique_ptr<HDF5DataSet> dataset;
|
|
std::shared_ptr<RawFile> raw;
|
|
// HDF5 addresses count from the end of the user block, so they are file offsets only once
|
|
// its size is added. Zero for everything this project writes, but not for every file.
|
|
uint64_t user_block = 0;
|
|
hsize_t width = 0;
|
|
hsize_t height = 0;
|
|
CompressedImageMode mode{};
|
|
CompressionAlgorithm algorithm = CompressionAlgorithm::NO_COMPRESSION;
|
|
bool direct_chunk = false;
|
|
};
|
|
// Keyed by file AND dataset path: a master whose VDS sources are datasets in itself serves
|
|
// several of them out of one file, and keying by file alone would hand back the wrong one.
|
|
mutable std::map<std::pair<const HDF5ReadOnlyFile *, std::string>, OpenDataset> dataset_cache_;
|
|
const OpenDataset &GetDataset(const HDF5ImageLocator::Location &loc) const;
|
|
};
|