diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-03-05 20:53:27 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-03-05 20:53:27 +0000 |
| commit | ff5fefb47fcd0f16304a5e5f476dadb5414b3a48 (patch) | |
| tree | cbf9ca118460fc0a211710fa83bbb3ef9abba03f /cpukit | |
| parent | 2007-03-02 Joel Sherrill <joel@OARcorp.com> (diff) | |
| download | rtems-ff5fefb47fcd0f16304a5e5f476dadb5414b3a48.tar.bz2 | |
2007-03-05 Joel Sherrill <joel@OARcorp.com>
PR 1221/cpukit
* posix/src/pthreadequal.c: Fix critical section nesting.
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/ChangeLog | 5 | ||||
| -rw-r--r-- | cpukit/posix/src/pthreadequal.c | 13 |
2 files changed, 13 insertions, 5 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 9ee6b4462e..1f045dbd8f 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,8 @@ +2007-03-05 Joel Sherrill <joel@OARcorp.com> + + PR 1221/cpukit + * posix/src/pthreadequal.c: Fix critical section nesting. + 2007-02-22 Ralf Corsepius <ralf.corsepius@rtems.org> * libcsupport/Makefile.am: Move getpagesize.c to newlib-only diff --git a/cpukit/posix/src/pthreadequal.c b/cpukit/posix/src/pthreadequal.c index 39136cc388..2b15761886 100644 --- a/cpukit/posix/src/pthreadequal.c +++ b/cpukit/posix/src/pthreadequal.c @@ -3,7 +3,7 @@ * * NOTE: POSIX does not define the behavior when either thread id is invalid. * - * COPYRIGHT (c) 1989-1999. + * COPYRIGHT (c) 1989-2007. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -55,6 +55,7 @@ int pthread_equal( switch ( location ) { case OBJECTS_ERROR: case OBJECTS_REMOTE: + /* return status == 0 */ break; case OBJECTS_LOCAL: @@ -67,16 +68,18 @@ int pthread_equal( switch ( location ) { case OBJECTS_ERROR: case OBJECTS_REMOTE: + /* t1 must have been valid so exit the critical section */ + _Thread_Enable_dispatch(); + /* return status == 0 */ break; case OBJECTS_LOCAL: status = _Objects_Are_ids_equal( t1, t2 ); - break; + _Thread_Unnest_dispatch(); + _Thread_Enable_dispatch(); + break; } - _Thread_Unnest_dispatch(); break; } - - _Thread_Enable_dispatch(); return status; #endif } |