diff options
Diffstat (limited to 'cpukit/posix/src/mqueuerecvsupp.c')
| -rw-r--r-- | cpukit/posix/src/mqueuerecvsupp.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/cpukit/posix/src/mqueuerecvsupp.c b/cpukit/posix/src/mqueuerecvsupp.c index d97db51642..9badfb65d4 100644 --- a/cpukit/posix/src/mqueuerecvsupp.c +++ b/cpukit/posix/src/mqueuerecvsupp.c @@ -32,8 +32,7 @@ #include <rtems/posix/mqueue.h> #include <rtems/posix/time.h> -/*PAGE - * +/* * _POSIX_Message_queue_Receive_support * * NOTE: XXX Document how size, priority, length, and the buffer go @@ -45,6 +44,7 @@ ssize_t _POSIX_Message_queue_Receive_support( char *msg_ptr, size_t msg_len, unsigned int *msg_prio, + boolean wait, Watchdog_Interval timeout ) { @@ -52,6 +52,7 @@ ssize_t _POSIX_Message_queue_Receive_support( POSIX_Message_queue_Control_fd *the_mq_fd; Objects_Locations location; size_t length_out; + boolean do_wait; the_mq_fd = _POSIX_Message_queue_Get_fd( mqdes, &location ); switch ( location ) { @@ -81,12 +82,23 @@ ssize_t _POSIX_Message_queue_Receive_support( length_out = -1; + /* + * A timed receive with a bad time will do a poll regardless. + */ + if ( wait ) + do_wait = (the_mq_fd->oflag & O_NONBLOCK) ? FALSE : TRUE; + else + do_wait = wait; + + /* + * Now perform the actual message receive + */ _CORE_message_queue_Seize( &the_mq->Message_queue, mqdes, msg_ptr, &length_out, - (the_mq_fd->oflag & O_NONBLOCK) ? FALSE : TRUE, + do_wait, timeout ); |