Skip to content

mmap module #3755

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 10 commits into from
Jun 14, 2022
Merged

mmap module #3755

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
396812d
Refactor byte operations
killme2008 Jun 14, 2022
cc4583e
mmap skeleton
youknowone Mar 8, 2022
d4f001f
Basic mmap module
killme2008 May 28, 2022
d96b165
Impl madvise method
killme2008 Jun 14, 2022
ba33bc9
Impl read, read_byte and readline methods
killme2008 Jun 14, 2022
929ad30
Impl seek, write, write_byte methods etc.
killme2008 Jun 14, 2022
e5a7679
Impl AsBuffer, AsMapping and AsSequence protocols for PyMmap
killme2008 Jun 14, 2022
3217de7
Adds test_mmap.py from CPython 3.10.4
killme2008 Jun 14, 2022
1ff3e0a
Skip test_flush_return_value on linux platform
killme2008 Jun 13, 2022
af2fac9
use usize for mmap fields
youknowone Jun 14, 2022
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
Prev Previous commit
Next Next commit
Impl madvise method
  • Loading branch information
@killme2008 @youknowone
killme2008 authored and youknowone committed Jun 14, 2022
commit d96b165fad96c44416d6e11a03e9cc9e220193ba
86 changes: 82 additions & 4 deletions stdlib/src/mmap.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,46 @@ mod mmap {
FromArgs, PyObject, PyPayload, PyRef, PyResult, TryFromBorrowedObject, VirtualMachine,
};
use crossbeam_utils::atomic::AtomicCell;
use memmap2::{Mmap, MmapMut, MmapOptions};
use memmap2::{Advice, Mmap, MmapMut, MmapOptions};
use nix::unistd;
use std::fs::File;
use std::ops::Deref;
#[cfg(all(unix, not(target_os = "redox")))]
use std::os::unix::io::{FromRawFd, IntoRawFd, RawFd};

fn advice_try_from_i32(vm: &VirtualMachine, i: i32) -> PyResult<Advice> {
Ok(match i {
libc::MADV_NORMAL => Advice::Normal,
libc::MADV_RANDOM => Advice::Random,
libc::MADV_SEQUENTIAL => Advice::Sequential,
libc::MADV_WILLNEED => Advice::WillNeed,
libc::MADV_DONTNEED => Advice::DontNeed,
#[cfg(any(target_os = "linux", target_os = "macos", target_os = "ios"))]
libc::MADV_FREE => Advice::Free,
#[cfg(target_os = "linux")]
libc::MADV_DONTFORK => Advice::DontFork,
#[cfg(target_os = "linux")]
libc::MADV_DOFORK => Advice::DoFork,
#[cfg(target_os = "linux")]
libc::MADV_MERGEABLE => Advice::Mergeable,
#[cfg(target_os = "linux")]
libc::MADV_UNMERGEABLE => Advice::Unmergeable,
#[cfg(target_os = "linux")]
libc::MADV_HUGEPAGE => Advice::HugePage,
#[cfg(target_os = "linux")]
libc::MADV_NOHUGEPAGE => Advice::NoHugePage,
#[cfg(target_os = "linux")]
libc::MADV_REMOVE => Advice::Remove,
#[cfg(target_os = "linux")]
libc::MADV_DONTDUMP => Advice::DontDump,
#[cfg(target_os = "linux")]
libc::MADV_DODUMP => Advice::DoDump,
#[cfg(target_os = "linux")]
libc::MADV_HWPOISON => Advice::HwPoison,
_ => return Err(vm.new_value_error("Not a valid Advice value".to_owned())),
})
}

#[repr(C)]
#[derive(PartialEq, Eq, Debug)]
enum AccessMode {
Expand Down Expand Up @@ -51,12 +84,24 @@ mod mmap {
#[pyattr]
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"
))]
#[pyattr]
use libc::MADV_FREE;

#[cfg(target_os = "linux")]
#[pyattr]
use libc::{
Comment thread
killme2008 marked this conversation as resolved.
MADV_DODUMP, MADV_DOFORK, MADV_DONTDUMP, MADV_DONTFORK, MADV_FREE, MADV_HUGEPAGE,
MADV_HWPOISON, MADV_MERGEABLE, MADV_NOHUGEPAGE, MADV_REMOVE, MADV_SOFT_OFFLINE,
MADV_UNMERGEABLE,
MADV_DODUMP, MADV_DOFORK, MADV_DONTDUMP, MADV_DONTFORK, MADV_HUGEPAGE, MADV_HWPOISON,
MADV_MERGEABLE, MADV_NOHUGEPAGE, MADV_REMOVE, MADV_SOFT_OFFLINE, MADV_UNMERGEABLE,
};

#[cfg(all(target_os = "linux", target_arch = "x86_64", target_env = "gnu"))]
Expand Down Expand Up @@ -437,6 +482,39 @@ mod mmap {
Ok(())
}

#[allow(unused_assignments)]
#[pymethod]
fn madvise(&self, options: AdviseOptions, vm: &VirtualMachine) -> PyResult<()> {
let start = options.start.unwrap_or(0);
let mut length = options.length.unwrap_or_else(|| self.inner_size());

if start < 0 || start >= self.inner_size() {
return Err(vm.new_value_error("madvise start out of bounds".to_owned()));
}
if length < 0 {
return Err(vm.new_value_error("madvise length invalid".to_owned()));
}

if isize::MAX - start < length {
return Err(vm.new_overflow_error("madvise length too large".to_owned()));
}

if start + length > self.inner_size() {
length = self.inner_size() - start;
}

let advice = advice_try_from_i32(vm, options.option)?;

//TODO: memmap2 doesn't support madvise range right now.
match self.check_valid(vm)?.deref().as_ref().unwrap() {
MmapObj::Read(mmap) => mmap.advise(advice),
MmapObj::Write(mmap) => mmap.advise(advice),
}
.map_err(|e| vm.new_os_error(e.to_string()))?;

Ok(())
}

#[pymethod]
fn size(&self, vm: &VirtualMachine) -> PyResult<PyIntRef> {
let new_fd = unistd::dup(self.fd).map_err(|e| vm.new_os_error(e.to_string()))?;
Expand Down