aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-08-13 05:46:56 +0000
committerUlrich Drepper <drepper@redhat.com>2004-08-13 05:46:56 +0000
commit4d004cfb45f86696f764e2c92d9c2ea0c54a2bba (patch)
treee9979ffbbd918b1cc0814df5e53df128e63f53f7
parent770d9b39dfacea4ec15446995d6a57906b8125d1 (diff)
downloadglibc-4d004cfb45f86696f764e2c92d9c2ea0c54a2bba.zip
glibc-4d004cfb45f86696f764e2c92d9c2ea0c54a2bba.tar.gz
glibc-4d004cfb45f86696f764e2c92d9c2ea0c54a2bba.tar.bz2
Update.
2004-08-12 Jakub Jelinek <jakub@redhat.com> * sysdeps/unix/sysv/linux/bits/resource.h: Define non-standard RUSAGE_ enums as __RUSAGE_ and adjust macros accordingly. * sysdeps/unix/sysv/linux/alpha/bits/resource.h: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/resource.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/resource.h: Likewise. Define non-standard RLIMIT_ enums as __RLIMIT_ and adjust macros accordingly.
-rw-r--r--ChangeLog10
-rw-r--r--nptl/ChangeLog10
-rw-r--r--sysdeps/unix/sysv/linux/alpha/bits/resource.h4
-rw-r--r--sysdeps/unix/sysv/linux/bits/resource.h4
-rw-r--r--sysdeps/unix/sysv/linux/mips/bits/resource.h32
-rw-r--r--sysdeps/unix/sysv/linux/sparc/bits/resource.h4
6 files changed, 42 insertions, 22 deletions
diff --git a/ChangeLog b/ChangeLog
index 8896680..c5763af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-08-12 Jakub Jelinek <jakub@redhat.com>
+
+ * sysdeps/unix/sysv/linux/bits/resource.h: Define non-standard
+ RUSAGE_ enums as __RUSAGE_ and adjust macros accordingly.
+ * sysdeps/unix/sysv/linux/alpha/bits/resource.h: Likewise.
+ * sysdeps/unix/sysv/linux/sparc/bits/resource.h: Likewise.
+ * sysdeps/unix/sysv/linux/mips/bits/resource.h: Likewise.
+ Define non-standard RLIMIT_ enums as __RLIMIT_ and adjust macros
+ accordingly.
+
2004-08-11 Andreas Schwab <schwab@suse.de>
* resolv/res_libc.c: Move definition of __res_initstamp ...
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 931afc1..9b8bd14 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,13 @@
+2004-08-09 Jakub Jelinek <jakub@redhat.com>
+
+ * DESIGN-rwlock.txt: Add decreasing of nr_readers_queued to
+ pthread_rwlock_rdlock.
+ * sysdeps/pthread/pthread_rwlock_rdlock (__pthread_rwlock_rdlock):
+ Decrease __nr_readers_queued after reacquiring lock.
+ * sysdeps/pthread/pthread_rwlock_timedrdlock
+ (pthread_rwlock_timedrdlock): Likewise.
+ Reported by Bob Cook <bobcook47@hotmail.com>.
+
2004-08-11 Jakub Jelinek <jakub@redhat.com>
* tst-rwlock14.c (tf): Read main thread handle from *ARG
diff --git a/sysdeps/unix/sysv/linux/alpha/bits/resource.h b/sysdeps/unix/sysv/linux/alpha/bits/resource.h
index abf5c69..868fd7b 100644
--- a/sysdeps/unix/sysv/linux/alpha/bits/resource.h
+++ b/sysdeps/unix/sysv/linux/alpha/bits/resource.h
@@ -151,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
diff --git a/sysdeps/unix/sysv/linux/bits/resource.h b/sysdeps/unix/sysv/linux/bits/resource.h
index 36f8f549..c85ddcb 100644
--- a/sysdeps/unix/sysv/linux/bits/resource.h
+++ b/sysdeps/unix/sysv/linux/bits/resource.h
@@ -151,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
diff --git a/sysdeps/unix/sysv/linux/mips/bits/resource.h b/sysdeps/unix/sysv/linux/mips/bits/resource.h
index 01cd5b5..40fc949 100644
--- a/sysdeps/unix/sysv/linux/mips/bits/resource.h
+++ b/sysdeps/unix/sysv/linux/mips/bits/resource.h
@@ -56,30 +56,30 @@ 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
/* Maximum number of pending signals. */
__RLIMIT_SIGPENDING = 11,
@@ -89,10 +89,10 @@ enum __rlimit_resource
__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
+ __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. */
@@ -151,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
diff --git a/sysdeps/unix/sysv/linux/sparc/bits/resource.h b/sysdeps/unix/sysv/linux/sparc/bits/resource.h
index 435798a..fb2eed3 100644
--- a/sysdeps/unix/sysv/linux/sparc/bits/resource.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/resource.h
@@ -167,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