summaryrefslogtreecommitdiffstats
path: root/cpukit/posix
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2016-03-30 11:39:58 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2016-04-06 09:08:20 +0200
commit9809d6e08264525ea58839b98e6d90121b841196 (patch)
tree7ccbdd61436c18d1e1bae9033a3907afb5bff629 /cpukit/posix
parentscore: Fix _Thread_queue_Extract_locked() (diff)
downloadrtems-9809d6e08264525ea58839b98e6d90121b841196.tar.bz2
score: _Thread_queue_Flush() parameter changes
Change _Thread_queue_Flush() into a macro that invokes _Thread_queue_Do_flush() with the parameter set defined by RTEMS_MULTIPROCESSING. For multiprocessing configurations add the object identifier to avoid direct use of the thread wait information. Use mp_ prefix for multiprocessing related parameters. Rename Thread_queue_Flush_callout to Thread_queue_MP_callout since this type will be re-used later for other operations as well.
Diffstat (limited to 'cpukit/posix')
-rw-r--r--cpukit/posix/src/mqueuedeletesupp.c3
-rw-r--r--cpukit/posix/src/mutexdestroy.c2
-rw-r--r--cpukit/posix/src/semaphoredeletesupp.c10
3 files changed, 5 insertions, 10 deletions
diff --git a/cpukit/posix/src/mqueuedeletesupp.c b/cpukit/posix/src/mqueuedeletesupp.c
index 9bf17a38dc..30b8b7d6e3 100644
--- a/cpukit/posix/src/mqueuedeletesupp.c
+++ b/cpukit/posix/src/mqueuedeletesupp.c
@@ -59,8 +59,9 @@ void _POSIX_Message_queue_Delete(
_CORE_message_queue_Close(
&the_mq->Message_queue,
+ CORE_MESSAGE_QUEUE_STATUS_WAS_DELETED,
NULL, /* no MP support */
- CORE_MESSAGE_QUEUE_STATUS_WAS_DELETED
+ 0
);
_POSIX_Message_queue_Free( the_mq );
diff --git a/cpukit/posix/src/mutexdestroy.c b/cpukit/posix/src/mutexdestroy.c
index 9ff3dba9f5..fb5aee63f9 100644
--- a/cpukit/posix/src/mutexdestroy.c
+++ b/cpukit/posix/src/mutexdestroy.c
@@ -55,7 +55,7 @@ int pthread_mutex_destroy(
}
_Objects_Close( &_POSIX_Mutex_Information, &the_mutex->Object );
- _CORE_mutex_Flush( &the_mutex->Mutex, NULL, EINVAL );
+ _CORE_mutex_Flush( &the_mutex->Mutex, EINVAL, NULL, 0 );
_Objects_Put( &the_mutex->Object );
_POSIX_Mutex_Free( the_mutex );
_Objects_Allocator_unlock();
diff --git a/cpukit/posix/src/semaphoredeletesupp.c b/cpukit/posix/src/semaphoredeletesupp.c
index d9cf1d3cb7..650cdcdcdd 100644
--- a/cpukit/posix/src/semaphoredeletesupp.c
+++ b/cpukit/posix/src/semaphoredeletesupp.c
@@ -35,14 +35,8 @@ void _POSIX_Semaphore_Delete(
)
{
if ( !the_semaphore->linked && !the_semaphore->open_count ) {
- _Objects_Close( &_POSIX_Semaphore_Information, &the_semaphore->Object );
-
- _CORE_semaphore_Flush(
- &the_semaphore->Semaphore,
- NULL,
- -1
- );
-
+ _Objects_Close( &_POSIX_Semaphore_Information, &the_semaphore->Object );
+ _CORE_semaphore_Flush( &the_semaphore->Semaphore, -1, NULL, 0 );
_POSIX_Semaphore_Free( the_semaphore );
}
}