diff options
| author | Stefan Neudorf <BM-2cXppXU4T67w7j6NCir9T1WdzBHmFgBnLj@bitmessage.ch> | 2013-11-01 00:41:41 +0100 |
|---|---|---|
| committer | Peter Stephenson <p.w.stephenson@ntlworld.com> | 2013-11-03 19:51:34 +0000 |
| commit | 73746daf7f1e79fa970ab979e645915295157426 (patch) | |
| tree | 4c84991f0ad1b4aa2c1178757f541ea916a72cc7 /Src/Builtins | |
| parent | 93dec3a96a38141c6176eb07d51c59f0ab15d151 (diff) | |
| download | zsh-73746daf7f1e79fa970ab979e645915295157426.tar.gz zsh-73746daf7f1e79fa970ab979e645915295157426.tar.xz zsh-73746daf7f1e79fa970ab979e645915295157426.zip | |
31936: Rationalise limits for threads
Diffstat (limited to 'Src/Builtins')
| -rw-r--r-- | Src/Builtins/rlimits.awk | 2 | ||||
| -rw-r--r-- | Src/Builtins/rlimits.c | 17 |
2 files changed, 6 insertions, 13 deletions
diff --git a/Src/Builtins/rlimits.awk b/Src/Builtins/rlimits.awk index b5a25fd83..fe2d0e931 100644 --- a/Src/Builtins/rlimits.awk +++ b/Src/Builtins/rlimits.awk @@ -42,7 +42,7 @@ BEGIN {limidx = 0} if (limnam == "MEMLOCK") { msg[limnum] = "Mmemorylocked" } if (limnam == "NOFILE") { msg[limnum] = "Ndescriptors" } if (limnam == "NPROC") { msg[limnum] = "Nmaxproc" } - if (limnam == "NTHR") { msg[limnum] = "Nmaxthr" } + if (limnam == "NTHR") { msg[limnum] = "Nmaxpthreads" } if (limnam == "OFILE") { msg[limnum] = "Ndescriptors" } if (limnam == "PTHREAD") { msg[limnum] = "Nmaxpthreads" } if (limnam == "RSS") { msg[limnum] = "Mresident" } diff --git a/Src/Builtins/rlimits.c b/Src/Builtins/rlimits.c index e48a1d3e3..fd4c94aaa 100644 --- a/Src/Builtins/rlimits.c +++ b/Src/Builtins/rlimits.c @@ -36,6 +36,10 @@ # define RLIMIT_LOCKS RLIMIT_POSIXLOCKS #endif +#ifdef RLIMIT_NTHR +# define RLIMIT_PTHREAD RLIMIT_NTHR +#endif + enum { ZLIMTYPE_MEMORY, ZLIMTYPE_NUMBER, @@ -318,12 +322,6 @@ printulimit(char *nam, int lim, int hard, int head) printf("-u: processes "); break; # endif /* HAVE_RLIMIT_NPROC */ -# ifdef HAVE_RLIMIT_NTHR - case RLIMIT_NTHR: - if (head) - printf("-r: threads "); - break; -#endif /* HAVE_RLIMIT_NTHR */ # if defined(HAVE_RLIMIT_VMEM) && (!defined(HAVE_RLIMIT_RSS) || !defined(RLIMIT_VMEM_IS_RSS)) case RLIMIT_VMEM: if (head) @@ -375,7 +373,7 @@ printulimit(char *nam, int lim, int hard, int head) # ifdef HAVE_RLIMIT_PTHREAD case RLIMIT_PTHREAD: if (head) - printf("-N %2d: threads per process ", RLIMIT_PTHREAD); + printf("-T: threads per process "); break; # endif /* HAVE_RLIMIT_PTHREAD */ # ifdef HAVE_RLIMIT_NICE @@ -824,11 +822,6 @@ bin_ulimit(char *name, char **argv, UNUSED(Options ops), UNUSED(int func)) res = RLIMIT_NOFILE; break; # endif /* HAVE_RLIMIT_NOFILE */ -# ifdef HAVE_RLIMIT_NTHR - case 'r': - res = RLIMIT_NTHR; - break; -# endif /* HAVE_RLIMIT_NTHR */ # ifdef HAVE_RLIMIT_NPROC case 'u': res = RLIMIT_NPROC; |