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/mqueuerecvsupp.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/mqueuerecvsupp.c')
| -rw-r--r-- | cpukit/posix/src/mqueuerecvsupp.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/cpukit/posix/src/mqueuerecvsupp.c b/cpukit/posix/src/mqueuerecvsupp.c index 8c12a2ef53..11d8fbc50c 100644 --- a/cpukit/posix/src/mqueuerecvsupp.c +++ b/cpukit/posix/src/mqueuerecvsupp.c @@ -48,11 +48,12 @@ ssize_t _POSIX_Message_queue_Receive_support( Watchdog_Interval timeout ) { - register POSIX_Message_queue_Control *the_mq; - Objects_Locations location; - unsigned32 length_out; + POSIX_Message_queue_Control *the_mq; + POSIX_Message_queue_Control_fd *the_mq_fd; + Objects_Locations location; + unsigned32 length_out; - 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 ); @@ -61,11 +62,13 @@ ssize_t _POSIX_Message_queue_Receive_support( return POSIX_MP_NOT_IMPLEMENTED(); rtems_set_errno_and_return_minus_one( EINVAL ); case OBJECTS_LOCAL: - if ( (the_mq->oflag & O_ACCMODE) == O_WRONLY ) { + if ( (the_mq_fd->oflag & O_ACCMODE) == O_WRONLY ) { _Thread_Enable_dispatch(); rtems_set_errno_and_return_minus_one( EBADF ); } + the_mq = the_mq_fd->Queue; + if ( msg_len < the_mq->Message_queue.maximum_message_size ) { _Thread_Enable_dispatch(); rtems_set_errno_and_return_minus_one( EMSGSIZE ); @@ -83,7 +86,7 @@ ssize_t _POSIX_Message_queue_Receive_support( mqdes, msg_ptr, &length_out, - (the_mq->oflag & O_NONBLOCK) ? FALSE : TRUE, + (the_mq_fd->oflag & O_NONBLOCK) ? FALSE : TRUE, timeout ); |