Skip to content

Refactor memory unmapping functions to improve error handling #1195

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

Merged
trcrsired merged 1 commit into from
Sep 3, 2025
Merged

Refactor memory unmapping functions to improve error handling #1195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion include/fast_io_hosted/file_loaders/posix_file_loader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ inline void posix_unload_address(void *address, [[maybe_unused]] ::std::size_t f
{
if (address != (void *)-1) [[likely]]
{
sys_munmap(address, file_size);
sys_munmap_nothrow(address, file_size);
}
}

Expand Down
12 changes: 6 additions & 6 deletions include/fast_io_hosted/platforms/posix_mapping.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ inline int sys_mprotect(void *start, ::std::size_t len, int prot)
return result;
}

inline int sys_munmap(void *addr, ::std::size_t len)
inline int sys_munmap_nothrow(void *addr, ::std::size_t len)
{
return
#if defined(__linux__) && defined(__NR_munmap)
Expand All @@ -79,9 +79,9 @@ inline int sys_munmap(void *addr, ::std::size_t len)
#endif
}

inline void sys_munmap_throw_error(void *addr, ::std::size_t len)
inline void sys_munmap(void *addr, ::std::size_t len)
{
system_call_throw_error(sys_munmap(addr, len));
system_call_throw_error(sys_munmap_nothrow(addr, len));
}
} // namespace details

Expand Down Expand Up @@ -195,7 +195,7 @@ class posix_memory_map_file
}
if (this->address_begin != reinterpret_cast<::std::byte *>(MAP_FAILED)) [[likely]]
{
details::sys_munmap(this->address_begin, static_cast<::std::size_t>(address_end - address_begin));
details::sys_munmap_nothrow(this->address_begin, static_cast<::std::size_t>(address_end - address_begin));
}
this->address_begin = other.address_begin;
this->address_end = other.address_end;
Expand Down Expand Up @@ -295,7 +295,7 @@ class posix_memory_map_file
{
if (this->address_begin != MAP_FAILED) [[likely]]
{
auto ret{details::sys_munmap(this->address_begin, static_cast<::std::size_t>(address_end - address_begin))};
auto ret{details::sys_munmap_nothrow(this->address_begin, static_cast<::std::size_t>(address_end - address_begin))};
this->address_end = this->address_begin = reinterpret_cast<::std::byte *>(MAP_FAILED);
system_call_throw_error(ret);
}
Expand All @@ -304,7 +304,7 @@ class posix_memory_map_file
{
if (this->address_begin != MAP_FAILED) [[likely]]
{
details::sys_munmap(this->address_begin, static_cast<::std::size_t>(address_end - address_begin));
details::sys_munmap_nothrow(this->address_begin, static_cast<::std::size_t>(address_end - address_begin));
}
}
};
Expand Down
Loading