mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-27 03:41:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update.

Browse Source 
2003-02-24  Ulrich Drepper  <drepper@redhat.com>

	* Makefile (tests): Add tst-rwlock8 and tst-rwlock9.
	* tst-rwlock8.c: New file.
	* tst-rwlock9.c: New file.
	* sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S: Fix
	complete broken rwlock implementation.
	* sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_timedrdlock.S:
	Likewise.
	* sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_timedwrlock.S:
	Likewise.
	* sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_unlock.S: Likewise.
	* sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S: Likewise.
This commit is contained in:
Ulrich Drepper 2003-02-24 08:50:25 +00:00
parent 26a526fa5e
commit 3724f268b1
3 changed files with 176 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nptl/ChangeLog
View File

@ -1,3 +1,17 @@
2003-02-24 Ulrich Drepper <drepper@redhat.com>
* Makefile (tests): Add tst-rwlock8 and tst-rwlock9.
* tst-rwlock8.c: New file.
* tst-rwlock9.c: New file.
* sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S: Fix
complete broken rwlock implementation.
* sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_timedrdlock.S:
Likewise.
* sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_timedwrlock.S:
Likewise.
* sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_unlock.S: Likewise.
* sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S: Likewise.
2003-02-23 Roland McGrath <roland@redhat.com>
* Makefile (nptl-version): Change regexp so case sensitivity is ok.

2
nptl/Makefile
View File

@ -132,7 +132,7 @@ tests = tst-attr1 tst-attr2 \
tst-cond1 tst-cond2 tst-cond3 tst-cond4 tst-cond5 tst-cond6 tst-cond7 \
tst-cond8 tst-cond9 \
tst-rwlock1 tst-rwlock2 tst-rwlock3 tst-rwlock4 tst-rwlock5 \
tst-rwlock6 tst-rwlock7 \
tst-rwlock6 tst-rwlock7 tst-rwlock8 tst-rwlock9 \
tst-once1 tst-once2 tst-once3 tst-once4 \
tst-key1 tst-key2 tst-key3 tst-key4 \
tst-sem1 tst-sem2 tst-sem3 tst-sem4 tst-sem5 \

161
nptl/tst-rwlock8.c Normal file
View File

@ -0,0 +1,161 @@
/* Test program for timedout read/write lock functions.
Copyright (C) 2000, 2003 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,
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
#include <errno.h>
#include <error.h>
#include <pthread.h>
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
#include <unistd.h>
#define NWRITERS 15
#define WRITETRIES 10
#define NREADERS 15
#define READTRIES 15
#define DELAY 1000000
static pthread_rwlock_t lock = PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP;
static void *
writer_thread (void *nr)
{
struct timespec delay;
int n;
delay.tv_sec = 0;
delay.tv_nsec = DELAY;
for (n = 0; n < WRITETRIES; ++n)
{
printf ("writer thread %ld tries again\n", (long int) nr);
if (pthread_rwlock_wrlock (&lock) != 0)
{
puts ("wrlock failed");
exit (1);
}
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)
{
printf ("reader thread %ld tries again\n", (long int) nr);
if (pthread_rwlock_rdlock (&lock) != 0)
{
puts ("rdlock failed");
exit (1);
}
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;
/* 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;
}
#define TIMEOUT 30
#define TEST_FUNCTION do_test ()
#include "../test-skeleton.c"