Skip to content

Fix macos build break. #674

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
evoskuil merged 1 commit into from
Oct 9, 2025
Merged

Fix macos build break. #674

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
88 changes: 47 additions & 41 deletions src/memory/map.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@
#include <bitcoin/database/error.hpp>
#include <bitcoin/database/file/file.hpp>

#if defined(HAVE_APPLE)
int fallocate(int fd, int, off_t offset, off_t len) NOEXCEPT;
#endif

namespace libbitcoin {
namespace database {

Expand Down Expand Up @@ -554,47 +558,6 @@ bool map::remap_(size_t size) NOEXCEPT
return finalize_(size);
}

#if defined(HAVE_APPLE)
// ::fallocate is not defined on macOS, so implement. Ignores mode (linux).
int fallocate(int fd, int, size_t offset, size_t len) NOEXCEPT
{
fstore_t store
{
// Prefer contiguous allocation
.fst_flags = F_ALLOCATECONTIG,

// Allocate from EOF
.fst_posmode = F_PEOFPOSMODE,

// Start from current capacity
.fst_offset = offset,

// Delta size
.fst_length = len,

// Output: actual bytes allocated
.fst_bytesalloc = 0
};

// Try contiguous allocation.
auto result = ::fcntl(fd, F_PREALLOCATE, &store);

// Fallback to non-contiguous.
if ((result == fail) && (errno != ENOSPC))
{
store.fst_flags = F_ALLOCATEALL;
result = ::fcntl(fd, F_PREALLOCATE, &store);
}

if (result == fail)
return fail;

// Extend file to new size (required for mmap). This is not required on
// Linux because fallocate(2) automatically extends file's logical size.
return ::ftruncate(fd, offset + len);
}
#endif // HAVE_APPLE

// disk_full: space is set but no code is set with false return.
bool map::resize_(size_t size) NOEXCEPT
{
Expand Down Expand Up @@ -681,3 +644,46 @@ BC_POP_WARNING()

} // namespace database
} // namespace libbitcoin

#if defined(HAVE_APPLE)
// ::fallocate is not defined on macOS, so implement. Ignores mode (linux).
int fallocate(int fd, int, off_t offset, off_t len) NOEXCEPT
{
constexpr auto fail = -1;

fstore_t store
{
// Prefer contiguous allocation
.fst_flags = F_ALLOCATECONTIG,

// Allocate from EOF
.fst_posmode = F_PEOFPOSMODE,

// Start from current capacity
.fst_offset = offset,

// Delta size
.fst_length = len,

// Output: actual bytes allocated
.fst_bytesalloc = 0
};

// Try contiguous allocation.
auto result = ::fcntl(fd, F_PREALLOCATE, &store);

// Fallback to non-contiguous.
if ((result == fail) && (errno != ENOSPC))
{
store.fst_flags = F_ALLOCATEALL;
result = ::fcntl(fd, F_PREALLOCATE, &store);
}

if (result == fail)
return fail;

// Extend file to new size (required for mmap). This is not required on
// Linux because fallocate(2) automatically extends file's logical size.
return ::ftruncate(fd, offset + len);
}
#endif // HAVE_APPLE
Loading