Skip to content

Re-export mmap libc constants through host_env #8214

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
youknowone merged 2 commits into from
Jul 6, 2026
Merged

Re-export mmap libc constants through host_env #8214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7df262
Re-export mmap libc constants through host_env
youknowone May 20, 2026
f97c1b4
host_env/mmap: gate EOVERFLOW re-export on cfg(windows)
youknowone Jul 6, 2026
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
57 changes: 57 additions & 0 deletions crates/host_env/src/mmap.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,63 @@

use std::io;

#[cfg(unix)]
pub use libc::{
MADV_DONTNEED, MADV_NORMAL, MADV_RANDOM, MADV_SEQUENTIAL, MADV_WILLNEED, MAP_ANON,
MAP_ANONYMOUS, MAP_PRIVATE, MAP_SHARED, PROT_EXEC, PROT_READ, PROT_WRITE,
};

#[cfg(target_os = "macos")]
pub use libc::{MADV_FREE_REUSABLE, MADV_FREE_REUSE};

#[cfg(any(
target_os = "android",
target_os = "dragonfly",
target_os = "fuchsia",
target_os = "freebsd",
target_os = "linux",
target_os = "netbsd",
target_os = "openbsd",
target_vendor = "apple"
))]
pub use libc::MADV_FREE;

#[cfg(target_os = "linux")]
pub use libc::{
MADV_DODUMP, MADV_DOFORK, MADV_DONTDUMP, MADV_DONTFORK, MADV_HUGEPAGE, MADV_HWPOISON,
MADV_MERGEABLE, MADV_NOHUGEPAGE, MADV_REMOVE, MADV_UNMERGEABLE,
};

#[cfg(any(
target_os = "android",
all(
target_os = "linux",
any(
target_arch = "aarch64",
target_arch = "arm",
target_arch = "powerpc",
target_arch = "powerpc64",
target_arch = "s390x",
target_arch = "x86",
target_arch = "x86_64",
target_arch = "sparc64"
)
)
))]
pub use libc::MADV_SOFT_OFFLINE;

#[cfg(all(target_os = "linux", target_arch = "x86_64", target_env = "gnu"))]
pub use libc::{MAP_DENYWRITE, MAP_EXECUTABLE, MAP_POPULATE};

#[cfg(any(target_os = "linux", target_os = "openbsd", target_os = "netbsd"))]
pub use libc::MAP_STACK;

#[cfg(target_os = "freebsd")]
pub use libc::{MADV_AUTOSYNC, MADV_CORE, MADV_NOCORE, MADV_NOSYNC, MADV_PROTECT};

#[cfg(windows)]
pub use libc::EOVERFLOW;

#[cfg(windows)]
use crate::windows::{CheckWin32Bool, HandleToOwned};
#[cfg(unix)]
Expand Down
38 changes: 21 additions & 17 deletions crates/stdlib/src/mmap.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,14 @@ mod mmap {

#[cfg(unix)]
#[pyattr]
use libc::{
use host_mmap::{
MADV_DONTNEED, MADV_NORMAL, MADV_RANDOM, MADV_SEQUENTIAL, MADV_WILLNEED, MAP_ANON,
MAP_ANONYMOUS, MAP_PRIVATE, MAP_SHARED, PROT_EXEC, PROT_READ, PROT_WRITE,
};

#[cfg(target_os = "macos")]
#[pyattr]
use libc::{MADV_FREE_REUSABLE, MADV_FREE_REUSE};
use host_mmap::{MADV_FREE_REUSABLE, MADV_FREE_REUSE};

#[cfg(any(
target_os = "android",
Expand All @@ -80,11 +80,11 @@ mod mmap {
target_vendor = "apple"
))]
#[pyattr]
use libc::MADV_FREE;
use host_mmap::MADV_FREE;

#[cfg(target_os = "linux")]
#[pyattr]
use libc::{
use host_mmap::{
MADV_DODUMP, MADV_DOFORK, MADV_DONTDUMP, MADV_DONTFORK, MADV_HUGEPAGE, MADV_HWPOISON,
MADV_MERGEABLE, MADV_NOHUGEPAGE, MADV_REMOVE, MADV_UNMERGEABLE,
};
Expand All @@ -106,21 +106,21 @@ mod mmap {
)
))]
#[pyattr]
use libc::MADV_SOFT_OFFLINE;
use host_mmap::MADV_SOFT_OFFLINE;

#[cfg(all(target_os = "linux", target_arch = "x86_64", target_env = "gnu"))]
#[pyattr]
use libc::{MAP_DENYWRITE, MAP_EXECUTABLE, MAP_POPULATE};
use host_mmap::{MAP_DENYWRITE, MAP_EXECUTABLE, MAP_POPULATE};

// MAP_STACK is available on Linux, OpenBSD, and NetBSD
#[cfg(any(target_os = "linux", target_os = "openbsd", target_os = "netbsd"))]
#[pyattr]
use libc::MAP_STACK;
use host_mmap::MAP_STACK;

// FreeBSD-specific MADV constants
#[cfg(target_os = "freebsd")]
#[pyattr]
use libc::{MADV_AUTOSYNC, MADV_CORE, MADV_NOCORE, MADV_NOSYNC, MADV_PROTECT};
use host_mmap::{MADV_AUTOSYNC, MADV_CORE, MADV_NOCORE, MADV_NOSYNC, MADV_PROTECT};

#[pyattr]
const ACCESS_DEFAULT: u32 = AccessMode::Default as u32;
Expand Down Expand Up @@ -212,10 +212,10 @@ mod mmap {
fileno: i32,
#[pyarg(any)]
length: isize,
#[pyarg(any, default = libc::MAP_SHARED)]
flags: libc::c_int,
#[pyarg(any, default = libc::PROT_WRITE | libc::PROT_READ)]
prot: libc::c_int,
#[pyarg(any, default = host_mmap::MAP_SHARED)]
flags: core::ffi::c_int,
#[pyarg(any, default = host_mmap::PROT_WRITE | host_mmap::PROT_READ)]
prot: core::ffi::c_int,
#[pyarg(any, default = AccessMode::Default)]
access: AccessMode,
#[pyarg(any, default = 0)]
Expand Down Expand Up @@ -294,7 +294,7 @@ mod mmap {
#[derive(FromArgs)]
pub(super) struct AdviseOptions {
#[pyarg(positional)]
option: libc::c_int,
option: core::ffi::c_int,
#[pyarg(positional, default)]
start: Option<PyIntRef>,
#[pyarg(positional, default)]
Expand All @@ -303,7 +303,11 @@ mod mmap {

#[cfg(all(unix, not(target_os = "redox")))]
impl AdviseOptions {
fn values(self, len: usize, vm: &VirtualMachine) -> PyResult<(libc::c_int, usize, usize)> {
fn values(
self,
len: usize,
vm: &VirtualMachine,
) -> PyResult<(core::ffi::c_int, usize, usize)> {
let start = self
.start
.map(|s| {
Expand Down Expand Up @@ -342,7 +346,7 @@ mod mmap {

#[cfg(unix)]
fn py_new(_cls: &Py<PyType>, args: Self::Args, vm: &VirtualMachine) -> PyResult<Self> {
use libc::{MAP_PRIVATE, MAP_SHARED, PROT_READ, PROT_WRITE};
use host_mmap::{MAP_PRIVATE, MAP_SHARED, PROT_READ, PROT_WRITE};

let mut map_size = args.validate_new_args(vm)?;
let MmapNewArgs {
Expand Down Expand Up @@ -552,7 +556,7 @@ mod mmap {
map_size,
)
.map_err(|err| {
if err.raw_os_error() == Some(libc::EOVERFLOW) {
if err.raw_os_error() == Some(host_mmap::EOVERFLOW) {
vm.new_overflow_error("mmap offset plus size would overflow")
} else {
err.to_pyexception(vm)
Expand Down Expand Up @@ -1074,7 +1078,7 @@ mod mmap {
fn seek(
&self,
dist: isize,
whence: OptionalArg<libc::c_int>,
whence: OptionalArg<core::ffi::c_int>,
vm: &VirtualMachine,
) -> PyResult<()> {
let how = whence.unwrap_or(0);
Expand Down
Loading