Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

more CPHD tweaks #701

Merged
merged 19 commits into from
Oct 2, 2023
Merged

more CPHD tweaks #701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
7468357
use "range for" rather than iterators
Sep 18, 2023
7414a1b
utility routines to get the various low-level "write" functions
Sep 18, 2023
16de18e
writeSupportData() utility routine
Sep 18, 2023
1cb4916
writePVPData() static utility
Sep 18, 2023
e421aab
making a new DataWriter instance is cheap
Sep 18, 2023
77e1364
use a DataWriter directly
Sep 18, 2023
a9b9c00
simplify writePVPData() utility
Sep 18, 2023
03264b1
pass a DataWriter to writeSupportData()
Sep 18, 2023
610402e
writeMetadata() takes a io::OutputStream
Sep 18, 2023
3cc36aa
make a new DataWriter for writeCPHDData()
Sep 18, 2023
d1ebf4b
pass a io::OutputStreeam to writeSupportDataImpl()
Sep 18, 2023
0b59469
pass a io::OutputStream to more places
Sep 18, 2023
233d497
separate routine to write the channel data
Sep 18, 2023
136d5f5
Squashed commit of the following:
Sep 27, 2023
d631d10
Merge branch 'main' into feature/write-cphd-data-in-pieces
Sep 27, 2023
d4c7f4a
most code should work with just io::SeekableStream&, not a shared_ptr
Sep 27, 2023
cea095e
use std::vector<std::filesystem::path>*
Sep 27, 2023
eebc2fa
break apart writeSupportData()
Sep 28, 2023
f3a517f
Merge branch 'main' into feature/write-cphd-data-in-pieces
Oct 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions six/modules/c++/cphd/include/cphd/CPHDWriter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,10 @@ struct CPHDWriter final
*
* \param data A pointer to the start of the support array data block
*/
sys::Off_T getSupportBlockByteOffset(const Data::SupportArray&) const;
void writeSupportDataArray(io::SeekableOutputStream&, DataWriter&,
std::span<const std::byte>, const Data::SupportArray&);
void writeSupportDataArray(io::SeekableOutputStream&, std::span<const std::byte>, const Data::SupportArray&);
void writeSupportData(io::SeekableOutputStream&, std::span<const std::byte>);

template <typename T>
Expand Down
28 changes: 20 additions & 8 deletions six/modules/c++/cphd/source/CPHDWriter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,22 +162,34 @@ static auto make_span(std::span<const std::byte> data, const cphd::Data::Support
const auto pData = data.data() + dataArray.arrayByteOffset;
return sys::make_span(pData, dataArray.size_bytes());
}
void CPHDWriter::writeSupportData(io::SeekableOutputStream& stream, std::span<const std::byte> data)
sys::Off_T CPHDWriter::getSupportBlockByteOffset(const Data::SupportArray& dataArray) const
{
const auto supportBlockByteOffset = mHeader.getSupportBlockByteOffset();
return supportBlockByteOffset + dataArray.arrayByteOffset;
}

void CPHDWriter::writeSupportDataArray(io::SeekableOutputStream& stream, DataWriter& dataWriter,
std::span<const std::byte> data, const Data::SupportArray& dataArray)
{
// Move inputstream head to offset of particular support array
stream.seek(getSupportBlockByteOffset(dataArray), io::SeekableOutputStream::START);
dataWriter(make_span(data, dataArray), dataArray.bytesPerElement);
}
void CPHDWriter::writeSupportDataArray(io::SeekableOutputStream& stream,
std::span<const std::byte> data, const Data::SupportArray& dataArray)
{
auto dataWriter = make_DataWriter(stream);
writeSupportDataArray(stream, *dataWriter, data, dataArray);
}
void CPHDWriter::writeSupportData(io::SeekableOutputStream& stream, std::span<const std::byte> data)
{
auto dataWriter = make_DataWriter(stream);
for (auto&& mapEntry : mMetadata.data.supportArrayMap)
{
auto&& dataArray = mapEntry.second;

// Move inputstream head to offset of particular support array
stream.seek(supportBlockByteOffset + dataArray.arrayByteOffset, io::SeekableOutputStream::START);

(*dataWriter)(make_span(data, dataArray), dataArray.bytesPerElement);
writeSupportDataArray(stream, *dataWriter, data, mapEntry.second);
}
// Move inputstream head to the end of the support block after all supports have been written
stream.seek(supportBlockByteOffset + mHeader.getSupportBlockSize(), io::SeekableOutputStream::START);
stream.seek(mHeader.getSupportBlockByteOffset() + mHeader.getSupportBlockSize(), io::SeekableOutputStream::START);
}

template <typename T>
Expand Down