diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-05-25 08:37:28 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-05-25 12:43:54 +0200 |
commit | 9ec7d492b951efec32520bff7106e21e16e9c74d (patch) | |
tree | 95d49541ccbc8948b757dd1f0100335472d17371 /cpukit | |
parent | score: Move thread queue MP callout to context (diff) | |
download | rtems-9ec7d492b951efec32520bff7106e21e16e9c74d.tar.bz2 |
posix: Fix pthread_spin_unlock() error status
Close #2719.
Diffstat (limited to 'cpukit')
-rw-r--r-- | cpukit/posix/src/pspinlocktranslatereturncode.c | 3 | ||||
-rw-r--r-- | cpukit/score/include/rtems/score/corespinlockimpl.h | 8 | ||||
-rw-r--r-- | cpukit/score/src/corespinlockrelease.c | 13 |
3 files changed, 7 insertions, 17 deletions
diff --git a/cpukit/posix/src/pspinlocktranslatereturncode.c b/cpukit/posix/src/pspinlocktranslatereturncode.c index af8c8acffa..6d3e9b05d8 100644 --- a/cpukit/posix/src/pspinlocktranslatereturncode.c +++ b/cpukit/posix/src/pspinlocktranslatereturncode.c @@ -31,8 +31,7 @@ static int _POSIX_Spinlock_Return_codes[CORE_SPINLOCK_STATUS_LAST + 1] = { EPERM, /* CORE_SPINLOCK_NOT_HOLDER */ -1, /* CORE_SPINLOCK_TIMEOUT */ EBUSY, /* CORE_SPINLOCK_IS_BUSY */ - EBUSY, /* CORE_SPINLOCK_UNAVAILABLE */ - 0 /* CORE_SPINLOCK_NOT_LOCKED */ + EBUSY /* CORE_SPINLOCK_UNAVAILABLE */ }; diff --git a/cpukit/score/include/rtems/score/corespinlockimpl.h b/cpukit/score/include/rtems/score/corespinlockimpl.h index 189bddb243..fd4fcf29db 100644 --- a/cpukit/score/include/rtems/score/corespinlockimpl.h +++ b/cpukit/score/include/rtems/score/corespinlockimpl.h @@ -58,15 +58,11 @@ typedef enum { /** This status indicates that the spinlock is currently locked and thus * unavailable. */ - CORE_SPINLOCK_UNAVAILABLE, - /** This status indicates that the spinlock is not currently locked and thus - * should not be released. - */ - CORE_SPINLOCK_NOT_LOCKED + CORE_SPINLOCK_UNAVAILABLE } CORE_spinlock_Status; /** This is a shorthand for the last status code. */ -#define CORE_SPINLOCK_STATUS_LAST CORE_SPINLOCK_NOT_LOCKED +#define CORE_SPINLOCK_STATUS_LAST CORE_SPINLOCK_UNAVAILABLE /** This indicates the lock is available. */ #define CORE_SPINLOCK_UNLOCKED 0 diff --git a/cpukit/score/src/corespinlockrelease.c b/cpukit/score/src/corespinlockrelease.c index 358d352955..6f2ea71ac2 100644 --- a/cpukit/score/src/corespinlockrelease.c +++ b/cpukit/score/src/corespinlockrelease.c @@ -29,17 +29,12 @@ CORE_spinlock_Status _CORE_spinlock_Surrender( _CORE_spinlock_Acquire_critical( the_spinlock, lock_context ); /* - * It must locked before it can be unlocked. - */ - if ( the_spinlock->lock == CORE_SPINLOCK_UNLOCKED ) { - _CORE_spinlock_Release( the_spinlock, lock_context ); - return CORE_SPINLOCK_NOT_LOCKED; - } - - /* * It must locked by the current thread before it can be unlocked. */ - if ( the_spinlock->holder != _Thread_Executing ) { + if ( + the_spinlock->lock != CORE_SPINLOCK_LOCKED + || the_spinlock->holder != _Thread_Executing + ) { _CORE_spinlock_Release( the_spinlock, lock_context ); return CORE_SPINLOCK_NOT_HOLDER; } |