mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-13 00:30:07 +00:00
28cada0418
* htl/pt-join.c (__pthread_join): Move implementation to... (__pthread_join_common): ... new function. Add try, timed and clock support. (__pthread_join): Reimplement on top of __pthread_join_common. (__pthread_tryjoin_np, __pthread_timedjoin_np, __pthread_clockjoin_np): Implement on top of __pthread_join_common. (pthread_tryjoin_np, pthread_timedjoin_np, pthread_clockjoin_np): New aliases. * hurd/hurdlock.c (__lll_abstimed_wait, __lll_abstimed_xwait, __lll_abstimed_lock): Check for supported clock. * sysdeps/htl/pt-cond-timedwait.c (__pthread_cond_timedwait_internal): Add clockid parameter and support it. (__pthread_cond_timedwait): Pass -1 as clockid. (__pthread_cond_clockwait): New function. (pthread_cond_clockwait): New alias. * sysdeps/htl/pt-cond-wait.c (__pthread_cond_timedwait_internal): Update prototype. (__pthread_cond_wait): Pass -1 as clockid. * sysdeps/htl/pt-rwlock-timedrdlock.c (__pthread_rwlock_timedrdlock_internal): Add clockid parameter, and support id. (__pthread_rwlock_clockrdlock): New function. (pthread_rwlock_clockrdlock): New alias. * sysdeps/htl/pt-rwlock-rdlock.c (__pthread_rwlock_timedrdlock_internal): Update prototype. (__pthread_rwlock_rdlock): Pass -1 as clockid. * sysdeps/htl/pt-rwlock-timedwrlock.c (__pthread_rwlock_timedwrlock_internal): Add clockid parameter, and support id. (__pthread_rwlock_clockwrlock): New function. (pthread_rwlock_clockwrlock): New alias. * sysdeps/htl/pt-rwlock-wrlock.c (__pthread_rwlock_timedwrlock_internal): Update prototype. (__pthread_rwlock_wrlock): Pass -1 as clockid. * sysdeps/mach/hurd/htl/pt-mutex-timedlock.c (__pthread_mutex_timedlock): Move implementation to (__pthread_mutex_clocklock): New function with additional clockid parameter and support it. (pthread_mutex_clocklock): New alias. (__pthread_mutex_timedlock): Reimplement on top of __pthread_mutex_clocklock. * sysdeps/htl/pthread.h (pthread_tryjoin_np, pthread_timedjoin_np, pthread_clockjoin_np, pthread_mutex_clocklock, pthread_cond_clockwait, pthread_rwlock_clockrdlock, pthread_rwlock_clockwrlock): New prototypes. * sysdeps/htl/pthreadP.h (__pthread_cond_clockwait): New prototype. * htl/Versions (GLIBC_2.32): Add pthread_cond_clockwait, pthread_mutex_clocklock, pthread_rwlock_clockrdlock, pthread_rwlock_clockwrlock, pthread_tryjoin_np, pthread_timedjoin_np, pthread_clockjoin_np. * sysdeps/mach/hurd/i386/libpthread.abilist (pthread_clockjoin_np, pthread_cond_clockwait, pthread_mutex_clocklock, pthread_rwlock_clockrdlock, pthread_rwlock_clockwrlock, pthread_timedjoin_np, pthread_tryjoin_np): New functions. * nptl/tst-abstime.c, nptl/tst-join10.c, nptl/tst-join11.c, nptl/tst-join12.c, nptl/tst-join13.c, nptl/tst-join14.c, nptl/tst-join2.c, nptl/tst-join3.c, nptl/tst-join8.c, nptl/tst-join9.c, nptl/tst-mutex-errorcheck.c, nptl/tst-pthread-mutexattr.c, nptl/tst-mutex11.c, nptl/tst-mutex5.c, nptl/tst-mutex7.c, nptl/tst-mutex7robus.c, nptl/tst-mutex9.c, nptl/tst-rwlock12.c, nptl/tst-rwlock14.c: Move to sysdeps/pthread. * sysdeps/pthread/tst-mutex8.c: Move back to nptl. * nptl/Makefile (tests): Move tst-mutex5, tst-mutex7, tst-mutex7robust, tst-mutex9, tst-mutex11, tst-rwlock12, tst-rwlock14, tst-join2, tst-join3, tst-join8, tst-join9 tst-join10, tst-join11, tst-join12, tst-join13, tst-join14, tst-abstime, tst-mutex-errorcheck, tst-pthread-mutexattr to ... * sysdeps/pthread/Makefile (tests): ... here.
208 lines
4.6 KiB
C
208 lines
4.6 KiB
C
/* Copyright (C) 2002-2020 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
|
|
|
|
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 <stdint.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <sys/mman.h>
|
|
#include <sys/wait.h>
|
|
|
|
|
|
static int
|
|
do_test (void)
|
|
{
|
|
size_t ps = sysconf (_SC_PAGESIZE);
|
|
char tmpfname[] = "/tmp/tst-rwlock12.XXXXXX";
|
|
char data[ps];
|
|
void *mem;
|
|
int fd;
|
|
pthread_mutex_t *m;
|
|
pthread_mutexattr_t ma;
|
|
pthread_rwlock_t *r;
|
|
pthread_rwlockattr_t ra;
|
|
pid_t pid;
|
|
int status = 0;
|
|
|
|
fd = mkstemp (tmpfname);
|
|
if (fd == -1)
|
|
{
|
|
printf ("cannot open temporary file: %m\n");
|
|
return 1;
|
|
}
|
|
|
|
/* Make sure it is always removed. */
|
|
unlink (tmpfname);
|
|
|
|
/* Create one page of data. */
|
|
memset (data, '\0', ps);
|
|
|
|
/* Write the data to the file. */
|
|
if (write (fd, data, ps) != (ssize_t) ps)
|
|
{
|
|
puts ("short write");
|
|
return 1;
|
|
}
|
|
|
|
mem = mmap (NULL, ps, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
|
|
if (mem == MAP_FAILED)
|
|
{
|
|
printf ("mmap failed: %m\n");
|
|
return 1;
|
|
}
|
|
|
|
r = (pthread_rwlock_t *) (((uintptr_t) mem + __alignof (pthread_rwlock_t))
|
|
& ~(__alignof (pthread_rwlock_t) - 1));
|
|
/* The following assumes alignment for a mutex is at least as high
|
|
as that for a rwlock. Which is true in our case. */
|
|
m = (pthread_mutex_t *) (r + 1);
|
|
|
|
if (pthread_rwlockattr_init (&ra) != 0)
|
|
{
|
|
puts ("rwlockattr_init failed");
|
|
return 1;
|
|
}
|
|
|
|
if (pthread_rwlockattr_setpshared (&ra, PTHREAD_PROCESS_SHARED) != 0)
|
|
{
|
|
puts ("rwlockattr_setpshared failed");
|
|
return 1;
|
|
}
|
|
|
|
if (pthread_rwlock_init (r, &ra) != 0)
|
|
{
|
|
puts ("rwlock_init failed");
|
|
return 1;
|
|
}
|
|
|
|
if (pthread_mutexattr_init (&ma) != 0)
|
|
{
|
|
puts ("rwlockattr_init failed");
|
|
return 1;
|
|
}
|
|
|
|
if (pthread_mutexattr_setpshared (&ma, PTHREAD_PROCESS_SHARED) != 0)
|
|
{
|
|
puts ("mutexattr_setpshared failed");
|
|
return 1;
|
|
}
|
|
|
|
if (pthread_mutex_init (m, &ma) != 0)
|
|
{
|
|
puts ("mutex_init failed");
|
|
return 1;
|
|
}
|
|
|
|
/* Lock the mutex. */
|
|
if (pthread_mutex_lock (m) != 0)
|
|
{
|
|
puts ("mutex_lock failed");
|
|
return 1;
|
|
}
|
|
|
|
puts ("going to fork now");
|
|
pid = fork ();
|
|
if (pid == -1)
|
|
{
|
|
puts ("fork failed");
|
|
return 1;
|
|
}
|
|
else if (pid == 0)
|
|
{
|
|
/* Lock the mutex. */
|
|
if (pthread_mutex_lock (m) != 0)
|
|
{
|
|
puts ("child: mutex_lock failed");
|
|
return 1;
|
|
}
|
|
|
|
/* Try to get the rwlock. */
|
|
if (pthread_rwlock_trywrlock (r) == 0)
|
|
{
|
|
puts ("rwlock_trywrlock succeeded");
|
|
return 1;
|
|
}
|
|
|
|
/* Try again. */
|
|
struct timespec ts = { .tv_sec = 0, .tv_nsec = 500000000 };
|
|
int e = pthread_rwlock_timedwrlock (r, &ts);
|
|
if (e == 0)
|
|
{
|
|
puts ("rwlock_timedwrlock succeeded");
|
|
return 1;
|
|
}
|
|
if (e != ETIMEDOUT)
|
|
{
|
|
puts ("rwlock_timedwrlock didn't return ETIMEDOUT");
|
|
status = 1;
|
|
}
|
|
|
|
if (pthread_rwlock_tryrdlock (r) == 0)
|
|
{
|
|
puts ("rwlock_tryrdlock succeeded");
|
|
return 1;
|
|
}
|
|
|
|
e = pthread_rwlock_timedrdlock (r, &ts);
|
|
if (e == 0)
|
|
{
|
|
puts ("rwlock_timedrdlock succeeded");
|
|
return 1;
|
|
}
|
|
if (e != ETIMEDOUT)
|
|
{
|
|
puts ("rwlock_timedrdlock didn't return ETIMEDOUT");
|
|
status = 1;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
/* Lock the rwlock for writing. */
|
|
if (pthread_rwlock_wrlock (r) != 0)
|
|
{
|
|
puts ("rwlock_wrlock failed");
|
|
kill (pid, SIGTERM);
|
|
return 1;
|
|
}
|
|
|
|
/* Allow the child to run. */
|
|
if (pthread_mutex_unlock (m) != 0)
|
|
{
|
|
puts ("mutex_unlock failed");
|
|
kill (pid, SIGTERM);
|
|
return 1;
|
|
}
|
|
|
|
/* Just wait for the child. */
|
|
if (TEMP_FAILURE_RETRY (waitpid (pid, &status, 0)) != pid)
|
|
{
|
|
puts ("waitpid failed");
|
|
kill (pid, SIGTERM);
|
|
return 1;
|
|
}
|
|
}
|
|
|
|
return status;
|
|
}
|
|
|
|
#define TEST_FUNCTION do_test ()
|
|
#include "../test-skeleton.c"
|