TheCloud/dwarfs
1
0
Fork 0
mirror of https://github.com/mhx/dwarfs.git synced 2025-08-03 17:56:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: a few changes for 32-bit compatibility

Browse Source
This commit is contained in:
Marcus Holland-Moritz 2025-07-19 11:48:22 +02:00
parent d30fdadf45
commit 407561f214
5 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/compression/brotli.cpp
View File

@ -154,7 +154,7 @@ class brotli_block_decompressor final : public block_decompressor_base {
::BrotliDecoderGetErrorCode(decoder_.get()));
}
size_t const uncompressed_size_;
uint64_t const uncompressed_size_;
uint8_t const* brotli_data_;
size_t brotli_size_;
std::unique_ptr<BrotliDecoderState, decltype(BrotliDecoderDestroyInstance)*>

2
src/compression/flac.cpp
View File

@ -479,7 +479,7 @@ class flac_block_decompressor final : public block_decompressor_base {
return hdr;
}
size_t const uncompressed_size_;
uint64_t const uncompressed_size_;
thrift::compression::flac_block_header const header_;
std::unique_ptr<dwarfs_flac_stream_decoder> decoder_;
};

2
src/compression/ricepp.cpp
View File

@ -243,7 +243,7 @@ class ricepp_block_decompressor final : public block_decompressor_base {
return hdr;
}
size_t const uncompressed_size_;
uint64_t const uncompressed_size_;
thrift::compression::ricepp_block_header const header_;
std::span<uint8_t const> data_;
std::unique_ptr<ricepp::decoder_interface<uint16_t>> decoder_;

31
test/badfs_test.cpp
View File

@ -21,6 +21,7 @@
* SPDX-License-Identifier: GPL-3.0-only
*/
#include <array>
#include <filesystem>
#include <sstream>
@ -38,6 +39,26 @@ using namespace dwarfs;
namespace {
using namespace std::string_view_literals;
constexpr std::array kSkipOn32Bit = {
"0161bfabd70ee4d3700a46dbe0bf2335.dwarfs"sv,
"0ca44aa3dda67fe9e9dd85bafbcf8c65.dwarfs"sv,
"1ee0685c6ec60cc83d204dcd2a86cf6e.dwarfs"sv,
"288e74070d7e82ba12a6c7f87c7b74c2.dwarfs"sv,
"320da6d7bce5948ef356e4fe01b20275.dwarfs"sv,
"38528a6800d8907065e9bc3de6545030.dwarfs"sv,
"3935bf683501ba8e0812b96a32f9e9c1.dwarfs"sv,
"3cdd36c5bfdcad8f1cb11f3757b10e0d.dwarfs"sv,
"67eb016e1ec15aef9e50ddac8119544f.dwarfs"sv,
"72028fdf38bc8bf5767467a8eb33cea1.dwarfs"sv,
"80c6ae30d257cf7a936eafa54c85e0f4.dwarfs"sv,
"af9384d3fac4850ed2f10125b5db730c.dwarfs"sv,
"b5c4dfdbba53dda0eea180ae3acccebc.dwarfs"sv,
"ccbfc9eb10aa7b89138996ab90a172a1.dwarfs"sv,
"f93cd8ed5de226bca0ecefc521df9f13.dwarfs"sv,
};
auto const testdata{std::filesystem::path{TEST_DATA_DIR} / "badfs"};
std::vector<std::string> find_all_filesystems() {
@ -60,7 +81,13 @@ class bad_fs : public ::testing::TestWithParam<std::string> {};
} // namespace
TEST_P(bad_fs, test) {
auto filename = testdata / GetParam();
auto const filename = GetParam();
auto const filepath = testdata / GetParam();
if (sizeof(size_t) == 4 && std::find(kSkipOn32Bit.begin(), kSkipOn32Bit.end(),
filename) != kSkipOn32Bit.end()) {
GTEST_SKIP() << "skipping test for 32-bit systems: " << filename;
}
test::test_logger lgr;
test::os_access_mock os;
@ -70,7 +97,7 @@ TEST_P(bad_fs, test) {
try {
nerror = reader::filesystem_v2::identify(
lgr, os, std::make_shared<mmap>(filename), oss, 9, 1, true,
lgr, os, std::make_shared<mmap>(filepath), oss, 9, 1, true,
reader::filesystem_options::IMAGE_OFFSET_AUTO);
} catch (std::exception const&) {
nerror = 1;

4
test/block_cache_test.cpp
View File

@ -147,8 +147,8 @@ TEST_P(options_test, cache_stress) {
auto iv = inodes[inode_dist(rng)];
auto stat = fs.getattr(iv);
if (stat.is_regular_file()) {
auto offset = rng() % stat.size();
auto size = rng() % (stat.size() - offset);
size_t offset = rng() % stat.size();
size_t size = rng() % (stat.size() - offset);
reqs.push_back({iv, offset, size});
while (reqs.size() < num_read_reqs &&