diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-04-26 21:20:31 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-05-02 07:46:15 +0200 |
commit | c8982e5f6a4857444676165deab1e08dc91a6847 (patch) | |
tree | 9862d54650522b55afac8a4e1b84ab078a69dff5 /cpukit/posix/src/mqueuesetattr.c | |
parent | rtems: Avoid Giant lock for message queues (diff) | |
download | rtems-c8982e5f6a4857444676165deab1e08dc91a6847.tar.bz2 |
posix: Simplify message queues
The mq_open() function returns a descriptor to a POSIX message queue
object identified by a name. This is similar to sem_open(). In
contrast to the POSIX semaphore the POSIX message queues use a separate
object for the descriptor. This extra object is superfluous, since the
object identifier can be used directly for this purpose, just like for
the semaphores.
Update #2702.
Update #2555.
Diffstat (limited to 'cpukit/posix/src/mqueuesetattr.c')
-rw-r--r-- | cpukit/posix/src/mqueuesetattr.c | 66 |
1 files changed, 28 insertions, 38 deletions
diff --git a/cpukit/posix/src/mqueuesetattr.c b/cpukit/posix/src/mqueuesetattr.c index 13e6974b96..dfd9bab216 100644 --- a/cpukit/posix/src/mqueuesetattr.c +++ b/cpukit/posix/src/mqueuesetattr.c @@ -18,17 +18,6 @@ #include "config.h" #endif -#include <stdarg.h> - -#include <pthread.h> -#include <limits.h> -#include <errno.h> -#include <fcntl.h> -#include <mqueue.h> - -#include <rtems/system.h> -#include <rtems/score/watchdog.h> -#include <rtems/seterr.h> #include <rtems/posix/mqueueimpl.h> int mq_setattr( @@ -37,41 +26,42 @@ int mq_setattr( struct mq_attr *__restrict omqstat ) { - POSIX_Message_queue_Control_fd *the_mq_fd; - CORE_message_queue_Control *the_core_mq; - Objects_Locations location; + POSIX_Message_queue_Control *the_mq; + ISR_lock_Context lock_context; - if ( !mqstat ) + if ( mqstat == NULL ) { rtems_set_errno_and_return_minus_one( EINVAL ); + } - the_mq_fd = _POSIX_Message_queue_Get_fd( mqdes, &location ); - switch ( location ) { - - case OBJECTS_LOCAL: + the_mq = _POSIX_Message_queue_Get( mqdes, &lock_context ); - the_core_mq = &the_mq_fd->Queue->Message_queue; + if ( the_mq == NULL ) { + rtems_set_errno_and_return_minus_one( EBADF ); + } - /* - * Return the old values. - */ + _CORE_message_queue_Acquire_critical( + &the_mq->Message_queue, + &lock_context + ); - if ( omqstat ) { - omqstat->mq_flags = the_mq_fd->oflag; - omqstat->mq_msgsize = the_core_mq->maximum_message_size; - omqstat->mq_maxmsg = the_core_mq->maximum_pending_messages; - omqstat->mq_curmsgs = the_core_mq->number_of_pending_messages; - } + if ( the_mq->open_count == 0 ) { + _CORE_message_queue_Release( &the_mq->Message_queue, &lock_context ); + rtems_set_errno_and_return_minus_one( EBADF ); + } - the_mq_fd->oflag = mqstat->mq_flags; - _Objects_Put( &the_mq_fd->Object ); - return 0; + /* + * Return the old values. + */ -#if defined(RTEMS_MULTIPROCESSING) - case OBJECTS_REMOTE: -#endif - case OBJECTS_ERROR: - break; + if ( omqstat != NULL ) { + omqstat->mq_flags = the_mq->oflag; + omqstat->mq_msgsize = the_mq->Message_queue.maximum_message_size; + omqstat->mq_maxmsg = the_mq->Message_queue.maximum_pending_messages; + omqstat->mq_curmsgs = the_mq->Message_queue.number_of_pending_messages; } - rtems_set_errno_and_return_minus_one( EBADF ); + the_mq->oflag = mqstat->mq_flags; + + _CORE_message_queue_Release( &the_mq->Message_queue, &lock_context ); + return 0; } |