diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-03-08 21:41:46 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-03-08 21:41:46 +0000 |
commit | 3d1e8ba23e396ac752b05aa0bd3074f29ab68d5c (patch) | |
tree | 41378aa4d5f62b165c33b6f72973ccd162d951e4 /cpukit/rtems/src/msgqurgent.c | |
parent | 2007-03-06 Joel Sherrill <joel@OARcorp.com> (diff) | |
download | rtems-3d1e8ba23e396ac752b05aa0bd3074f29ab68d5c.tar.bz2 |
2007-03-08 Joel Sherrill <joel@OARcorp.com>
* rtems/Makefile.am, rtems/src/msgqsend.c, rtems/src/msgqurgent.c:
Remove wrapper for message queue send and urgent and implement them
directly. There was an unnecessary function call layer in addition to
conditions in the shared routine. Directly coding both directives is
simpler and should result in smaller code.
* rtems/src/msgqsubmit.c: Removed.
Diffstat (limited to 'cpukit/rtems/src/msgqurgent.c')
-rw-r--r-- | cpukit/rtems/src/msgqurgent.c | 62 |
1 files changed, 56 insertions, 6 deletions
diff --git a/cpukit/rtems/src/msgqurgent.c b/cpukit/rtems/src/msgqurgent.c index 9247f89930..d509129507 100644 --- a/cpukit/rtems/src/msgqurgent.c +++ b/cpukit/rtems/src/msgqurgent.c @@ -1,8 +1,7 @@ /* - * Message Queue Manager + * Message Queue Manager - rtems_message_queue_urgent * - * - * COPYRIGHT (c) 1989-1999. + * COPYRIGHT (c) 1989-2007. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -38,8 +37,8 @@ * * rtems_message_queue_urgent * - * This routine implements the directives q_urgent. It urgents a - * message to the specified message queue. + * This routine implements the directives rtems_message_queue_urgent. It + * prepends a message to the specified message queue. * * Input parameters: * id - pointer to message queue @@ -51,11 +50,62 @@ * error code - if unsuccessful */ +#if defined(RTEMS_MULTIPROCESSING) +#define MESSAGE_QUEUE_MP_HANDLER _Message_queue_Core_message_queue_mp_support +#else +#define MESSAGE_QUEUE_MP_HANDLER NULL +#endif + rtems_status_code rtems_message_queue_urgent( Objects_Id id, void *buffer, size_t size ) { - return(_Message_queue_Submit(id, buffer, size, MESSAGE_QUEUE_URGENT_REQUEST)); + register Message_queue_Control *the_message_queue; + Objects_Locations location; + CORE_message_queue_Status status; + + if ( !buffer ) + return RTEMS_INVALID_ADDRESS; + + the_message_queue = _Message_queue_Get( id, &location ); + switch ( location ) + { + case OBJECTS_REMOTE: +#if defined(RTEMS_MULTIPROCESSING) + return _Message_queue_MP_Send_request_packet( + MESSAGE_QUEUE_MP_URGENT_REQUEST, + id, + buffer, + &size, + 0, /* option_set */ + MPCI_DEFAULT_TIMEOUT + ); +#endif + + case OBJECTS_ERROR: + return RTEMS_INVALID_ID; + + case OBJECTS_LOCAL: + status = _CORE_message_queue_Urgent( + &the_message_queue->message_queue, + buffer, + size, + id, + MESSAGE_QUEUE_MP_HANDLER, + FALSE, /* sender does not block */ + 0 /* no timeout */ + ); + _Thread_Enable_dispatch(); + + /* + * Since this API does not allow for blocking sends, we can directly + * return the returned status. + */ + + return _Message_queue_Translate_core_message_queue_return_code(status); + + } + return RTEMS_INTERNAL_ERROR; /* unreached - only to remove warnings */ } |