From 631b3c8967a329cdd53e54365e4e4c0aa93a4251 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Mon, 23 May 2016 11:40:18 +0200 Subject: score: Move thread queue MP callout to context Drop the multiprocessing (MP) dependent callout parameter from the thread queue extract, dequeue, flush and unblock methods. Merge this parameter with the lock context into new structure Thread_queue_Context. This helps to gets rid of the conditionally compiled method call helpers. --- cpukit/posix/src/prwlockdestroy.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'cpukit/posix/src/prwlockdestroy.c') diff --git a/cpukit/posix/src/prwlockdestroy.c b/cpukit/posix/src/prwlockdestroy.c index 6f9eec8a1d..0ced556146 100644 --- a/cpukit/posix/src/prwlockdestroy.c +++ b/cpukit/posix/src/prwlockdestroy.c @@ -24,24 +24,24 @@ int pthread_rwlock_destroy( ) { POSIX_RWLock_Control *the_rwlock; - ISR_lock_Context lock_context; + Thread_queue_Context queue_context; _Objects_Allocator_lock(); - the_rwlock = _POSIX_RWLock_Get( rwlock, &lock_context ); + the_rwlock = _POSIX_RWLock_Get( rwlock, &queue_context ); if ( the_rwlock == NULL ) { _Objects_Allocator_unlock(); return EINVAL; } - _CORE_RWLock_Acquire_critical( &the_rwlock->RWLock, &lock_context ); + _CORE_RWLock_Acquire_critical( &the_rwlock->RWLock, &queue_context ); /* * If there is at least one thread waiting, then do not delete it. */ if ( !_Thread_queue_Is_empty( &the_rwlock->RWLock.Wait_queue.Queue ) ) { - _CORE_RWLock_Release( &the_rwlock->RWLock, &lock_context ); + _CORE_RWLock_Release( &the_rwlock->RWLock, &queue_context ); _Objects_Allocator_unlock(); return EBUSY; } @@ -51,7 +51,7 @@ int pthread_rwlock_destroy( */ _Objects_Close( &_POSIX_RWLock_Information, &the_rwlock->Object ); - _CORE_RWLock_Release( &the_rwlock->RWLock, &lock_context ); + _CORE_RWLock_Release( &the_rwlock->RWLock, &queue_context ); _POSIX_RWLock_Free( the_rwlock ); _Objects_Allocator_unlock(); return 0; -- cgit v1.2.3