diff options
author | Jakub Jelinek <jakub@redhat.com> | 2004-10-06 09:09:35 +0000 |
---|---|---|
committer | Jakub Jelinek <jakub@redhat.com> | 2004-10-06 09:09:35 +0000 |
commit | 0caba1fbdb2bb0d78bbf3a9cf4d227ad1c1f8f86 (patch) | |
tree | f86a1435f78ca214fb24daf9ba7a85f3dfd1ff54 /nptl | |
parent | 6fb78a87583a6d2f65a0fb4a77c950ddc037876c (diff) | |
download | glibc-0caba1fbdb2bb0d78bbf3a9cf4d227ad1c1f8f86.tar.gz glibc-0caba1fbdb2bb0d78bbf3a9cf4d227ad1c1f8f86.tar.xz glibc-0caba1fbdb2bb0d78bbf3a9cf4d227ad1c1f8f86.zip |
Updated to fedora-glibc-20041006T0900
Diffstat (limited to 'nptl')
-rw-r--r-- | nptl/ChangeLog | 19 | ||||
-rw-r--r-- | nptl/sysdeps/unix/sysv/linux/x86_64/bits/posix_opt.h | 4 | ||||
-rw-r--r-- | nptl/tst-cancel4.c | 14 | ||||
-rw-r--r-- | nptl/tst-clock1.c | 2 | ||||
-rw-r--r-- | nptl/tst-clock2.c | 2 | ||||
-rw-r--r-- | nptl/tst-cond11.c | 2 |
6 files changed, 37 insertions, 6 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 908d39383e..287e8b6b2a 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,15 @@ +2004-10-06 Ulrich Drepper <drepper@redhat.com> + + * tst-cancel4.c (tf_msgrcv): Check for failure in msgget. If the + test fails, remove message queue. + (tf_msgsnd): Likewise. + +2004-10-05 Jakub Jelinek <jakub@redhat.com> + + * tst-clock1.c: Change #ifdef to #if defined. + * tst-clock2.c: Likewise. + * tst-cond11.c: Likewise. + 2004-10-05 Jakub Jelinek <jakub@redhat.com> * sysdeps/pthread/timer_create.c (timer_create): Use @@ -5,6 +17,11 @@ defined CLOCK_PROCESS_CPUTIME_ID #ifs and similarly for THREAD_CPUTIME. +2004-10-05 Jakub Jelinek <jakub@redhat.com> + + * sysdeps/unix/sysv/linux/x86_64/bits/posix_opt.h (_POSIX_CPUTIME, + _POSIX_THREAD_CPUTIME): Define to 0. + 2004-10-04 Ulrich Drepper <drepper@redhat.com> * sysdeps/unix/sysv/linux/i386/bits/posix_opt.h: Define _POSIX_CPUTIME @@ -33,7 +50,7 @@ (__lll_mutex_timedlock_wait): Address futex correctly. * sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S - (__lll_mutex_timedlock_wait): I woken but cannot get the lock, + (__lll_mutex_timedlock_wait): If woken but cannot get the lock, make sure 2 is stored in the futex and we looked at the old value. * sysdeps/unix/sysv/linux/x86_64/lowlevellock.S (__lll_mutex_timedlock_wait): Likewise. Fix a few other problems diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/bits/posix_opt.h b/nptl/sysdeps/unix/sysv/linux/x86_64/bits/posix_opt.h index 7563de8ad2..2b5a3e6db8 100644 --- a/nptl/sysdeps/unix/sysv/linux/x86_64/bits/posix_opt.h +++ b/nptl/sysdeps/unix/sysv/linux/x86_64/bits/posix_opt.h @@ -103,10 +103,10 @@ #define _POSIX_SHARED_MEMORY_OBJECTS 200112L /* CPU-time clocks supported. */ -#define _POSIX_CPUTIME 200112L +#define _POSIX_CPUTIME 0 /* We support the clock also in threads. */ -#define _POSIX_THREAD_CPUTIME 200112L +#define _POSIX_THREAD_CPUTIME 0 /* GNU libc provides regular expression handling. */ #define _POSIX_REGEXP 1 diff --git a/nptl/tst-cancel4.c b/nptl/tst-cancel4.c index 8dc8aec0af..c3e527fd1c 100644 --- a/nptl/tst-cancel4.c +++ b/nptl/tst-cancel4.c @@ -1884,6 +1884,11 @@ static void * tf_msgrcv (void *arg) { tempmsg = msgget (IPC_PRIVATE, 0666 | IPC_CREAT); + if (tempmsg == -1) + { + printf ("%s: msgget failed: %s\n", __FUNCTION__, strerror (errno)); + exit (1); + } int r = pthread_barrier_wait (&b2); if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD) @@ -1927,6 +1932,8 @@ tf_msgrcv (void *arg) printf ("%s: msgrcv returned %zd with errno = %m\n", __FUNCTION__, s); + msgctl (tempmsg, IPC_RMID, NULL); + exit (1); } @@ -1940,6 +1947,11 @@ tf_msgsnd (void *arg) abort (); tempmsg = msgget (IPC_PRIVATE, 0666 | IPC_CREAT); + if (tempmsg == -1) + { + printf ("%s: msgget failed: %s\n", __FUNCTION__, strerror (errno)); + exit (1); + } int r = pthread_barrier_wait (&b2); if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD) @@ -1972,6 +1984,8 @@ tf_msgsnd (void *arg) printf ("%s: msgsnd returned\n", __FUNCTION__); + msgctl (tempmsg, IPC_RMID, NULL); + exit (1); } diff --git a/nptl/tst-clock1.c b/nptl/tst-clock1.c index cba197943a..0848d77019 100644 --- a/nptl/tst-clock1.c +++ b/nptl/tst-clock1.c @@ -27,7 +27,7 @@ int do_test (void) { -#ifdef _POSIX_THREAD_CPUTIME && _POSIX_THREAD_CPUTIME >= 0 +#if defined _POSIX_THREAD_CPUTIME && _POSIX_THREAD_CPUTIME >= 0 clockid_t cl; /* This is really only a linking-test here. */ int e = pthread_getcpuclockid (pthread_self (), &cl); diff --git a/nptl/tst-clock2.c b/nptl/tst-clock2.c index 2ea2a529aa..fd216b2ba1 100644 --- a/nptl/tst-clock2.c +++ b/nptl/tst-clock2.c @@ -25,7 +25,7 @@ #include <unistd.h> -#ifdef _POSIX_THREAD_CPUTIME && _POSIX_THREAD_CPUTIME >= 0 +#if defined _POSIX_THREAD_CPUTIME && _POSIX_THREAD_CPUTIME >= 0 static pthread_barrier_t b2; static pthread_barrier_t bN; diff --git a/nptl/tst-cond11.c b/nptl/tst-cond11.c index 90a3e15868..0de4d56137 100644 --- a/nptl/tst-cond11.c +++ b/nptl/tst-cond11.c @@ -24,7 +24,7 @@ #include <unistd.h> -#ifdef _POSIX_CLOCK_SELECTION && _POSIX_CLOCK_SELECTION >= 0 +#if defined _POSIX_CLOCK_SELECTION && _POSIX_CLOCK_SELECTION >= 0 static int run_test (clockid_t cl) { |