RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

Patch from Eric Norum <eric@cls.usask.ca> so simple binary semaphores

Browse Source 
can be deleted when held.
This commit is contained in:
Joel Sherrill
2000-04-03 13:10:50 +00:00
parent 969525fe2f
commit 7ea9f1dc08
1 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
c/src/exec/rtems/src/semdelete.c
View File

@@ -61,6 +61,12 @@
* error code - if unsuccessful * error code - if unsuccessful
*/ */
#if defined(RTEMS_MULTIPROCESSING)
#define SEMAPHORE_MP_WAS_DELETED _Semaphore_MP_Send_object_was_deleted
#else
#define SEMAPHORE_MP_OBJECT_WAS_DELETED NULL
#endif
rtems_status_code rtems_semaphore_delete( rtems_status_code rtems_semaphore_delete(
Objects_Id id Objects_Id id
) )
@@ -82,31 +88,24 @@ rtems_status_code rtems_semaphore_delete(
case OBJECTS_LOCAL: case OBJECTS_LOCAL:
if ( !_Attributes_Is_counting_semaphore(the_semaphore->attribute_set) ) { if ( !_Attributes_Is_counting_semaphore(the_semaphore->attribute_set) ) {
if ( _CORE_mutex_Is_locked( &the_semaphore->Core_control.mutex ) ) { if ( _CORE_mutex_Is_locked( &the_semaphore->Core_control.mutex ) &&
!_Attributes_Is_simple_binary_semaphore(
the_semaphore->attribute_set ) ) {
_Thread_Enable_dispatch(); _Thread_Enable_dispatch();
return RTEMS_RESOURCE_IN_USE; return RTEMS_RESOURCE_IN_USE;
} }
else _CORE_mutex_Flush(
_CORE_mutex_Flush( &the_semaphore->Core_control.mutex,
&the_semaphore->Core_control.mutex, SEMAPHORE_MP_OBJECT_WAS_DELETED,
#if defined(RTEMS_MULTIPROCESSING) CORE_MUTEX_WAS_DELETED
_Semaphore_MP_Send_object_was_deleted, );
#else } else {
NULL,
#endif
CORE_MUTEX_WAS_DELETED
);
}
else
_CORE_semaphore_Flush( _CORE_semaphore_Flush(
&the_semaphore->Core_control.semaphore, &the_semaphore->Core_control.semaphore,
#if defined(RTEMS_MULTIPROCESSING) SEMAPHORE_MP_OBJECT_WAS_DELETED,
_Semaphore_MP_Send_object_was_deleted,
#else
NULL,
#endif
CORE_SEMAPHORE_WAS_DELETED CORE_SEMAPHORE_WAS_DELETED
); );
}
_Objects_Close( &_Semaphore_Information, &the_semaphore->Object ); _Objects_Close( &_Semaphore_Information, &the_semaphore->Object );