mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-26 04:31:03 +00:00
5a82c74822
Also, change sources.redhat.com to sourceware.org. This patch was automatically generated by running the following shell script, which uses GNU sed, and which avoids modifying files imported from upstream: sed -ri ' s,(http|ftp)(://(.*\.)?(gnu|fsf|sourceware)\.org($|[^.]|\.[^a-z])),https\2,g s,(http|ftp)(://(.*\.)?)sources\.redhat\.com($|[^.]|\.[^a-z]),https\2sourceware.org\4,g ' \ $(find $(git ls-files) -prune -type f \ ! -name '*.po' \ ! -name 'ChangeLog*' \ ! -path COPYING ! -path COPYING.LIB \ ! -path manual/fdl-1.3.texi ! -path manual/lgpl-2.1.texi \ ! -path manual/texinfo.tex ! -path scripts/config.guess \ ! -path scripts/config.sub ! -path scripts/install-sh \ ! -path scripts/mkinstalldirs ! -path scripts/move-if-change \ ! -path INSTALL ! -path locale/programs/charmap-kw.h \ ! -path po/libc.pot ! -path sysdeps/gnu/errlist.c \ ! '(' -name configure \ -execdir test -f configure.ac -o -f configure.in ';' ')' \ ! '(' -name preconfigure \ -execdir test -f preconfigure.ac ';' ')' \ -print) and then by running 'make dist-prepare' to regenerate files built from the altered files, and then executing the following to cleanup: chmod a+x sysdeps/unix/sysv/linux/riscv/configure # Omit irrelevant whitespace and comment-only changes, # perhaps from a slightly-different Autoconf version. git checkout -f \ sysdeps/csky/configure \ sysdeps/hppa/configure \ sysdeps/riscv/configure \ sysdeps/unix/sysv/linux/csky/configure # Omit changes that caused a pre-commit check to fail like this: # remote: *** error: sysdeps/powerpc/powerpc64/ppc-mcount.S: trailing lines git checkout -f \ sysdeps/powerpc/powerpc64/ppc-mcount.S \ sysdeps/unix/sysv/linux/s390/s390-64/syscall.S # Omit change that caused a pre-commit check to fail like this: # remote: *** error: sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S: last line does not end in newline git checkout -f sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S
184 lines
3.6 KiB
C
184 lines
3.6 KiB
C
/* Copyright (C) 2003-2019 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@redhat.com>, 2003.
|
|
|
|
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
|
|
<https://www.gnu.org/licenses/>. */
|
|
|
|
#include <errno.h>
|
|
#include <pthread.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <time.h>
|
|
#include <unistd.h>
|
|
|
|
#include <support/check.h>
|
|
#include <support/xthread.h>
|
|
|
|
static void
|
|
wait_code (void)
|
|
{
|
|
struct timespec ts = { .tv_sec = 0, .tv_nsec = 200000000 };
|
|
while (nanosleep (&ts, &ts) < 0)
|
|
;
|
|
}
|
|
|
|
|
|
#ifdef WAIT_IN_CHILD
|
|
static pthread_barrier_t b;
|
|
#endif
|
|
|
|
static int
|
|
thread_join (pthread_t thread, void **retval)
|
|
{
|
|
#ifdef USE_PTHREAD_TIMEDJOIN_NP
|
|
struct timespec tv;
|
|
TEST_COMPARE (clock_gettime (CLOCK_REALTIME, &tv), 0);
|
|
/* Arbitrary large timeout to make it act as pthread_join. */
|
|
tv.tv_sec += 1000;
|
|
return pthread_timedjoin_np ((pthread_t) thread, retval, &tv);
|
|
#else
|
|
return pthread_join ((pthread_t) thread, retval);
|
|
#endif
|
|
}
|
|
|
|
|
|
static void *
|
|
tf1 (void *arg)
|
|
{
|
|
#ifdef WAIT_IN_CHILD
|
|
xpthread_barrier_wait (&b);
|
|
|
|
wait_code ();
|
|
#endif
|
|
|
|
thread_join ((pthread_t) arg, NULL);
|
|
|
|
exit (42);
|
|
}
|
|
|
|
|
|
static void *
|
|
tf2 (void *arg)
|
|
{
|
|
#ifdef WAIT_IN_CHILD
|
|
xpthread_barrier_wait (&b);
|
|
|
|
wait_code ();
|
|
#endif
|
|
|
|
thread_join ((pthread_t) arg, NULL);
|
|
|
|
exit (43);
|
|
}
|
|
|
|
|
|
static int
|
|
do_test (void)
|
|
{
|
|
#ifdef WAIT_IN_CHILD
|
|
xpthread_barrier_init (&b, NULL, 2);
|
|
#endif
|
|
|
|
pthread_t th;
|
|
|
|
int err = thread_join (pthread_self (), NULL);
|
|
if (err == 0)
|
|
{
|
|
puts ("1st circular join succeeded");
|
|
return 1;
|
|
}
|
|
if (err != EDEADLK)
|
|
{
|
|
printf ("1st circular join %d, not EDEADLK\n", err);
|
|
return 1;
|
|
}
|
|
|
|
th = xpthread_create (NULL, tf1, (void *) pthread_self ());
|
|
|
|
#ifndef WAIT_IN_CHILD
|
|
wait_code ();
|
|
#endif
|
|
|
|
xpthread_cancel (th);
|
|
|
|
#ifdef WAIT_IN_CHILD
|
|
xpthread_barrier_wait (&b);
|
|
#endif
|
|
|
|
void *r;
|
|
err = thread_join (th, &r);
|
|
if (err != 0)
|
|
{
|
|
printf ("cannot join 1st thread: %d\n", err);
|
|
return 1;
|
|
}
|
|
if (r != PTHREAD_CANCELED)
|
|
{
|
|
puts ("1st thread not canceled");
|
|
return 1;
|
|
}
|
|
|
|
err = thread_join (pthread_self (), NULL);
|
|
if (err == 0)
|
|
{
|
|
puts ("2nd circular join succeeded");
|
|
return 1;
|
|
}
|
|
if (err != EDEADLK)
|
|
{
|
|
printf ("2nd circular join %d, not EDEADLK\n", err);
|
|
return 1;
|
|
}
|
|
|
|
th = xpthread_create (NULL, tf2, (void *) pthread_self ());
|
|
|
|
#ifndef WAIT_IN_CHILD
|
|
wait_code ();
|
|
#endif
|
|
|
|
xpthread_cancel (th);
|
|
|
|
#ifdef WAIT_IN_CHILD
|
|
xpthread_barrier_wait (&b);
|
|
#endif
|
|
|
|
if (thread_join (th, &r) != 0)
|
|
{
|
|
puts ("cannot join 2nd thread");
|
|
return 1;
|
|
}
|
|
if (r != PTHREAD_CANCELED)
|
|
{
|
|
puts ("2nd thread not canceled");
|
|
return 1;
|
|
}
|
|
|
|
err = thread_join (pthread_self (), NULL);
|
|
if (err == 0)
|
|
{
|
|
puts ("3rd circular join succeeded");
|
|
return 1;
|
|
}
|
|
if (err != EDEADLK)
|
|
{
|
|
printf ("3rd circular join %d, not EDEADLK\n", err);
|
|
return 1;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
#include <support/test-driver.c>
|