Re: ulimit -a: -r vs -N [was Re: pkgsrc patches for zsh]

[Peter Stephenson <p.stephenson@samsung.com>]

On Tue, 24 Jun 2014 19:09:08 +0200
Thomas Klausner <tk@giga.or.at> wrote:
> On Tue, Jun 24, 2014 at 05:26:42PM +0100, Peter Stephenson wrote:
> > On Tue, 24 Jun 2014 18:11:02 +0200
> > Thomas Klausner <tk@giga.or.at> wrote:
> > > thread        (-r threads    ) 160
> > 
> > > If I raise the threads limit here to 161, the value for "-N 11" in zsh
> > > is also 161, so it's the same limit.
> > 
> > I'm presuming you don't have RTPRIO (so there's no clash)?  What's the
> > name (enum or #defined) of the limit referred to as "threads", i.e. with
> > the value 11?  Should be in something like /usr/include/sys/resource.h
> > or something included from there.
> > 
> > gcc -E /usr/include/sys/resource.h | grep RLIMIT
> > 
> > might be enough to answer both questions.
> 
> The gcc statement, for some reason, doesn't work, but:
> 
> ./sys/resource.h:#define        RLIMIT_NTHR     11              /* number of threads */
> 
> # grep -r RTPRIO /usr/include
> #

That's supposed to be covered by -T for RLIMIT_PTHREAD, but the way
NetBSD sets up its limits this doesn't work, and there appears to be a
case missing in the handler.  It was moved by zsh-workers/31936
(http://www.zsh.org/mla/workers/2013/msg00970.html) to avoid the clash
with other meanings of -r, which seems reasonable given the possible
confusions, although we could provide backward compatibility where
RTPRIO doesn't exist.

diff --git a/Src/Builtins/rlimits.c b/Src/Builtins/rlimits.c
index 0bcafda..a9eb328 100644
--- a/Src/Builtins/rlimits.c
+++ b/Src/Builtins/rlimits.c
@@ -32,12 +32,14 @@
 
 #if defined(HAVE_GETRLIMIT) && defined(RLIM_INFINITY)
 
-#ifdef RLIMIT_POSIXLOCKS
+#if defined(HAVE_RLIMIT_POSIXLOCKS) && !defined(HAVE_RLIMIT_LOCKS)
 #  define RLIMIT_LOCKS		RLIMIT_POSIXLOCKS
+#  define HAVE_RLIMIT_LOCKS     1
 #endif
 
-#ifdef RLIMIT_NTHR
+#if defined(HAVE_RLIMIT_NTHR) && !defined(HAVE_RLIMIT_PTHREAD)
 #  define RLIMIT_PTHREAD	RLIMIT_NTHR
+#  define HAVE_RLIMIT_PTHREAD   1
 #endif
 
 enum {
@@ -876,6 +878,11 @@ bin_ulimit(char *name, char **argv, UNUSED(Options ops), UNUSED(int func))
 		    res = RLIMIT_KQUEUES;
 		    break;
 # endif
+# ifdef HAVE_RLIMIT_PTHREAD
+		case 'T':
+		    res = RLIMIT_PTHREAD;
+		    break;
+# endif
 		default:
 		    /* unrecognised limit */
 		    zwarnnam(name, "bad option: -%c", *options);
diff --git a/configure.ac b/configure.ac
index a2a6b9e..7c04c3a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1836,6 +1836,7 @@ zsh_LIMIT_PRESENT(RLIMIT_POSIXLOCKS)
 zsh_LIMIT_PRESENT(RLIMIT_NPTS)
 zsh_LIMIT_PRESENT(RLIMIT_SWAP)
 zsh_LIMIT_PRESENT(RLIMIT_KQUEUES)
+zsh_LIMIT_PRESENT(RLIMIT_NTHR)
 
 AH_TEMPLATE([RLIMIT_VMEM_IS_RSS],
 [Define to 1 if RLIMIT_VMEM and RLIMIT_RSS both exist and are equal.])

-- 
Peter Stephenson <p.stephenson@samsung.com>  Principal Software Engineer
Tel: +44 (0)1223 434724                Samsung Cambridge Solution Centre
St John's House, St John's Innovation Park, Cowley Road,
Cambridge, CB4 0DS, UK