diff options
| -rw-r--r-- | nptl/ChangeLog | 10 | ||||
| -rw-r--r-- | nptl/Makefile | 2 | ||||
| -rw-r--r-- | nptl/tst-cond12.c | 9 |
3 files changed, 20 insertions, 1 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 5c9dfa8282..88ba084a30 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,5 +1,15 @@ +2003-11-21 Jakub Jelinek <jakub@redhat.com> + + * Makefile (distribute): Add tst-cleanup4aux.c. + + * tst-cond12.c (prepare): Add prototype. Move after test-skeleton.c + include. + 2003-11-21 Ulrich Drepper <drepper@redhat.com> + * tst-cond12.c (do_test): If USE_COND_SIGNAL is defined, use + pthread_cond_signal. + * sysdeps/pthread/pthread_cond_wait.c (__pthread_cond_wait): Don't store mutex address if the current value is ~0l. * sysdeps/pthread/pthread_cond_timedwait.c diff --git a/nptl/Makefile b/nptl/Makefile index 913d8b114f..138ff4723c 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -234,7 +234,7 @@ tests = tst-attr1 tst-attr2 tst-attr3 \ tst-context1 \ tst-sched1 -distribute = eintr.c +distribute = eintr.c tst-cleanup4aux.c gen-as-const-headers = pthread-errnos.sym diff --git a/nptl/tst-cond12.c b/nptl/tst-cond12.c index 256c8a9b9e..769e6b1c92 100644 --- a/nptl/tst-cond12.c +++ b/nptl/tst-cond12.c @@ -152,12 +152,21 @@ do_test (void) p->var = 0; +#ifndef USE_COND_SIGNAL if (pthread_cond_broadcast (&p->c) != 0) { puts ("child: cond_broadcast failed"); kill (getppid (), SIGKILL); exit (1); } +#else + if (pthread_cond_signal (&p->c) != 0) + { + puts ("child: cond_signal failed"); + kill (getppid (), SIGKILL); + exit (1); + } +#endif if (pthread_mutex_unlock (&p->m) != 0) { |