Skip to content

Fixed:32-bit os,max memory limit upper to 4G,to avoid overflow. #1428

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

Fixed:32-bit os,max memory limit upper to 4G,to avoid overflow. #1428

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
9 changes: 8 additions & 1 deletion src/sys_limits.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,18 @@ fn get_rlimit_as() -> io::Result<libc::rlimit> {

#[cfg(any(target_os = "linux", target_os = "macos"))]
pub fn get_available_memory() -> io::Result<usize> {
let pages = unsafe { libc::sysconf(libc::_SC_PHYS_PAGES) };
let mut pages = unsafe { libc::sysconf(libc::_SC_PHYS_PAGES) };
if pages == -1 {
return Err(io::Error::last_os_error());
}

//Fixed:32-bit os,max memory limit upper to 4G,to avoid overflow.
if usize::BITS==32 {
if pages > 1023 * 1024 {
pages = 1023 * 1024;
}
}

let page_size = unsafe { libc::sysconf(libc::_SC_PAGE_SIZE) };
if page_size == -1 {
return Err(io::Error::last_os_error());
Expand Down