From c090db7405b72ce6d0b726c0a39fb1c1aebab7ea Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Tue, 12 Sep 2017 08:09:16 +0200 Subject: posix: Implement self-contained POSIX semaphores For semaphore object pointer and object validation see POSIX_SEMAPHORE_VALIDATE_OBJECT(). Destruction or close of a busy semaphore returns an error status. The object is not flushed. POSIX semaphores are now available in all configurations and no longer depend on --enable-posix. Update #2514. Update #3116. --- cpukit/posix/src/semclose.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) (limited to 'cpukit/posix/src/semclose.c') diff --git a/cpukit/posix/src/semclose.c b/cpukit/posix/src/semclose.c index ebcf7a26b3..a27b165350 100644 --- a/cpukit/posix/src/semclose.c +++ b/cpukit/posix/src/semclose.c @@ -18,32 +18,37 @@ #include "config.h" #endif -#include - #include -int sem_close( - sem_t *sem -) +int sem_close( sem_t *sem ) { POSIX_Semaphore_Control *the_semaphore; - Thread_queue_Context queue_context; + uint32_t open_count; + + POSIX_SEMAPHORE_VALIDATE_OBJECT( sem ); + + if ( !_POSIX_Semaphore_Is_named( sem ) ) { + rtems_set_errno_and_return_minus_one( EINVAL ); + } + + the_semaphore = _POSIX_Semaphore_Get( sem ); _Objects_Allocator_lock(); - the_semaphore = _POSIX_Semaphore_Get( sem, &queue_context ); - if ( the_semaphore == NULL ) { + open_count = the_semaphore->open_count; + + if ( open_count == 0 ) { _Objects_Allocator_unlock(); rtems_set_errno_and_return_minus_one( EINVAL ); } - _CORE_semaphore_Acquire_critical( - &the_semaphore->Semaphore, - &queue_context - ); - the_semaphore->open_count -= 1; - _POSIX_Semaphore_Delete( the_semaphore, &queue_context ); + if ( open_count == 1 && _POSIX_Semaphore_Is_busy( sem ) ) { + _Objects_Allocator_unlock(); + rtems_set_errno_and_return_minus_one( EBUSY ); + } + the_semaphore->open_count = open_count - 1; + _POSIX_Semaphore_Delete( the_semaphore ); _Objects_Allocator_unlock(); return 0; } -- cgit v1.2.3