Skip to content

Use NonNull<u8> in MmapRegionBuilder for saving space #224

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Use NonNull<u8> in MmapRegionBuilder for saving space #224

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
8 changes: 4 additions & 4 deletions src/mmap_unix.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

use std::io;
use std::os::unix::io::AsRawFd;
use std::ptr::null_mut;
use std::ptr::{null_mut, NonNull};
use std::result;

use crate::bitmap::{Bitmap, BS};
Expand Down Expand Up @@ -57,7 +57,7 @@ pub struct MmapRegionBuilder<B = ()> {
prot: i32,
flags: i32,
file_offset: Option<FileOffset>,
raw_ptr: Option<*mut u8>,
raw_ptr: Option<NonNull<u8>>,
hugetlbfs: Option<bool>,
bitmap: B,
}
Expand Down Expand Up @@ -119,7 +119,7 @@ impl<B: Bitmap> MmapRegionBuilder<B> {
/// To use this safely, the caller must guarantee that `raw_addr` and `self.size` define a
/// region within a valid mapping that is already present in the process.
pub unsafe fn with_raw_mmap_pointer(mut self, raw_ptr: *mut u8) -> Self {
self.raw_ptr = Some(raw_ptr);
self.raw_ptr = Some(NonNull::new_unchecked(raw_ptr));
self
}

Expand Down Expand Up @@ -189,7 +189,7 @@ impl<B: Bitmap> MmapRegionBuilder<B> {
// SAFETY: Safe because this call just returns the page size and doesn't have any side
// effects.
let page_size = unsafe { libc::sysconf(libc::_SC_PAGESIZE) } as usize;
let addr = self.raw_ptr.unwrap();
let addr = self.raw_ptr.unwrap().as_ptr();

// Check that the pointer to the mapping is page-aligned.
if (addr as usize) & (page_size - 1) != 0 {
Expand Down