Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow thread limit queries by adding the new -r flag to ulimit. Add 

the corresponding documentation in the man page.
This commit is contained in:
njoly 2012-06-11 18:28:10 +00:00
parent 0a449abb14
commit 089201c2fd
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/sh/miscbltin.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: miscbltin.c,v 1.41 2012/06/09 02:49:48 christos Exp $ */ /* $NetBSD: miscbltin.c,v 1.42 2012/06/11 18:28:10 njoly Exp $ */
/*- /*-
* Copyright (c) 1991, 1993 * Copyright (c) 1991, 1993
@ -37,7 +37,7 @@
#if 0 #if 0
static char sccsid[] = "@(#)miscbltin.c 8.4 (Berkeley) 5/4/95"; static char sccsid[] = "@(#)miscbltin.c 8.4 (Berkeley) 5/4/95";
#else #else
__RCSID("$NetBSD: miscbltin.c,v 1.41 2012/06/09 02:49:48 christos Exp $"); __RCSID("$NetBSD: miscbltin.c,v 1.42 2012/06/11 18:28:10 njoly Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -364,7 +364,7 @@ ulimitcmd(int argc, char **argv)
struct rlimit limit; struct rlimit limit;
what = 'f'; what = 'f';
while ((optc = nextopt("HSabtfdsmcnplv")) != '\0') while ((optc = nextopt("HSabtfdscmlrpnv")) != '\0')
switch (optc) { switch (optc) {
case 'H': case 'H':
how = HARD; how = HARD;

9
bin/sh/sh.1
View File

@ -1,4 +1,4 @@
.\" $NetBSD: sh.1,v 1.106 2011/10/05 13:15:30 christos Exp $ .\" $NetBSD: sh.1,v 1.107 2012/06/11 18:28:10 njoly Exp $
.\" Copyright (c) 1991, 1993 .\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved. .\" The Regents of the University of California. All rights reserved.
.\" .\"
@ -31,7 +31,7 @@
.\" .\"
.\" @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" @(#)sh.1 8.6 (Berkeley) 5/4/95
.\" .\"
.Dd October 4, 2011 .Dd June 11, 2012
.Dt SH 1 .Dt SH 1
.Os .Os
.Sh NAME .Sh NAME
@ -1731,7 +1731,7 @@ command, tracked alias and not found.
For aliases the alias expansion is For aliases the alias expansion is
printed; for commands and tracked aliases the complete pathname of the printed; for commands and tracked aliases the complete pathname of the
command is printed. command is printed.
.It ulimit Oo Fl H \*(Ba Fl S Oc Oo Fl a \*(Ba Fl tfdscmlpnv Oo Ar value Oc Oc .It ulimit Oo Fl H \*(Ba Fl S Oc Oo Fl a \*(Ba Fl btfdscmlrpnv Oo Ar value Oc Oc
Inquire about or set the hard or soft limits on processes or set new Inquire about or set the hard or soft limits on processes or set new
limits. limits.
The choice between hard limit (which no process is allowed to The choice between hard limit (which no process is allowed to
@ -1777,6 +1777,9 @@ in use by a process (in kilobytes)
show or set the limit on how much memory a process can lock with show or set the limit on how much memory a process can lock with
.Xr mlock 2 .Xr mlock 2
(in kilobytes) (in kilobytes)
.It Fl r
show or set the limit on the number of threads this user can
have at one time
.It Fl p .It Fl p
show or set the limit on the number of processes this user can show or set the limit on the number of processes this user can
have at one time have at one time