mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-14 01:00:07 +00:00
cc25c8b4c1
This replaces the pthread rwlock with a new implementation that uses a more scalable algorithm (primarily through not using a critical section anymore to make state changes). The fast path for rdlock acquisition and release is now basically a single atomic read-modify write or CAS and a few branches. See nptl/pthread_rwlock_common.c for details. * nptl/DESIGN-rwlock.txt: Remove. * nptl/lowlevelrwlock.sym: Remove. * nptl/Makefile: Add new tests. * nptl/pthread_rwlock_common.c: New file. Contains the new rwlock. * nptl/pthreadP.h (PTHREAD_RWLOCK_PREFER_READER_P): Remove. (PTHREAD_RWLOCK_WRPHASE, PTHREAD_RWLOCK_WRLOCKED, PTHREAD_RWLOCK_RWAITING, PTHREAD_RWLOCK_READER_SHIFT, PTHREAD_RWLOCK_READER_OVERFLOW, PTHREAD_RWLOCK_WRHANDOVER, PTHREAD_RWLOCK_FUTEX_USED): New. * nptl/pthread_rwlock_init.c (__pthread_rwlock_init): Adapt to new implementation. * nptl/pthread_rwlock_rdlock.c (__pthread_rwlock_rdlock_slow): Remove. (__pthread_rwlock_rdlock): Adapt. * nptl/pthread_rwlock_timedrdlock.c (pthread_rwlock_timedrdlock): Adapt. * nptl/pthread_rwlock_timedwrlock.c (pthread_rwlock_timedwrlock): Adapt. * nptl/pthread_rwlock_trywrlock.c (pthread_rwlock_trywrlock): Adapt. * nptl/pthread_rwlock_tryrdlock.c (pthread_rwlock_tryrdlock): Adapt. * nptl/pthread_rwlock_unlock.c (pthread_rwlock_unlock): Adapt. * nptl/pthread_rwlock_wrlock.c (__pthread_rwlock_wrlock_slow): Remove. (__pthread_rwlock_wrlock): Adapt. * nptl/tst-rwlock10.c: Adapt. * nptl/tst-rwlock11.c: Adapt. * nptl/tst-rwlock17.c: New file. * nptl/tst-rwlock18.c: New file. * nptl/tst-rwlock19.c: New file. * nptl/tst-rwlock2b.c: New file. * nptl/tst-rwlock8.c: Adapt. * nptl/tst-rwlock9.c: Adapt. * sysdeps/aarch64/nptl/bits/pthreadtypes.h (pthread_rwlock_t): Adapt. * sysdeps/arm/nptl/bits/pthreadtypes.h (pthread_rwlock_t): Adapt. * sysdeps/hppa/nptl/bits/pthreadtypes.h (pthread_rwlock_t): Adapt. * sysdeps/ia64/nptl/bits/pthreadtypes.h (pthread_rwlock_t): Adapt. * sysdeps/m68k/nptl/bits/pthreadtypes.h (pthread_rwlock_t): Adapt. * sysdeps/microblaze/nptl/bits/pthreadtypes.h (pthread_rwlock_t): Adapt. * sysdeps/mips/nptl/bits/pthreadtypes.h (pthread_rwlock_t): Adapt. * sysdeps/nios2/nptl/bits/pthreadtypes.h (pthread_rwlock_t): Adapt. * sysdeps/s390/nptl/bits/pthreadtypes.h (pthread_rwlock_t): Adapt. * sysdeps/sh/nptl/bits/pthreadtypes.h (pthread_rwlock_t): Adapt. * sysdeps/sparc/nptl/bits/pthreadtypes.h (pthread_rwlock_t): Adapt. * sysdeps/tile/nptl/bits/pthreadtypes.h (pthread_rwlock_t): Adapt. * sysdeps/unix/sysv/linux/alpha/bits/pthreadtypes.h (pthread_rwlock_t): Adapt. * sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h (pthread_rwlock_t): Adapt. * sysdeps/x86/bits/pthreadtypes.h (pthread_rwlock_t): Adapt. * nptl/nptl-printers.py (): Adapt. * nptl/nptl_lock_constants.pysym: Adapt. * nptl/test-rwlock-printers.py: Adapt. * nptl/test-rwlockattr-printers.c: Adapt. * nptl/test-rwlockattr-printers.py: Adapt.
222 lines
4.5 KiB
C
222 lines
4.5 KiB
C
/* Test program for timedout read/write lock functions.
|
|
Copyright (C) 2000-2017 Free Software Foundation, Inc.
|
|
Contributed by Ulrich Drepper <drepper@redhat.com>, 2000.
|
|
|
|
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; see the file COPYING.LIB. If
|
|
not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#include <errno.h>
|
|
#include <error.h>
|
|
#include <pthread.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <time.h>
|
|
#include <unistd.h>
|
|
#include <sys/time.h>
|
|
|
|
|
|
#define NWRITERS 15
|
|
#define WRITETRIES 10
|
|
#define NREADERS 15
|
|
#define READTRIES 15
|
|
|
|
#define TIMEOUT 1000000
|
|
#define DELAY 1000000
|
|
|
|
#ifndef KIND
|
|
# define KIND PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP
|
|
#endif
|
|
|
|
static pthread_rwlock_t lock;
|
|
|
|
|
|
static void *
|
|
writer_thread (void *nr)
|
|
{
|
|
struct timespec ts;
|
|
struct timespec delay;
|
|
int n;
|
|
|
|
delay.tv_sec = 0;
|
|
delay.tv_nsec = DELAY;
|
|
|
|
for (n = 0; n < WRITETRIES; ++n)
|
|
{
|
|
int e;
|
|
do
|
|
{
|
|
struct timeval tv;
|
|
(void) gettimeofday (&tv, NULL);
|
|
TIMEVAL_TO_TIMESPEC (&tv, &ts);
|
|
|
|
ts.tv_nsec += 2 * TIMEOUT;
|
|
if (ts.tv_nsec >= 1000000000)
|
|
{
|
|
ts.tv_nsec -= 1000000000;
|
|
++ts.tv_sec;
|
|
}
|
|
|
|
printf ("writer thread %ld tries again\n", (long int) nr);
|
|
|
|
e = pthread_rwlock_timedwrlock (&lock, &ts);
|
|
if (e != 0 && e != ETIMEDOUT)
|
|
{
|
|
puts ("timedwrlock failed");
|
|
exit (1);
|
|
}
|
|
}
|
|
while (e == ETIMEDOUT);
|
|
|
|
printf ("writer thread %ld succeeded\n", (long int) nr);
|
|
|
|
nanosleep (&delay, NULL);
|
|
|
|
if (pthread_rwlock_unlock (&lock) != 0)
|
|
{
|
|
puts ("unlock for writer failed");
|
|
exit (1);
|
|
}
|
|
|
|
printf ("writer thread %ld released\n", (long int) nr);
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
|
|
static void *
|
|
reader_thread (void *nr)
|
|
{
|
|
struct timespec ts;
|
|
struct timespec delay;
|
|
int n;
|
|
|
|
delay.tv_sec = 0;
|
|
delay.tv_nsec = DELAY;
|
|
|
|
for (n = 0; n < READTRIES; ++n)
|
|
{
|
|
int e;
|
|
do
|
|
{
|
|
struct timeval tv;
|
|
(void) gettimeofday (&tv, NULL);
|
|
TIMEVAL_TO_TIMESPEC (&tv, &ts);
|
|
|
|
ts.tv_nsec += TIMEOUT;
|
|
if (ts.tv_nsec >= 1000000000)
|
|
{
|
|
ts.tv_nsec -= 1000000000;
|
|
++ts.tv_sec;
|
|
}
|
|
|
|
printf ("reader thread %ld tries again\n", (long int) nr);
|
|
|
|
e = pthread_rwlock_timedrdlock (&lock, &ts);
|
|
if (e != 0 && e != ETIMEDOUT)
|
|
{
|
|
puts ("timedrdlock failed");
|
|
exit (1);
|
|
}
|
|
}
|
|
while (e == ETIMEDOUT);
|
|
|
|
printf ("reader thread %ld succeeded\n", (long int) nr);
|
|
|
|
nanosleep (&delay, NULL);
|
|
|
|
if (pthread_rwlock_unlock (&lock) != 0)
|
|
{
|
|
puts ("unlock for reader failed");
|
|
exit (1);
|
|
}
|
|
|
|
printf ("reader thread %ld released\n", (long int) nr);
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
|
|
static int
|
|
do_test (void)
|
|
{
|
|
pthread_t thwr[NWRITERS];
|
|
pthread_t thrd[NREADERS];
|
|
int n;
|
|
void *res;
|
|
pthread_rwlockattr_t a;
|
|
|
|
if (pthread_rwlockattr_init (&a) != 0)
|
|
{
|
|
puts ("rwlockattr_t failed");
|
|
exit (1);
|
|
}
|
|
|
|
if (pthread_rwlockattr_setkind_np (&a, KIND) != 0)
|
|
{
|
|
puts ("rwlockattr_setkind failed");
|
|
exit (1);
|
|
}
|
|
|
|
if (pthread_rwlock_init (&lock, &a) != 0)
|
|
{
|
|
puts ("rwlock_init failed");
|
|
exit (1);
|
|
}
|
|
|
|
/* Make standard error the same as standard output. */
|
|
dup2 (1, 2);
|
|
|
|
/* Make sure we see all message, even those on stdout. */
|
|
setvbuf (stdout, NULL, _IONBF, 0);
|
|
|
|
for (n = 0; n < NWRITERS; ++n)
|
|
if (pthread_create (&thwr[n], NULL, writer_thread,
|
|
(void *) (long int) n) != 0)
|
|
{
|
|
puts ("writer create failed");
|
|
exit (1);
|
|
}
|
|
|
|
for (n = 0; n < NREADERS; ++n)
|
|
if (pthread_create (&thrd[n], NULL, reader_thread,
|
|
(void *) (long int) n) != 0)
|
|
{
|
|
puts ("reader create failed");
|
|
exit (1);
|
|
}
|
|
|
|
/* Wait for all the threads. */
|
|
for (n = 0; n < NWRITERS; ++n)
|
|
if (pthread_join (thwr[n], &res) != 0)
|
|
{
|
|
puts ("writer join failed");
|
|
exit (1);
|
|
}
|
|
for (n = 0; n < NREADERS; ++n)
|
|
if (pthread_join (thrd[n], &res) != 0)
|
|
{
|
|
puts ("reader join failed");
|
|
exit (1);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
#undef TIMEOUT
|
|
#define TIMEOUT 30
|
|
#define TEST_FUNCTION do_test ()
|
|
#include "../test-skeleton.c"
|