-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
cli: add new "--limit-<XXX>" options
To give the user more control over the bst process, add three new options for
runing `setrlimit` before exec.
--limit-core: RLIMIT_CORE
--limit-nofile: RLIMIT_NOFILE
--limit-nproc: RLIMIT_NPROC
Each option requires an argument which is parsed as a colon-separated tuple of
hard, soft resource limits. Each of hard and soft limits are optional, and
when one is not specified, it will use the current value. The only exception
is for the special value ":" which will use the current hard limit, and set
the soft limit to the hard limit value.
--limit-nofile=100 => setrlimit(RLIMIT_NOFILE, (100, 100))
--limit-nofile=100:50 => setrlimit(RLIMIT_NOFILE, (100, 50))
--limit-nofile=100: => setrlimit(RLIMIT_NOFILE, (100, cur))
--limit-nofile=:100 => setrlimit(RLIMIT_NOFILE, (cur, 100))
--limit-nofile=: => setrlimit(RLIMIT_NOFILE, (cur, hard))
Added test cases to bst.t and also added a unit test for the parsing
code.
Usage strings:
--limit-core (<value>)|(<hard>:<soft>)
Set RLIMIT_CORE to the provided value(s).
--limit-nofile (<value>)|(<hard>:<soft>)
Set RLIMIT_NOFILE to the provided value(s).
--limit-nproc (<value>)|(<hard>:<soft>)
Set RLIMIT_NPROC to the provided value(s).- Loading branch information
1 parent
c01b008
commit c0b0c4c
Showing
12 changed files
with
449 additions
and
37 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| #include <assert.h> | ||
| #include <err.h> | ||
| #include <errno.h> | ||
| #include <inttypes.h> | ||
| #include <stdbool.h> | ||
| #include <stdint.h> | ||
| #include <string.h> | ||
| #include <sys/resource.h> | ||
|
|
||
| /* parse_complete_rlim_t: parses an rlim_t value from `value_str`. Return 0 on | ||
| success, 1 otherwise. */ | ||
| static int parse_complete_rlim_t(int resource, rlim_t *value, char const *value_str, rlim_t const *cur_value) { | ||
| assert(value_str); | ||
|
|
||
| /* an empty string means to use the current value */ | ||
| if (*value_str == '\0') { | ||
| *value = *cur_value; | ||
| return 0; | ||
| } | ||
|
|
||
| char *endptr; | ||
| intmax_t parse_val = strtoimax(value_str, &endptr, 0); | ||
| if (parse_val == INTMAX_MIN || parse_val == INTMAX_MAX) { | ||
| return 1; | ||
| } | ||
|
|
||
| if (parse_val < 0) { | ||
| errno = EINVAL; | ||
| return 1; | ||
| } | ||
|
|
||
| /* This indicates a parsing error - since value_string is non-empty, the end | ||
| of the value is not the end of the string, so the value is not entirely | ||
| numeric. */ | ||
| if (*endptr != '\0') { | ||
| errno = EINVAL; | ||
| return 1; | ||
| } | ||
|
|
||
| /* Before casting to rlim_t, check against the max possible rlim_t | ||
| value so that the (rlim_t) cast is guaranteed correct. */ | ||
| if ((uintmax_t)parse_val >= RLIM_INFINITY) { | ||
| errno = EOVERFLOW; | ||
| return 1; | ||
| } | ||
|
|
||
| *value = (rlim_t)(parse_val); | ||
| return 0; | ||
| } | ||
|
|
||
| /* parse_rlimit: parses a tuple using a ':' separator charcter as (rlim_max, | ||
| [rlim_cur]). If the optional rlim_cur is not specified, use the rlim_max | ||
| value. Return 0 on success, 1 otherwise. | ||
| Example: | ||
| 100 => (100, 100) | ||
| 100:30 => (100, 30) | ||
| :30 => ("preserve current hard limit", 30) | ||
| 100: => (100, "preserve current soft limit") | ||
| : => ("preserve current hard limit", "use current hard limit as soft limit") | ||
| limit and arg must be non-NULL. */ | ||
| int parse_rlimit(int resource, struct rlimit *limit, char *arg) | ||
| { | ||
| assert(limit); | ||
| assert(arg); | ||
|
|
||
| if (arg[0] == '\0') { | ||
| errno = EINVAL; | ||
| return 1; | ||
| } | ||
|
|
||
| char const *hard_limit = arg; | ||
| char *p; | ||
| bool found_sep = false; | ||
| for (p = arg; *p != '\0'; ++p) { | ||
| if (*p == ':') { | ||
| *p = '\0'; | ||
| found_sep = true; | ||
| ++p; | ||
| break; | ||
| } | ||
| } | ||
| /* Special case: no ":" separator, so set hard and soft to <value> */ | ||
| char const *soft_limit = found_sep ? p : hard_limit; | ||
|
|
||
| struct rlimit cur_limit_value; | ||
| rlim_t const *cur_hard_limit; | ||
| rlim_t const *cur_soft_limit; | ||
| if ( !soft_limit[0] || !hard_limit[0] ) { | ||
| if (getrlimit(resource, &cur_limit_value)) { | ||
| err(1, "getlrimit(%d) failed", resource); | ||
| return 1; | ||
| } | ||
| cur_hard_limit = &cur_limit_value.rlim_max; | ||
| cur_soft_limit = &cur_limit_value.rlim_cur; | ||
| } | ||
|
|
||
| if ( !soft_limit[0] && !hard_limit[0] ) { | ||
| /* special case: preserve hard limit, use that value as new soft | ||
| limit value */ | ||
| limit->rlim_max = *cur_hard_limit; | ||
| limit->rlim_cur = *cur_hard_limit; | ||
| return 0; | ||
| } | ||
|
|
||
| if (parse_complete_rlim_t(resource, &limit->rlim_max, hard_limit, cur_hard_limit)) { | ||
| /* pass errno through to caller */ | ||
| return 1; | ||
| } | ||
|
|
||
| if (parse_complete_rlim_t(resource, &limit->rlim_cur, soft_limit, cur_soft_limit)) { | ||
| /* pass errno through to caller */ | ||
| return 1; | ||
| } | ||
|
|
||
| return 0; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| #include <sys/resource.h> | ||
|
|
||
| int parse_rlimit(int resource, struct rlimit *limit, char *arg); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.