This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
PATCH: Add x86_64/bits/resource.h
- From: "H.J. Lu" <hongjiu dot lu at intel dot com>
- To: GNU C Library <libc-alpha at sourceware dot org>
- Date: Wed, 16 May 2012 12:38:36 -0700
- Subject: PATCH: Add x86_64/bits/resource.h
- Reply-to: "H.J. Lu" <hjl dot tools at gmail dot com>
X32 uses the same resource interface as x86-64. This patch adds
x86_64/bits/resource.h to pad struct rusage for x32 and define
RLIM_INFINITY properly for x32. The diff against linux/bits/resource.h is
--- sysdeps/unix/sysv/linux/bits/resource.h 2012-05-16 09:42:01.937227475 -0700
+++ sysdeps/unix/sysv/linux/x86_64/bits/resource.h 2012-05-16 12:32:53.602318224 -0700
@@ -113,7 +112,7 @@ enum __rlimit_resource
/* Value to indicate that there is no limit. */
#ifndef __USE_FILE_OFFSET64
-# define RLIM_INFINITY ((unsigned long int)(~0UL))
+# define RLIM_INFINITY ((__rlim_t) -1)
#else
# define RLIM_INFINITY 0xffffffffffffffffuLL
#endif
@@ -188,38 +187,80 @@ struct rusage
struct timeval ru_stime;
/* Maximum resident set size (in kilobytes). */
long int ru_maxrss;
+#if defined __x86_64__ && defined __ILP32__
+ long int __unused1;
+#endif
/* Amount of sharing of text segment memory
with other processes (kilobyte-seconds). */
long int ru_ixrss;
+#if defined __x86_64__ && defined __ILP32__
+ long int __unused2;
+#endif
/* Amount of data segment memory used (kilobyte-seconds). */
long int ru_idrss;
+#if defined __x86_64__ && defined __ILP32__
+ long int __unused3;
+#endif
/* Amount of stack memory used (kilobyte-seconds). */
long int ru_isrss;
+#if defined __x86_64__ && defined __ILP32__
+ long int __unused4;
+#endif
/* Number of soft page faults (i.e. those serviced by reclaiming
a page from the list of pages awaiting reallocation. */
long int ru_minflt;
+#if defined __x86_64__ && defined __ILP32__
+ long int __unused5;
+#endif
/* Number of hard page faults (i.e. those that required I/O). */
long int ru_majflt;
+#if defined __x86_64__ && defined __ILP32__
+ long int __unused6;
+#endif
/* Number of times a process was swapped out of physical memory. */
long int ru_nswap;
+#if defined __x86_64__ && defined __ILP32__
+ long int __unused7;
+#endif
/* Number of input operations via the file system. Note: This
and `ru_oublock' do not include operations with the cache. */
long int ru_inblock;
+#if defined __x86_64__ && defined __ILP32__
+ long int __unused8;
+#endif
/* Number of output operations via the file system. */
long int ru_oublock;
+#if defined __x86_64__ && defined __ILP32__
+ long int __unused9;
+#endif
/* Number of IPC messages sent. */
long int ru_msgsnd;
+#if defined __x86_64__ && defined __ILP32__
+ long int __unused10;
+#endif
/* Number of IPC messages received. */
long int ru_msgrcv;
+#if defined __x86_64__ && defined __ILP32__
+ long int __unused11;
+#endif
/* Number of signals delivered. */
long int ru_nsignals;
+#if defined __x86_64__ && defined __ILP32__
+ long int __unused12;
+#endif
/* Number of voluntary context switches, i.e. because the process
gave up the process before it had to (usually to wait for some
resource to be available). */
long int ru_nvcsw;
+#if defined __x86_64__ && defined __ILP32__
+ long int __unused13;
+#endif
/* Number of involuntary context switches, i.e. a higher priority process
became runnable or the current process used up its time slice. */
long int ru_nivcsw;
+#if defined __x86_64__ && defined __ILP32__
+ long int __unused14;
+#endif
};
/* Priority limits. */
OK to install?
Thanks.
H.J.
---
* sysdeps/unix/sysv/linux/x86_64/bits/resource.h: New file.
diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/resource.h b/sysdeps/unix/sysv/linux/x86_64/bits/resource.h
new file mode 100644
index 0000000..76990f1
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/x86_64/bits/resource.h
@@ -0,0 +1,308 @@
+/* Bit values & structures for resource limits. Linux version.
+ Copyright (C) 1994-2012 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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+#ifndef _SYS_RESOURCE_H
+# error "Never use <bits/resource.h> directly; include <sys/resource.h> instead."
+#endif
+
+#include <bits/types.h>
+
+/* Transmute defines to enumerations. The macro re-definitions are
+ necessary because some programs want to test for operating system
+ features with #ifdef RUSAGE_SELF. In ISO C the reflexive
+ definition is a no-op. */
+
+/* Kinds of resource limit. */
+enum __rlimit_resource
+{
+ /* Per-process CPU limit, in seconds. */
+ RLIMIT_CPU = 0,
+#define RLIMIT_CPU RLIMIT_CPU
+
+ /* Largest file that can be created, in bytes. */
+ RLIMIT_FSIZE = 1,
+#define RLIMIT_FSIZE RLIMIT_FSIZE
+
+ /* Maximum size of data segment, in bytes. */
+ RLIMIT_DATA = 2,
+#define RLIMIT_DATA RLIMIT_DATA
+
+ /* Maximum size of stack segment, in bytes. */
+ RLIMIT_STACK = 3,
+#define RLIMIT_STACK RLIMIT_STACK
+
+ /* Largest core file that can be created, in bytes. */
+ RLIMIT_CORE = 4,
+#define RLIMIT_CORE RLIMIT_CORE
+
+ /* Largest resident set size, in bytes.
+ 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
+
+ /* Number of open files. */
+ RLIMIT_NOFILE = 7,
+ __RLIMIT_OFILE = RLIMIT_NOFILE, /* BSD name for same. */
+#define RLIMIT_NOFILE RLIMIT_NOFILE
+#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
+
+ /* Locked-in-memory address space. */
+ __RLIMIT_MEMLOCK = 8,
+#define RLIMIT_MEMLOCK __RLIMIT_MEMLOCK
+
+ /* Maximum number of file locks. */
+ __RLIMIT_LOCKS = 10,
+#define RLIMIT_LOCKS __RLIMIT_LOCKS
+
+ /* 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
+
+ /* Maximum nice priority allowed to raise to.
+ Nice levels 19 .. -20 correspond to 0 .. 39
+ values of this resource limit. */
+ __RLIMIT_NICE = 13,
+#define RLIMIT_NICE __RLIMIT_NICE
+
+ /* Maximum realtime priority allowed for non-priviledged
+ processes. */
+ __RLIMIT_RTPRIO = 14,
+#define RLIMIT_RTPRIO __RLIMIT_RTPRIO
+
+ /* Maximum CPU time in µs that a process scheduled under a real-time
+ scheduling policy may consume without making a blocking system
+ call before being forcibly descheduled. */
+ __RLIMIT_RTTIME = 15,
+#define RLIMIT_RTTIME __RLIMIT_RTTIME
+
+ __RLIMIT_NLIMITS = 16,
+ __RLIM_NLIMITS = __RLIMIT_NLIMITS
+#define RLIMIT_NLIMITS __RLIMIT_NLIMITS
+#define RLIM_NLIMITS __RLIM_NLIMITS
+};
+
+/* Value to indicate that there is no limit. */
+#ifndef __USE_FILE_OFFSET64
+# define RLIM_INFINITY ((__rlim_t) -1)
+#else
+# define RLIM_INFINITY 0xffffffffffffffffuLL
+#endif
+
+#ifdef __USE_LARGEFILE64
+# define RLIM64_INFINITY 0xffffffffffffffffuLL
+#endif
+
+/* We can represent all limits. */
+#define RLIM_SAVED_MAX RLIM_INFINITY
+#define RLIM_SAVED_CUR RLIM_INFINITY
+
+
+/* Type for resource quantity measurement. */
+#ifndef __USE_FILE_OFFSET64
+typedef __rlim_t rlim_t;
+#else
+typedef __rlim64_t rlim_t;
+#endif
+#ifdef __USE_LARGEFILE64
+typedef __rlim64_t rlim64_t;
+#endif
+
+struct rlimit
+ {
+ /* The current (soft) limit. */
+ rlim_t rlim_cur;
+ /* The hard limit. */
+ rlim_t rlim_max;
+ };
+
+#ifdef __USE_LARGEFILE64
+struct rlimit64
+ {
+ /* The current (soft) limit. */
+ rlim64_t rlim_cur;
+ /* The hard limit. */
+ rlim64_t rlim_max;
+ };
+#endif
+
+/* Whose usage statistics do you want? */
+enum __rusage_who
+{
+ /* The calling process. */
+ RUSAGE_SELF = 0,
+#define RUSAGE_SELF RUSAGE_SELF
+
+ /* All of its terminated child processes. */
+ RUSAGE_CHILDREN = -1
+#define RUSAGE_CHILDREN RUSAGE_CHILDREN
+
+#ifdef __USE_GNU
+ ,
+ /* The calling thread. */
+ RUSAGE_THREAD = 1
+# define RUSAGE_THREAD RUSAGE_THREAD
+ /* Name for the same functionality on Solaris. */
+# define RUSAGE_LWP RUSAGE_THREAD
+#endif
+};
+
+#define __need_timeval
+#include <bits/time.h> /* For `struct timeval'. */
+
+/* Structure which says how much of each resource has been used. */
+struct rusage
+ {
+ /* Total amount of user time used. */
+ struct timeval ru_utime;
+ /* Total amount of system time used. */
+ struct timeval ru_stime;
+ /* Maximum resident set size (in kilobytes). */
+ long int ru_maxrss;
+#if defined __x86_64__ && defined __ILP32__
+ long int __unused1;
+#endif
+ /* Amount of sharing of text segment memory
+ with other processes (kilobyte-seconds). */
+ long int ru_ixrss;
+#if defined __x86_64__ && defined __ILP32__
+ long int __unused2;
+#endif
+ /* Amount of data segment memory used (kilobyte-seconds). */
+ long int ru_idrss;
+#if defined __x86_64__ && defined __ILP32__
+ long int __unused3;
+#endif
+ /* Amount of stack memory used (kilobyte-seconds). */
+ long int ru_isrss;
+#if defined __x86_64__ && defined __ILP32__
+ long int __unused4;
+#endif
+ /* Number of soft page faults (i.e. those serviced by reclaiming
+ a page from the list of pages awaiting reallocation. */
+ long int ru_minflt;
+#if defined __x86_64__ && defined __ILP32__
+ long int __unused5;
+#endif
+ /* Number of hard page faults (i.e. those that required I/O). */
+ long int ru_majflt;
+#if defined __x86_64__ && defined __ILP32__
+ long int __unused6;
+#endif
+ /* Number of times a process was swapped out of physical memory. */
+ long int ru_nswap;
+#if defined __x86_64__ && defined __ILP32__
+ long int __unused7;
+#endif
+ /* Number of input operations via the file system. Note: This
+ and `ru_oublock' do not include operations with the cache. */
+ long int ru_inblock;
+#if defined __x86_64__ && defined __ILP32__
+ long int __unused8;
+#endif
+ /* Number of output operations via the file system. */
+ long int ru_oublock;
+#if defined __x86_64__ && defined __ILP32__
+ long int __unused9;
+#endif
+ /* Number of IPC messages sent. */
+ long int ru_msgsnd;
+#if defined __x86_64__ && defined __ILP32__
+ long int __unused10;
+#endif
+ /* Number of IPC messages received. */
+ long int ru_msgrcv;
+#if defined __x86_64__ && defined __ILP32__
+ long int __unused11;
+#endif
+ /* Number of signals delivered. */
+ long int ru_nsignals;
+#if defined __x86_64__ && defined __ILP32__
+ long int __unused12;
+#endif
+ /* Number of voluntary context switches, i.e. because the process
+ gave up the process before it had to (usually to wait for some
+ resource to be available). */
+ long int ru_nvcsw;
+#if defined __x86_64__ && defined __ILP32__
+ long int __unused13;
+#endif
+ /* Number of involuntary context switches, i.e. a higher priority process
+ became runnable or the current process used up its time slice. */
+ long int ru_nivcsw;
+#if defined __x86_64__ && defined __ILP32__
+ long int __unused14;
+#endif
+ };
+
+/* Priority limits. */
+#define PRIO_MIN -20 /* Minimum priority a process can have. */
+#define PRIO_MAX 20 /* Maximum priority a process can have. */
+
+/* The type of the WHICH argument to `getpriority' and `setpriority',
+ indicating what flavor of entity the WHO argument specifies. */
+enum __priority_which
+{
+ PRIO_PROCESS = 0, /* WHO is a process ID. */
+#define PRIO_PROCESS PRIO_PROCESS
+ PRIO_PGRP = 1, /* WHO is a process group ID. */
+#define PRIO_PGRP PRIO_PGRP
+ PRIO_USER = 2 /* WHO is a user ID. */
+#define PRIO_USER PRIO_USER
+};
+
+
+__BEGIN_DECLS
+
+#ifdef __USE_GNU
+/* Modify and return resource limits of a process atomically. */
+# ifndef __USE_FILE_OFFSET64
+extern int prlimit (__pid_t __pid, enum __rlimit_resource __resource,
+ const struct rlimit *__new_limit,
+ struct rlimit *__old_limit) __THROW;
+# else
+# ifdef __REDIRECT_NTH
+extern int __REDIRECT_NTH (prlimit, (__pid_t __pid,
+ enum __rlimit_resource __resource,
+ const struct rlimit *__new_limit,
+ struct rlimit *__old_limit), prlimit64);
+# else
+# define prlimit prlimit64
+# endif
+# endif
+# ifdef __USE_LARGEFILE64
+extern int prlimit64 (__pid_t __pid, enum __rlimit_resource __resource,
+ const struct rlimit64 *__new_limit,
+ struct rlimit64 *__old_limit) __THROW;
+# endif
+#endif
+
+__END_DECLS