qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update. 

* tst-cond7.c (do_test): Unlock the mutex before canceling the thread.

	* sysdeps/pthread/pthread.h: Add missing initializers.  Protect
	non-standard initializers with __USE_GNU.
This commit is contained in:
Ulrich Drepper 2003-02-14 01:12:02 +00:00
parent e8cda341a4
commit a1ea4c0638
4 changed files with 43 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nptl/ChangeLog
View File

@ -1,5 +1,10 @@
2003-02-13 Ulrich Drepper <drepper@redhat.com> 2003-02-13 Ulrich Drepper <drepper@redhat.com>
* tst-cond7.c (do_test): Unlock the mutex before canceling the thread.
* sysdeps/pthread/pthread.h: Add missing initializers. Protect
non-standard initializers with __USE_GNU.
* Makefile (tests): Add tst-cleanup3. * Makefile (tests): Add tst-cleanup3.
* tst-cleanup3.c: New file. * tst-cleanup3.c: New file.

37
nptl/sysdeps/pthread/pthread.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2002 Free Software Foundation, Inc. /* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -38,20 +38,7 @@ enum
}; };
/* Mutex handling. */ /* Mutex types. */
#define PTHREAD_MUTEX_INITIALIZER \
{ }
#define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP \
{ .__data = { .__kind = PTHREAD_MUTEX_RECURSIVE_NP } }
#define PTHREAD_RWLOCK_INITIALIZER \
{ }
#define PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP \
{ .__data = { .__flags = PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP } }
enum enum
{ {
PTHREAD_MUTEX_TIMED_NP, PTHREAD_MUTEX_TIMED_NP,
@ -71,6 +58,18 @@ enum
#endif #endif
}; };
/* Mutex initializers. */
#define PTHREAD_MUTEX_INITIALIZER \
{ }
#ifdef __USE_GNU
# define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP \
{ .__data = { .__kind = PTHREAD_MUTEX_RECURSIVE_NP } }
# define PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP \
{ .__data = { .__kind = PTHREAD_MUTEX_ERRORCHECK_NP } }
# define PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP \
{ .__data = { .__kind = PTHREAD_MUTEX_ADAPTIVE_NP } }
#endif
/* Read-write lock types. */ /* Read-write lock types. */
#ifdef __USE_UNIX98 #ifdef __USE_UNIX98
@ -83,6 +82,14 @@ enum
}; };
#endif /* Unix98 */ #endif /* Unix98 */
/* Read-write lock initializers. */
#define PTHREAD_RWLOCK_INITIALIZER \
{ }
#ifdef __USE_GNU
# define PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP \
{ .__data = { .__flags = PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP } }
#endif
/* Scheduler inheritance. */ /* Scheduler inheritance. */
enum enum

3
nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S
View File

@ -65,7 +65,8 @@ __pthread_cond_broadcast:
cmpl (%ebx), %ecx cmpl (%ebx), %ecx
jna 4f jna 4f
/* Case all currently waiting threads to wake up. */ /* Cause all currently waiting threads to recognize they are
woken up. */
3: movl %ecx, (%ebx) 3: movl %ecx, (%ebx)
movl %eax, 4(%ebx) movl %eax, 4(%ebx)

14
nptl/tst-cond7.c
View File

@ -43,6 +43,13 @@ tf (void *arg)
{ {
puts ("child created"); puts ("child created");
if (pthread_setcancelstate (PTHREAD_CANCEL_ENABLE, NULL) != 0
|| pthread_setcanceltype (PTHREAD_CANCEL_DEFERRED, NULL) != 0)
{
puts ("cannot set cancellation options");
exit (1);
}
T *t = (T *) arg; T *t = (T *) arg;
if (pthread_mutex_lock (&t->lock) != 0) if (pthread_mutex_lock (&t->lock) != 0)
@ -121,6 +128,13 @@ do_test (void)
} }
while (! done); while (! done);
/* Release the lock since the cancel handler will get it. */
if (pthread_mutex_unlock (&t[i]->lock) != 0)
{
puts ("mutex_unlock failed");
exit (1);
}
if (pthread_cancel (t[i]->h) != 0) if (pthread_cancel (t[i]->h) != 0)
{ {
puts ("cancel failed"); puts ("cancel failed");