zsh-workers
 help / color / mirror / code / Atom feed
From: "Daniel Shahaf" <d.s@daniel.shahaf.name>
To: "Jun T" <takimoto-j@kba.biglobe.ne.jp>, zsh-workers@zsh.org
Subject: Re: [PATCH] find RLIM_NLIMITS correctly on Cygwin
Date: Wed, 08 Jan 2020 21:33:10 +0000	[thread overview]
Message-ID: <bfcc331d-b892-48e2-9eac-17bfd73287ef@www.fastmail.com> (raw)
In-Reply-To: <82F8CDE0-C95C-4D31-ABFC-EBB3C97799F3@kba.biglobe.ne.jp>

Jun T wrote on Wed, 08 Jan 2020 10:39 +00:00:
> On Cygwin, <sys/resource.h> has lines like:
> 
> #define RLIMIT_NLIMITS  7       /* upper bound of RLIMIT_* defines */
> #define RLIM_NLIMITS    RLIMIT_NLIMITS
> 
> but rlimits.awk fails to find the value of RLIM_NLIMITS
> (and sets ZSH_NLIMITS to zero).

I don't object to the patch, but we should think about actually using
a C preprocessor to parse header files, otherwise we'd just be playing
whack-a-mole as OS's use more features of C syntax in their header files.

Actually, looking at the generated $builddir/Src/Builtins/rlimits.h file,
couldn't we move the entire thing into Src/Builtins/rlimits.c?  Instead of
«recs[lim]» we could have «recs(lim)», using the following function:

static inline const char *recs(int lim)
{
    if (lim == RLIMIT_AIO_MEM) return "aiomemorylocked";
    if (lim == RLIMIT_AIO_OPS) return "aiooperations";
    ⋮
}

And then another such function for «limtype», replace the «for(i = 0; i <
ZSH_NLIMITS; i++)» loops by looping on all RLIMIT_* macros that are
#define'd by the OS, and good riddance to the awk script…

Cheers,

Daniel

> 
> diff --git a/Src/Builtins/rlimits.awk b/Src/Builtins/rlimits.awk
> index e9c576c66..4cf960314 100644
> --- a/Src/Builtins/rlimits.awk
> +++ b/Src/Builtins/rlimits.awk
> @@ -79,6 +79,12 @@ BEGIN {limidx = 0}
>      split(limtail, tmp)
>      nlimits = tmp[2]
>  }
> +# for Cygwin
> +/^[\t ]*#[\t ]*define[\t ]*RLIM_NLIMITS[\t ]*RLIMIT_NLIMITS/ {
> +    if (!nlimits && limrev["NLIMITS"]) {
> +      nlimits = limrev["NLIMITS"]
> +    }
> +}
>  
>  END {
>      if (limrev["MEMLOCK"] != "") {
> 
> 
>

  reply	other threads:[~2020-01-08 21:34 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-08 10:39 Jun T
2020-01-08 21:33 ` Daniel Shahaf [this message]
2020-01-09 10:32   ` Jun T
2020-01-09 13:15     ` Daniel Shahaf
2020-01-10 10:24       ` Jun T
2020-01-11 20:15         ` Daniel Shahaf
2020-01-13 11:00           ` Jun T
2020-01-13 16:42             ` Daniel Shahaf
2020-01-14  4:44               ` Jun T
2020-01-14 16:25                 ` Daniel Shahaf
2020-02-25  9:38                   ` Jun T
2020-02-27 13:22                     ` Daniel Shahaf
2020-02-27 18:46                       ` Mikael Magnusson
2020-02-28  8:42                       ` Jun T
2020-02-28 14:19                         ` Daniel Shahaf
2020-02-28 14:31                           ` Daniel Shahaf
2020-03-03  9:23                           ` Jun T
2020-03-04 19:29                             ` Daniel Shahaf
2020-03-05 10:26                               ` Jun T
2020-03-05 14:58                                 ` Daniel Shahaf
2020-03-20 17:02                             ` Daniel Shahaf
2020-03-20 17:20                               ` Bart Schaefer
2020-03-20 17:39                                 ` Daniel Shahaf
2020-03-20 18:28                                   ` Daniel Shahaf
2020-03-20 18:36                                     ` Bart Schaefer
2020-03-20 19:38                                       ` Daniel Shahaf
2020-03-20 18:39                                     ` Bart Schaefer
2020-03-20 19:32                                       ` Daniel Shahaf
2020-03-20 19:18                     ` Daniel Shahaf
2020-03-23  5:31                       ` Jun T
2020-03-24  2:08                         ` Daniel Shahaf
2020-03-23  5:41                       ` Jun T
2020-03-24  1:33                         ` Jun T
2020-03-24  2:43                           ` Daniel Shahaf
2020-03-25  0:16                             ` Jun T
2020-03-25 22:04                               ` Daniel Shahaf
2020-03-25 23:42                                 ` [PATCH] find RLIM_NLIMITS correctly on CygwinjL Daniel Shahaf
2020-03-24  2:34                         ` [PATCH] find RLIM_NLIMITS correctly on Cygwin Daniel Shahaf

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=bfcc331d-b892-48e2-9eac-17bfd73287ef@www.fastmail.com \
    --to=d.s@daniel.shahaf.name \
    --cc=takimoto-j@kba.biglobe.ne.jp \
    --cc=zsh-workers@zsh.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/zsh/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).