RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

+ Modified return codes

Browse Source 
+ Added messsage size check
+ Debugged and yellowed out routine
This commit is contained in:
Jennifer Averett
2000-01-12 18:46:54 +00:00
parent bcbc50a81c
commit 68b0569430
2 changed files with 54 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
c/src/exec/posix/src/mqueuerecvsupp.c
View File

@@ -31,10 +31,11 @@
/*PAGE /*PAGE
* *
* _POSIX_Message_queue_Receive_support * _POSIX_Message_queue_Receive_support
*
* NOTE: XXX Document how size, priority, length, and the buffer go
* through the layers.
*/ */
/* XXX be careful ... watch the size going through all the layers ... */
ssize_t _POSIX_Message_queue_Receive_support( ssize_t _POSIX_Message_queue_Receive_support(
mqd_t mqdes, mqd_t mqdes,
char *msg_ptr, char *msg_ptr,
@@ -45,14 +46,12 @@ ssize_t _POSIX_Message_queue_Receive_support(
{ {
register POSIX_Message_queue_Control *the_mq; register POSIX_Message_queue_Control *the_mq;
Objects_Locations location; Objects_Locations location;
unsigned32 status = 0;
unsigned32 length_out; unsigned32 length_out;
CORE_message_queue_Submit_types core_priority;
the_mq = _POSIX_Message_queue_Get( mqdes, &location ); the_mq = _POSIX_Message_queue_Get( mqdes, &location );
switch ( location ) { switch ( location ) {
case OBJECTS_ERROR: case OBJECTS_ERROR:
set_errno_and_return_minus_one( EINVAL ); set_errno_and_return_minus_one( EBADF );
case OBJECTS_REMOTE: case OBJECTS_REMOTE:
_Thread_Dispatch(); _Thread_Dispatch();
return POSIX_MP_NOT_IMPLEMENTED(); return POSIX_MP_NOT_IMPLEMENTED();
@@ -63,27 +62,39 @@ ssize_t _POSIX_Message_queue_Receive_support(
set_errno_and_return_minus_one( EBADF ); set_errno_and_return_minus_one( EBADF );
} }
/* XXX need to define the options argument to this */ if ( msg_len < the_mq->Message_queue.maximum_message_size ) {
length_out = msg_len; _Thread_Enable_dispatch();
set_errno_and_return_minus_one( EMSGSIZE );
}
/*
* Now if something goes wrong, we return a "length" of -1
* to indicate an error.
*/
length_out = -1;
_CORE_message_queue_Seize( _CORE_message_queue_Seize(
&the_mq->Message_queue, &the_mq->Message_queue,
mqdes, mqdes,
msg_ptr, msg_ptr,
&length_out, &length_out,
the_mq->blocking, (the_mq->oflag & O_NONBLOCK) ? FALSE : TRUE,
&core_priority,
timeout timeout
); );
*msg_prio = _POSIX_Message_queue_Priority_from_core( core_priority );
/* XXX convert message priority from core to POSIX */
_Thread_Enable_dispatch(); _Thread_Enable_dispatch();
*msg_prio = _Thread_Executing->Wait.count; *msg_prio =
if ( !status ) _POSIX_Message_queue_Priority_from_core(_Thread_Executing->Wait.count);
if ( !_Thread_Executing->Wait.return_code )
return length_out; return length_out;
/* XXX --- the return codes gotta be looked at .. fix this */
return _Thread_Executing->Wait.return_code; set_errno_and_return_minus_one(
_POSIX_Message_queue_Translate_core_message_queue_return_code(
_Thread_Executing->Wait.return_code
)
);
} }
return POSIX_BOTTOM_REACHED(); return POSIX_BOTTOM_REACHED();
} }

43
cpukit/posix/src/mqueuerecvsupp.c
View File

@@ -31,10 +31,11 @@
/*PAGE /*PAGE
* *
* _POSIX_Message_queue_Receive_support * _POSIX_Message_queue_Receive_support
*
* NOTE: XXX Document how size, priority, length, and the buffer go
* through the layers.
*/ */
/* XXX be careful ... watch the size going through all the layers ... */
ssize_t _POSIX_Message_queue_Receive_support( ssize_t _POSIX_Message_queue_Receive_support(
mqd_t mqdes, mqd_t mqdes,
char *msg_ptr, char *msg_ptr,
@@ -45,14 +46,12 @@ ssize_t _POSIX_Message_queue_Receive_support(
{ {
register POSIX_Message_queue_Control *the_mq; register POSIX_Message_queue_Control *the_mq;
Objects_Locations location; Objects_Locations location;
unsigned32 status = 0;
unsigned32 length_out; unsigned32 length_out;
CORE_message_queue_Submit_types core_priority;
the_mq = _POSIX_Message_queue_Get( mqdes, &location ); the_mq = _POSIX_Message_queue_Get( mqdes, &location );
switch ( location ) { switch ( location ) {
case OBJECTS_ERROR: case OBJECTS_ERROR:
set_errno_and_return_minus_one( EINVAL ); set_errno_and_return_minus_one( EBADF );
case OBJECTS_REMOTE: case OBJECTS_REMOTE:
_Thread_Dispatch(); _Thread_Dispatch();
return POSIX_MP_NOT_IMPLEMENTED(); return POSIX_MP_NOT_IMPLEMENTED();
@@ -63,27 +62,39 @@ ssize_t _POSIX_Message_queue_Receive_support(
set_errno_and_return_minus_one( EBADF ); set_errno_and_return_minus_one( EBADF );
} }
/* XXX need to define the options argument to this */ if ( msg_len < the_mq->Message_queue.maximum_message_size ) {
length_out = msg_len; _Thread_Enable_dispatch();
set_errno_and_return_minus_one( EMSGSIZE );
}
/*
* Now if something goes wrong, we return a "length" of -1
* to indicate an error.
*/
length_out = -1;
_CORE_message_queue_Seize( _CORE_message_queue_Seize(
&the_mq->Message_queue, &the_mq->Message_queue,
mqdes, mqdes,
msg_ptr, msg_ptr,
&length_out, &length_out,
the_mq->blocking, (the_mq->oflag & O_NONBLOCK) ? FALSE : TRUE,
&core_priority,
timeout timeout
); );
*msg_prio = _POSIX_Message_queue_Priority_from_core( core_priority );
/* XXX convert message priority from core to POSIX */
_Thread_Enable_dispatch(); _Thread_Enable_dispatch();
*msg_prio = _Thread_Executing->Wait.count; *msg_prio =
if ( !status ) _POSIX_Message_queue_Priority_from_core(_Thread_Executing->Wait.count);
if ( !_Thread_Executing->Wait.return_code )
return length_out; return length_out;
/* XXX --- the return codes gotta be looked at .. fix this */
return _Thread_Executing->Wait.return_code; set_errno_and_return_minus_one(
_POSIX_Message_queue_Translate_core_message_queue_return_code(
_Thread_Executing->Wait.return_code
)
);
} }
return POSIX_BOTTOM_REACHED(); return POSIX_BOTTOM_REACHED();
} }