aboutsummaryrefslogtreecommitdiff
path: root/nptl/tst-join5.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-12-22 20:10:10 +0000
committerUlrich Drepper <drepper@redhat.com>2004-12-22 20:10:10 +0000
commita334319f6530564d22e775935d9c91663623a1b4 (patch)
treeb5877475619e4c938e98757d518bb1e9cbead751 /nptl/tst-join5.c
parent0ecb606cb6cf65de1d9fc8a919bceb4be476c602 (diff)
downloadglibc-a334319f6530564d22e775935d9c91663623a1b4.tar
glibc-a334319f6530564d22e775935d9c91663623a1b4.tar.gz
glibc-a334319f6530564d22e775935d9c91663623a1b4.tar.bz2
glibc-a334319f6530564d22e775935d9c91663623a1b4.zip
(CFLAGS-tst-align.c): Add -mpreferred-stack-boundary=4.
Diffstat (limited to 'nptl/tst-join5.c')
-rw-r--r--nptl/tst-join5.c115
1 files changed, 24 insertions, 91 deletions
diff --git a/nptl/tst-join5.c b/nptl/tst-join5.c
index db005f5b71..589fac6b5f 100644
--- a/nptl/tst-join5.c
+++ b/nptl/tst-join5.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2003.
@@ -21,187 +21,120 @@
#include <pthread.h>
#include <stdio.h>
#include <stdlib.h>
-#include <time.h>
-#include <unistd.h>
-#include <sys/syscall.h>
-
-
-#define wait_code() \
- do { \
- struct timespec ts = { .tv_sec = 0, .tv_nsec = 200000000 }; \
- while (syscall (__NR_nanosleep, &ts, &ts) < 0) \
- /* nothing */; \
- } while (0)
-
-
-#ifdef WAIT_IN_CHILD
-static pthread_barrier_t b;
-#endif
static void *
tf1 (void *arg)
{
-#ifdef WAIT_IN_CHILD
- int e = pthread_barrier_wait (&b);
- if (e != 0 && e != PTHREAD_BARRIER_SERIAL_THREAD)
- {
- printf ("%s: barrier_wait failed\n", __func__);
- exit (1);
- }
-
- wait_code ();
-#endif
-
pthread_join ((pthread_t) arg, NULL);
- exit (42);
+ puts ("1st join returned");
+
+ return (void *) 1l;
}
static void *
tf2 (void *arg)
{
-#ifdef WAIT_IN_CHILD
- int e = pthread_barrier_wait (&b);
- if (e != 0 && e != PTHREAD_BARRIER_SERIAL_THREAD)
- {
- printf ("%s: barrier_wait failed\n", __func__);
- exit (1);
- }
-
- wait_code ();
-#endif
pthread_join ((pthread_t) arg, NULL);
- exit (43);
+ puts ("2nd join returned");
+
+ return (void *) 1l;
}
static int
do_test (void)
{
-#ifdef WAIT_IN_CHILD
- if (pthread_barrier_init (&b, NULL, 2) != 0)
- {
- puts ("barrier_init failed");
- return 1;
- }
-#endif
-
pthread_t th;
int err = pthread_join (pthread_self (), NULL);
if (err == 0)
{
puts ("1st circular join succeeded");
- return 1;
+ exit (1);
}
if (err != EDEADLK)
{
printf ("1st circular join %d, not EDEADLK\n", err);
- return 1;
+ exit (1);
}
if (pthread_create (&th, NULL, tf1, (void *) pthread_self ()) != 0)
{
puts ("1st create failed");
- return 1;
+ exit (1);
}
-#ifndef WAIT_IN_CHILD
- wait_code ();
-#endif
-
if (pthread_cancel (th) != 0)
{
puts ("cannot cancel 1st thread");
- return 1;
- }
-
-#ifdef WAIT_IN_CHILD
- int e = pthread_barrier_wait (&b);
- if (e != 0 && e != PTHREAD_BARRIER_SERIAL_THREAD)
- {
- printf ("%s: barrier_wait failed\n", __func__);
- return 1;
+ exit (1);
}
-#endif
void *r;
err = pthread_join (th, &r);
if (err != 0)
{
printf ("cannot join 1st thread: %d\n", err);
- return 1;
+ exit (1);
}
if (r != PTHREAD_CANCELED)
{
puts ("1st thread not canceled");
- return 1;
+ exit (1);
}
err = pthread_join (pthread_self (), NULL);
if (err == 0)
{
puts ("2nd circular join succeeded");
- return 1;
+ exit (1);
}
if (err != EDEADLK)
{
printf ("2nd circular join %d, not EDEADLK\n", err);
- return 1;
+ exit (1);
}
if (pthread_create (&th, NULL, tf2, (void *) pthread_self ()) != 0)
{
puts ("2nd create failed");
- return 1;
+ exit (1);
}
-#ifndef WAIT_IN_CHILD
- wait_code ();
-#endif
-
if (pthread_cancel (th) != 0)
{
puts ("cannot cancel 2nd thread");
- return 1;
- }
-
-#ifdef WAIT_IN_CHILD
- e = pthread_barrier_wait (&b);
- if (e != 0 && e != PTHREAD_BARRIER_SERIAL_THREAD)
- {
- printf ("%s: barrier_wait failed\n", __func__);
- return 1;
+ exit (1);
}
-#endif
if (pthread_join (th, &r) != 0)
{
puts ("cannot join 2nd thread");
- return 1;
+ exit (1);
}
if (r != PTHREAD_CANCELED)
{
puts ("2nd thread not canceled");
- return 1;
+ exit (1);
}
err = pthread_join (pthread_self (), NULL);
if (err == 0)
{
- puts ("3rd circular join succeeded");
- return 1;
+ puts ("2nd circular join succeeded");
+ exit (1);
}
if (err != EDEADLK)
{
- printf ("3rd circular join %d, not EDEADLK\n", err);
- return 1;
+ printf ("2nd circular join %d, not EDEADLK\n", err);
+ exit (1);
}
- return 0;
+ exit (0);
}
#define TEST_FUNCTION do_test ()