diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2002-04-26 23:39:01 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2002-04-26 23:39:01 +0000 |
| commit | 53092d19211054d67787990714798c2e72c8a623 (patch) | |
| tree | 9386e2095e8fd1d9c3e419faae2006df2ec80a48 /cpukit/posix/src/mqueuegetattr.c | |
| parent | 2001-04-26 Joel Sherrill <joel@OARcorp.com> (diff) | |
| download | rtems-53092d19211054d67787990714798c2e72c8a623.tar.bz2 | |
2001-04-26 Joel Sherrill <joel@OARcorp.com>
* include/rtems/posix/mqueue.h, inline/rtems/posix/mqueue.inl,
src/mqueue.c, src/mqueueclose.c, src/mqueuecreatesupp.c,
src/mqueuegetattr.c, src/mqueuenotify.c, src/mqueueopen.c,
src/mqueuerecvsupp.c, src/mqueuesendsupp.c, src/mqueuesetattr.c:
Per PR81 reworked to add a message queue descriptor separate from
the underlying message queue. This allows non-blocking to follow
the "open" not the underlying queue.
Diffstat (limited to 'cpukit/posix/src/mqueuegetattr.c')
| -rw-r--r-- | cpukit/posix/src/mqueuegetattr.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpukit/posix/src/mqueuegetattr.c b/cpukit/posix/src/mqueuegetattr.c index 3152611300..80be6335c7 100644 --- a/cpukit/posix/src/mqueuegetattr.c +++ b/cpukit/posix/src/mqueuegetattr.c @@ -42,14 +42,15 @@ int mq_getattr( struct mq_attr *mqstat ) { - register POSIX_Message_queue_Control *the_mq; + POSIX_Message_queue_Control *the_mq; + POSIX_Message_queue_Control_fd *the_mq_fd; Objects_Locations location; CORE_message_queue_Attributes *the_mq_attr; if ( !mqstat ) rtems_set_errno_and_return_minus_one( EINVAL ); - the_mq = _POSIX_Message_queue_Get( mqdes, &location ); + the_mq_fd = _POSIX_Message_queue_Get_fd( mqdes, &location ); switch ( location ) { case OBJECTS_ERROR: rtems_set_errno_and_return_minus_one( EBADF ); @@ -58,16 +59,15 @@ int mq_getattr( return POSIX_MP_NOT_IMPLEMENTED(); rtems_set_errno_and_return_minus_one( EINVAL ); case OBJECTS_LOCAL: + the_mq = the_mq_fd->Queue; + /* * Return the old values. */ - /* XXX this is the same stuff as is in mq_setattr... and probably */ - /* XXX should be in an inlined private routine */ - the_mq_attr = &the_mq->Message_queue.Attributes; - mqstat->mq_flags = the_mq->oflag; + mqstat->mq_flags = the_mq_fd->oflag; mqstat->mq_msgsize = the_mq->Message_queue.maximum_message_size; mqstat->mq_maxmsg = the_mq->Message_queue.maximum_pending_messages; mqstat->mq_curmsgs = the_mq->Message_queue.number_of_pending_messages; |