From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 21307 invoked by alias); 12 Aug 2004 18:53:11 -0000 Mailing-List: contact libc-hacker-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-hacker-owner@sources.redhat.com Received: (qmail 21282 invoked from network); 12 Aug 2004 18:53:11 -0000 Received: from unknown (HELO sunsite.ms.mff.cuni.cz) (195.113.15.26) by sourceware.org with SMTP; 12 Aug 2004 18:53:11 -0000 Received: from sunsite.ms.mff.cuni.cz (sunsite.mff.cuni.cz [127.0.0.1]) by sunsite.ms.mff.cuni.cz (8.12.8/8.12.8) with ESMTP id i7CGa93j029002; Thu, 12 Aug 2004 18:36:09 +0200 Received: (from jakub@localhost) by sunsite.ms.mff.cuni.cz (8.12.8/8.12.8/Submit) id i7CGa95c029000; Thu, 12 Aug 2004 18:36:09 +0200 Date: Thu, 12 Aug 2004 18:53:00 -0000 From: Jakub Jelinek To: Ulrich Drepper Cc: Glibc hackers Subject: Re: [PATCH] Update Message-ID: <20040812163609.GB30497@sunsite.ms.mff.cuni.cz> Reply-To: Jakub Jelinek References: <20040812113052.GZ30497@sunsite.ms.mff.cuni.cz> <411BAA5B.70107@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <411BAA5B.70107@redhat.com> User-Agent: Mutt/1.4.1i X-SW-Source: 2004-08/txt/msg00049.txt.bz2 On Thu, Aug 12, 2004 at 10:35:23AM -0700, Ulrich Drepper wrote: > Jakub Jelinek wrote: > > > If I'm right, maybe the enum values should have __ prefix added > > and the defines adjusted accordingly. > > Yes, non-standard RLIMIT_ enums must be __RLIMIT_ and the macros must be > appropriately defined. And the standard ones can stay as is? If so, here is the updated patch. RLIMIT_RSS, RLIMIT_OFILE, RLIMIT_LOCKS, RLIMIT_SIGPENDING, RLIMIT_MSGQUEUE and RUSAGE_BOTH don't seem to appear in the standard and neither does RLIMIT_NLIMITS nor RLIM_NLIMITS, so I have prefixed them all with __. 2004-08-12 Jakub Jelinek * sysdeps/unix/sysv/linux/bits/resource.h (RLIMIT_SIGPENDING, RLIMIT_MSGQUEUE): Add. (RLIMIT_RSS, RLIMIT_OFILE, RLIMIT_LOCKS, RUSAGE_BOTH): Prefix the enum value with __, adjust define. (RLIMIT_NLIMITS, RLIM_NLIMITS): Likewise, adjust for the added two limits. * sysdeps/unix/sysv/linux/alpha/bits/resource.h (RLIMIT_SIGPENDING, RLIMIT_MSGQUEUE): Add. (RLIMIT_RSS, RLIMIT_OFILE, RLIMIT_LOCKS, RUSAGE_BOTH): Prefix the enum value with __, adjust define. (RLIM_NLIMITS): Likewise, adjust for the added two limits. (RLIMIT_NLIMITS): Add corresponding enum value, adjust define. * sysdeps/unix/sysv/linux/sparc/bits/resource.h (RLIMIT_SIGPENDING, RLIMIT_MSGQUEUE): Add. (RLIMIT_RSS, RLIMIT_OFILE, RLIMIT_LOCKS, RUSAGE_BOTH): Prefix the enum value with __, adjust define. (RLIM_NLIMITS): Likewise, adjust for the added two limits. (RLIMIT_NLIMITS): Add corresponding enum value, adjust define. * sysdeps/unix/sysv/linux/mips/bits/resource.h (RLIMIT_SIGPENDING, RLIMIT_MSGQUEUE): Add. (RLIMIT_RSS, RLIMIT_OFILE, RLIMIT_LOCKS, RUSAGE_BOTH): Prefix the enum value with __, adjust define. (RLIM_NLIMITS): Likewise, adjust for the added two limits. (RLIMIT_NLIMITS): Add corresponding enum value, adjust define. --- libc/sysdeps/unix/sysv/linux/alpha/bits/resource.h.jj 2001-07-06 06:56:13.000000000 +0200 +++ libc/sysdeps/unix/sysv/linux/alpha/bits/resource.h 2004-08-12 20:17:41.856018498 +0200 @@ -1,5 +1,6 @@ /* Bit values & structures for resource limits. Alpha/Linux version. - Copyright (C) 1994,96,97,98,99,2000 Free Software Foundation, Inc. + Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2004 + Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -55,34 +56,43 @@ enum __rlimit_resource This affects swapping; processes that are exceeding their resident set size will be more likely to have physical memory taken from them. */ - RLIMIT_RSS = 5, -#define RLIMIT_RSS RLIMIT_RSS + __RLIMIT_RSS = 5, +#define RLIMIT_RSS __RLIMIT_RSS /* Number of open files. */ RLIMIT_NOFILE = 6, - RLIMIT_OFILE = RLIMIT_NOFILE, /* BSD name for same. */ + __RLIMIT_OFILE = RLIMIT_NOFILE, /* BSD name for same. */ #define RLIMIT_NOFILE RLIMIT_NOFILE -#define RLIMIT_OFILE RLIMIT_OFILE +#define RLIMIT_OFILE __RLIMIT_OFILE /* Address space limit (?) */ RLIMIT_AS = 7, #define RLIMIT_AS RLIMIT_AS /* Number of processes. */ - RLIMIT_NPROC = 8, -#define RLIMIT_NPROC RLIMIT_NPROC + __RLIMIT_NPROC = 8, +#define RLIMIT_NPROC __RLIMIT_NPROC /* Locked-in-memory address space. */ - RLIMIT_MEMLOCK = 9, -#define RLIMIT_MEMLOCK RLIMIT_MEMLOCK + __RLIMIT_MEMLOCK = 9, +#define RLIMIT_MEMLOCK __RLIMIT_MEMLOCK /* Maximum number of file locks. */ - RLIMIT_LOCKS = 10, -#define RLIMIT_LOCKS RLIMIT_LOCKS + __RLIMIT_LOCKS = 10, +#define RLIMIT_LOCKS __RLIMIT_LOCKS - RLIM_NLIMITS = 11 -#define RLIMIT_NLIMITS RLIMIT_NLIMITS -#define RLIM_NLIMITS RLIM_NLIMITS + /* Maximum number of pending signals. */ + __RLIMIT_SIGPENDING = 11, +#define RLIMIT_SIGPENDING __RLIMIT_SIGPENDING + + /* Maximum bytes in POSIX message queues. */ + __RLIMIT_MSGQUEUE = 12, +#define RLIMIT_MSGQUEUE __RLIMIT_MSGQUEUE + + __RLIMIT_NLIMITS = 13, + __RLIM_NLIMITS = __RLIMIT_NLIMITS +#define RLIMIT_NLIMITS __RLIMIT_NLIMITS +#define RLIM_NLIMITS __RLIM_NLIMITS }; /* Value to indicate that there is no limit. */ @@ -141,8 +151,8 @@ enum __rusage_who #define RUSAGE_CHILDREN RUSAGE_CHILDREN /* Both. */ - RUSAGE_BOTH = -2 -#define RUSAGE_BOTH RUSAGE_BOTH + __RUSAGE_BOTH = -2 +#define RUSAGE_BOTH __RUSAGE_BOTH }; #define __need_timeval --- libc/sysdeps/unix/sysv/linux/sparc/bits/resource.h.jj 2001-07-06 06:56:21.000000000 +0200 +++ libc/sysdeps/unix/sysv/linux/sparc/bits/resource.h 2004-08-12 20:19:24.507146532 +0200 @@ -1,5 +1,6 @@ /* Bit values & structures for resource limits. Linux/SPARC version. - Copyright (C) 1994,1996,1997,1998,1999,2000 Free Software Foundation, Inc. + Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2004 + Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -55,34 +56,43 @@ enum __rlimit_resource This affects swapping; processes that are exceeding their resident set size will be more likely to have physical memory taken from them. */ - RLIMIT_RSS = 5, -#define RLIMIT_RSS RLIMIT_RSS + __RLIMIT_RSS = 5, +#define RLIMIT_RSS __RLIMIT_RSS /* Number of open files. */ RLIMIT_NOFILE = 6, - RLIMIT_OFILE = RLIMIT_NOFILE, /* BSD name for same. */ + __RLIMIT_OFILE = RLIMIT_NOFILE, /* BSD name for same. */ #define RLIMIT_NOFILE RLIMIT_NOFILE -#define RLIMIT_OFILE RLIMIT_OFILE +#define RLIMIT_OFILE __RLIMIT_OFILE /* Address space limit (?) */ RLIMIT_AS = 9, #define RLIMIT_AS RLIMIT_AS /* Number of processes. */ - RLIMIT_NPROC = 7, -#define RLIMIT_NPROC RLIMIT_NPROC + __RLIMIT_NPROC = 7, +#define RLIMIT_NPROC __RLIMIT_NPROC /* Locked-in-memory address space. */ - RLIMIT_MEMLOCK = 8, -#define RLIMIT_MEMLOCK RLIMIT_MEMLOCK + __RLIMIT_MEMLOCK = 8, +#define RLIMIT_MEMLOCK __RLIMIT_MEMLOCK /* Maximum number of file locks. */ - RLIMIT_LOCKS = 10, -#define RLIMIT_LOCKS RLIMIT_LOCKS + __RLIMIT_LOCKS = 10, +#define RLIMIT_LOCKS __RLIMIT_LOCKS - RLIM_NLIMITS = 11 -#define RLIMIT_NLIMITS RLIMIT_NLIMITS -#define RLIM_NLIMITS RLIM_NLIMITS + /* Maximum number of pending signals. */ + __RLIMIT_SIGPENDING = 11, +#define RLIMIT_SIGPENDING __RLIMIT_SIGPENDING + + /* Maximum bytes in POSIX message queues. */ + __RLIMIT_MSGQUEUE = 12, +#define RLIMIT_MSGQUEUE __RLIMIT_MSGQUEUE + + __RLIMIT_NLIMITS = 13, + __RLIM_NLIMITS = __RLIMIT_NLIMITS +#define RLIMIT_NLIMITS __RLIMIT_NLIMITS +#define RLIM_NLIMITS __RLIM_NLIMITS }; /* Value to indicate that there is no limit. */ @@ -157,8 +167,8 @@ enum __rusage_who #define RUSAGE_CHILDREN RUSAGE_CHILDREN /* Both. */ - RUSAGE_BOTH = -2 -#define RUSAGE_BOTH RUSAGE_BOTH + __RUSAGE_BOTH = -2 +#define RUSAGE_BOTH __RUSAGE_BOTH }; #define __need_timeval --- libc/sysdeps/unix/sysv/linux/mips/bits/resource.h.jj 2001-07-06 06:56:18.000000000 +0200 +++ libc/sysdeps/unix/sysv/linux/mips/bits/resource.h 2004-08-12 20:21:02.873020046 +0200 @@ -1,5 +1,6 @@ /* Bit values & structures for resource limits. Linux/MIPS version. - Copyright (C) 1994,1996,1997,1998,1999,2000 Free Software Foundation, Inc. + Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2004 + Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -55,34 +56,43 @@ enum __rlimit_resource This affects swapping; processes that are exceeding their resident set size will be more likely to have physical memory taken from them. */ - RLIMIT_RSS = 7, -#define RLIMIT_RSS RLIMIT_RSS + __RLIMIT_RSS = 7, +#define RLIMIT_RSS __RLIMIT_RSS /* Number of open files. */ RLIMIT_NOFILE = 5, - RLIMIT_OFILE = RLIMIT_NOFILE, /* BSD name for same. */ + __RLIMIT_OFILE = RLIMIT_NOFILE, /* BSD name for same. */ #define RLIMIT_NOFILE RLIMIT_NOFILE -#define RLIMIT_OFILE RLIMIT_OFILE +#define RLIMIT_OFILE __RLIMIT_OFILE /* Address space limit (?) */ RLIMIT_AS = 6, #define RLIMIT_AS RLIMIT_AS /* Number of processes. */ - RLIMIT_NPROC = 8, -#define RLIMIT_NPROC RLIMIT_NPROC + __RLIMIT_NPROC = 8, +#define RLIMIT_NPROC __RLIMIT_NPROC /* Locked-in-memory address space. */ - RLIMIT_MEMLOCK = 9, -#define RLIMIT_MEMLOCK RLIMIT_MEMLOCK + __RLIMIT_MEMLOCK = 9, +#define RLIMIT_MEMLOCK __RLIMIT_MEMLOCK /* Maximum number of file locks. */ - RLIMIT_LOCKS = 10, -#define RLIMIT_LOCKS RLIMIT_LOCKS + __RLIMIT_LOCKS = 10, +#define RLIMIT_LOCKS __RLIMIT_LOCKS - RLIM_NLIMITS = 11 -#define RLIMIT_NLIMITS RLIMIT_NLIMITS -#define RLIM_NLIMITS RLIM_NLIMITS + /* Maximum number of pending signals. */ + __RLIMIT_SIGPENDING = 11, +#define RLIMIT_SIGPENDING __RLIMIT_SIGPENDING + + /* Maximum bytes in POSIX message queues. */ + __RLIMIT_MSGQUEUE = 12, +#define RLIMIT_MSGQUEUE __RLIMIT_MSGQUEUE + + __RLIMIT_NLIMITS = 13, + __RLIM_NLIMITS = __RLIMIT_NLIMITS +#define RLIMIT_NLIMITS __RLIMIT_NLIMITS +#define RLIM_NLIMITS __RLIM_NLIMITS }; /* Value to indicate that there is no limit. */ @@ -141,8 +151,8 @@ enum __rusage_who #define RUSAGE_CHILDREN RUSAGE_CHILDREN /* Both. */ - RUSAGE_BOTH = -2 -#define RUSAGE_BOTH RUSAGE_BOTH + __RUSAGE_BOTH = -2 +#define RUSAGE_BOTH __RUSAGE_BOTH }; #define __need_timeval --- libc/sysdeps/unix/sysv/linux/bits/resource.h.jj 2002-10-16 03:02:22.000000000 +0200 +++ libc/sysdeps/unix/sysv/linux/bits/resource.h 2004-08-12 20:11:47.340748256 +0200 @@ -1,5 +1,6 @@ /* Bit values & structures for resource limits. Linux version. - Copyright (C) 1994,1996,1997,1998,1999,2000 Free Software Foundation, Inc. + Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2004 + Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -55,35 +56,43 @@ enum __rlimit_resource This affects swapping; processes that are exceeding their resident set size will be more likely to have physical memory taken from them. */ - RLIMIT_RSS = 5, -#define RLIMIT_RSS RLIMIT_RSS + __RLIMIT_RSS = 5, +#define RLIMIT_RSS __RLIMIT_RSS /* Number of open files. */ RLIMIT_NOFILE = 7, - RLIMIT_OFILE = RLIMIT_NOFILE, /* BSD name for same. */ + __RLIMIT_OFILE = RLIMIT_NOFILE, /* BSD name for same. */ #define RLIMIT_NOFILE RLIMIT_NOFILE -#define RLIMIT_OFILE RLIMIT_OFILE +#define RLIMIT_OFILE __RLIMIT_OFILE /* Address space limit. */ RLIMIT_AS = 9, #define RLIMIT_AS RLIMIT_AS /* Number of processes. */ - RLIMIT_NPROC = 6, -#define RLIMIT_NPROC RLIMIT_NPROC + __RLIMIT_NPROC = 6, +#define RLIMIT_NPROC __RLIMIT_NPROC /* Locked-in-memory address space. */ - RLIMIT_MEMLOCK = 8, -#define RLIMIT_MEMLOCK RLIMIT_MEMLOCK + __RLIMIT_MEMLOCK = 8, +#define RLIMIT_MEMLOCK __RLIMIT_MEMLOCK /* Maximum number of file locks. */ - RLIMIT_LOCKS = 10, -#define RLIMIT_LOCKS RLIMIT_LOCKS + __RLIMIT_LOCKS = 10, +#define RLIMIT_LOCKS __RLIMIT_LOCKS - RLIMIT_NLIMITS = 11, - RLIM_NLIMITS = RLIMIT_NLIMITS -#define RLIMIT_NLIMITS RLIMIT_NLIMITS -#define RLIM_NLIMITS RLIM_NLIMITS + /* Maximum number of pending signals. */ + __RLIMIT_SIGPENDING = 11, +#define RLIMIT_SIGPENDING __RLIMIT_SIGPENDING + + /* Maximum bytes in POSIX message queues. */ + __RLIMIT_MSGQUEUE = 12, +#define RLIMIT_MSGQUEUE __RLIMIT_MSGQUEUE + + __RLIMIT_NLIMITS = 13, + __RLIM_NLIMITS = __RLIMIT_NLIMITS +#define RLIMIT_NLIMITS __RLIMIT_NLIMITS +#define RLIM_NLIMITS __RLIM_NLIMITS }; /* Value to indicate that there is no limit. */ @@ -142,8 +151,8 @@ enum __rusage_who #define RUSAGE_CHILDREN RUSAGE_CHILDREN /* Both. */ - RUSAGE_BOTH = -2 -#define RUSAGE_BOTH RUSAGE_BOTH + __RUSAGE_BOTH = -2 +#define RUSAGE_BOTH __RUSAGE_BOTH }; #define __need_timeval Jakub