-
Notifications
You must be signed in to change notification settings - Fork 674
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.
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
Add getrlimit(2) and setrlimit(2) #879
Changes from 3 commits
63c438f
aaf89e4
f69bedb
2c4d804
13f75c1
7b537e3
8c18615
de89045
7242607
1c629ad
f87978b
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
//! Configure the process resource limits. | ||
use std::mem; | ||
|
||
use libc::{self, c_int, rlimit, RLIM_INFINITY}; | ||
|
@@ -39,18 +40,43 @@ libc_enum!{ | |
#[cfg(any(target_os = "android", target_os = "linux"))] | ||
RLIMIT_SIGPENDING, | ||
|
||
// Non-Linux | ||
// Available on some BSD | ||
#[cfg(target_os = "freebsd")] | ||
RLIMIT_KQUEUES, | ||
#[cfg(target_os = "freebsd")] | ||
RLIMIT_NPTS, | ||
#[cfg(target_os = "freebsd")] | ||
#[cfg(any(target_os = "freebsd", target_os = "dragonfly"))] | ||
RLIMIT_SBSIZE, | ||
#[cfg(target_os = "freebsd")] | ||
RLIMIT_SWAP, | ||
} | ||
} | ||
|
||
/// Get the current processes resource limits | ||
/// | ||
/// A value of `None` corresponds to `RLIM_INFINITY`, which means there's no limit. | ||
/// | ||
/// # Parameters | ||
/// | ||
/// * `resource`: The [`Resource`] that we want to get the limits of. | ||
/// | ||
/// # Examples | ||
/// | ||
/// ``` | ||
/// use nix::sys::resource::{getrlimit, Resource}; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. In the doc test, you should put a There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done |
||
/// | ||
/// fn main() { | ||
/// let (soft_limit, hard_limit) = getrlimit(Resource::RLIMIT_NOFILE).unwrap(); | ||
/// println!("current soft_limit: {:?}", soft_limit); | ||
/// println!("current hard_limit: {:?}", hard_limit); | ||
/// } | ||
/// ``` | ||
/// | ||
/// # References | ||
/// | ||
/// [getrlimit(2)](https://linux.die.net/man/2/getrlimit) | ||
/// | ||
/// [`Resource`]: enum.Resource.html | ||
pub fn getrlimit(resource: Resource) -> Result<(Option<rlim_t>, Option<rlim_t>)> { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Needs a doccomment, should have an example as well. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done |
||
let mut rlim: rlimit = unsafe { mem::uninitialized() }; | ||
let res = unsafe { libc::getrlimit(resource as c_int, &mut rlim as *mut _) }; | ||
|
@@ -60,6 +86,34 @@ pub fn getrlimit(resource: Resource) -> Result<(Option<rlim_t>, Option<rlim_t>)> | |
}) | ||
} | ||
|
||
/// Set the current processes resource limits | ||
/// | ||
/// A value of `None` corresponds to `RLIM_INFINITY`, which means there's no limit. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same as above, don't bother mentioning There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done |
||
/// | ||
/// # Parameters | ||
/// | ||
/// * `resource`: The [`Resource`] that we want to set the limits of. | ||
/// * `soft_limit`: The value that the kenrel enforces for the corresponding resource. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. s/kenrel/kernel There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done |
||
/// * `hard_limit`: The ceiling for the soft limit. Must be lower or equal to the current hard limit | ||
/// for non-root users. | ||
/// | ||
/// # Examples | ||
/// | ||
/// ```no_run | ||
/// use nix::sys::resource::{setrlimit, Resource}; | ||
/// | ||
/// fn main() { | ||
/// let soft_limit = Some(1024); | ||
/// let hard_limit = None; | ||
/// setrlimit(Resource::RLIMIT_NOFILE, soft_limit, hard_limit).unwrap(); | ||
/// } | ||
/// ``` | ||
/// | ||
/// # References | ||
/// | ||
/// [setrlimit(2)](https://linux.die.net/man/2/setrlimit) | ||
/// | ||
/// [`Resource`]: enum.Resource.html | ||
pub fn setrlimit(resource: Resource, soft_limit: Option<rlim_t>, hard_limit: Option<rlim_t>) -> Result<()> { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I came in here to suggest changing this to pub fn setrlimit<S=rlim_t, H=rlim_t>(resource: Resource, soft_limit: Option<rlim_t>, hard_limit: Option<rlim_t>) -> Result<()>
where S: Into<Option<rlim_t>>, H: Into<Option<rlim_t>> { // ... playground example to take advantage for the but it turns out we can't use default type params in functions on stable. There's a WG looking into this, so maybe we can open it up later this year. (This would allow |
||
let mut rlim: rlimit = unsafe { mem::uninitialized() }; | ||
rlim.rlim_cur = soft_limit.unwrap_or(RLIM_INFINITY); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should this be checked to be less than There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I would prefer to leave this to the kernel. |
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,22 @@ | ||
use nix::sys::resource::{Resource, getrlimit, setrlimit}; | ||
|
||
#[test] | ||
pub fn test_resource_limits() { | ||
pub fn test_resource_limits_nofile() { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can you summarize what this test is doing? Makes it easier to fix or modify them later. |
||
let (soft_limit, hard_limit) = getrlimit(Resource::RLIMIT_NOFILE).unwrap(); | ||
|
||
// make sure the soft limit and hard limit are not equal | ||
let soft_limit = match soft_limit { | ||
Some(nofile) => Some(nofile -1), | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Need a space after the There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done |
||
None => Some(1024), | ||
}; | ||
setrlimit(Resource::RLIMIT_NOFILE, soft_limit, hard_limit).unwrap(); | ||
|
||
let (new_soft_limit, new_hard_limit) = getrlimit(Resource::RLIMIT_NOFILE).unwrap(); | ||
assert!(new_soft_limit != new_hard_limit); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This should be There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done |
||
} | ||
|
||
#[test] | ||
pub fn test_resource_limits_stack() { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Could you provide some comments or a general summarizing comment here? It makes it easier for us reviewers to understand and to modify/fix them later. |
||
let (mut soft_limit, hard_limit) = getrlimit(Resource::RLIMIT_STACK).unwrap(); | ||
let orig_limit = (soft_limit, hard_limit); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Your changes to the test do fix the previous failure, but the coverage isn't very good, since the soft and hard limits are often identical. How about setting There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Do we really need two tests? Does the stack test provide any extra coverage over the |
||
|
||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd just remove the
RLIM_INFINITY
reference. For the user that implementation detail is completely hidden: "A value ofNone
indicates that there's no limit."There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done