studio/tuwunel
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix conditional compilation for supported RLIMIT variants. (fixes #357)

Browse Source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk
2026-03-08 10:18:17 +00:00
parent cf7a4dc88d
commit 0d43411447
1 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/core/utils/sys/limits.rs
View File

@@ -29,7 +29,7 @@ pub fn maximize_fd_limit() -> Result {
#[cfg(not(unix))] #[cfg(not(unix))]
pub fn maximize_fd_limit() -> Result { Ok(()) } pub fn maximize_fd_limit() -> Result { Ok(()) }
#[cfg(unix)] #[cfg(all(unix, not(target_os = "macos")))]
/// Some distributions ship with very low defaults for thread counts; similar to /// Some distributions ship with very low defaults for thread counts; similar to
/// low default file descriptor limits. But unlike fd's, thread limit is rarely /// low default file descriptor limits. But unlike fd's, thread limit is rarely
/// reached, though on large systems (32+ cores) shipping with defaults of /// reached, though on large systems (32+ cores) shipping with defaults of
@@ -48,7 +48,7 @@ pub fn maximize_thread_limit() -> Result {
Ok(()) Ok(())
} }
#[cfg(not(unix))] #[cfg(any(not(unix), target_os = "macos"))]
pub fn maximize_thread_limit() -> Result { Ok(()) } pub fn maximize_thread_limit() -> Result { Ok(()) }
#[cfg(unix)] #[cfg(unix)]
@@ -75,7 +75,7 @@ pub fn max_stack_size() -> Result<(usize, usize)> {
#[inline] #[inline]
pub fn max_stack_size() -> Result<(usize, usize)> { Ok((usize::MAX, usize::MAX)) } pub fn max_stack_size() -> Result<(usize, usize)> { Ok((usize::MAX, usize::MAX)) }
#[cfg(any(linux_android, netbsdlike, target_os = "freebsd",))] #[cfg(all(unix, not(target_os = "macos")))]
#[inline] #[inline]
pub fn max_memory_locked() -> Result<(usize, usize)> { pub fn max_memory_locked() -> Result<(usize, usize)> {
getrlimit(Resource::RLIMIT_MEMLOCK) getrlimit(Resource::RLIMIT_MEMLOCK)
@@ -83,16 +83,11 @@ pub fn max_memory_locked() -> Result<(usize, usize)> {
.map_err(Into::into) .map_err(Into::into)
} }
#[cfg(not(any(linux_android, netbsdlike, target_os = "freebsd",)))] #[cfg(any(not(unix), target_os = "macos"))]
#[inline] #[inline]
pub fn max_memory_locked() -> Result<(usize, usize)> { Ok((usize::MIN, usize::MIN)) } pub fn max_memory_locked() -> Result<(usize, usize)> { Ok((usize::MIN, usize::MIN)) }
#[cfg(any( #[cfg(all(unix, not(target_os = "macos")))]
linux_android,
netbsdlike,
target_os = "aix",
target_os = "freebsd",
))]
#[inline] #[inline]
pub fn max_threads() -> Result<(usize, usize)> { pub fn max_threads() -> Result<(usize, usize)> {
getrlimit(Resource::RLIMIT_NPROC) getrlimit(Resource::RLIMIT_NPROC)
@@ -100,12 +95,7 @@ pub fn max_threads() -> Result<(usize, usize)> {
.map_err(Into::into) .map_err(Into::into)
} }
#[cfg(not(any( #[cfg(any(not(unix), target_os = "macos"))]
linux_android,
netbsdlike,
target_os = "aix",
target_os = "freebsd",
)))]
#[inline] #[inline]
pub fn max_threads() -> Result<(usize, usize)> { Ok((usize::MAX, usize::MAX)) } pub fn max_threads() -> Result<(usize, usize)> { Ok((usize::MAX, usize::MAX)) }