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

Fix mmap error when reading empty file during resume check on Linux #7808

Open
wants to merge 3 commits into
base: RC_2_0
Choose a base branch
from
+5 −5
Open

Fix mmap error when reading empty file during resume check on Linux #7808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1e0a00e
avoid mmap with 0 length on Linux
Doekin Dec 9, 2024
2287b65
call `madvise` only when mmap result is valid
Doekin Dec 9, 2024
b98b8c7
enhance test_checking with large files (to trigger mmap)
Doekin Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/mmap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ file_mapping_handle::file_mapping_handle(file_handle file, open_mode_t const mod
file_mapping::file_mapping(file_handle file, open_mode_t const mode, std::int64_t const file_size)
: m_size(memory_map_size(mode, file_size, file))
, m_file(std::move(file))
, m_mapping((mode & open_mode::no_mmap) ? nullptr
, m_mapping((mode & open_mode::no_mmap) || m_size == 0 ? nullptr
: mmap(nullptr, static_cast<std::size_t>(m_size)
, mmap_prot(mode), mmap_flags(mode), m_file.fd(), 0))
{
Expand All @@ -185,7 +185,7 @@ file_mapping::file_mapping(file_handle file, open_mode_t const mode, std::int64_
}

#if TORRENT_USE_MADVISE
if (file_size > 0)
if (m_mapping != nullptr && m_mapping != map_failed)
{
int const advise = ((mode & open_mode::sequential_access) ? MADV_SEQUENTIAL : 0)
#ifdef MADV_DONTDUMP
Expand Down
6 changes: 3 additions & 3 deletions test/test_checking.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ void test_checking(int const flags)
auto const file_sizes = (flags & single_file)
? std::vector<int>{500000}
: std::vector<int>{0, 5, 16 - 5, 16000, 17, 10, 8000, 8000, 1,1,1,1,1,100,1,1,1,1,100,1,1,1,1,1,1
,1,1,1,1,1,1,13,65000,34,75,2,30,400,50000,73000,900,43000,400,4300,6, 4 };
,1,1,1,1,1,1,13,65000,34,75,2,30,400,50000,73000,900,43000,400,4300,6, 4, 16384 * 100, 16384 * 200, 16384 * 100};

create_random_files("test_torrent_dir", file_sizes, &fs);

Expand All @@ -137,7 +137,7 @@ void test_checking(int const flags)
{
for (std::size_t i = 0; i < file_sizes.size(); ++i)
{
if ((i & 1) == 1) continue;
if ((i % 3) == 2) continue;
char name[1024];
std::snprintf(name, sizeof(name), "test%d", int(i));
char dirname[200];
Expand All @@ -147,7 +147,7 @@ void test_checking(int const flags)

std::int64_t const new_len = (flags & extended_files)
? file_sizes[i] + 10
: file_sizes[i] * 2 / 3;
: file_sizes[i] * static_cast<int>(i % 3) / 2;

int const ret = ::truncate(path.c_str(), new_len);
if (ret < 0)
Expand Down