Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #1279, rtems queue multi-size, mimic posix logic #1283

Merged
merged 2 commits into from
Oct 11, 2022
Merged

Fix #1279, rtems queue multi-size, mimic posix logic #1283

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b708d5d
Fix #1279, Switch rtems queue to mimic posix logic.
Sep 22, 2022
2f2dbac
Fix #1279, update size_copied to use OSAL_SIZE_C for cast.
Sep 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 33 additions & 35 deletions src/os/rtems/src/os-impl-queues.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,12 +156,13 @@ int32 OS_QueueDelete_Impl(const OS_object_token_t *token)
*-----------------------------------------------------------------*/
int32 OS_QueueGet_Impl(const OS_object_token_t *token, void *data, size_t size, size_t *size_copied, int32 timeout)
{
int32 return_code;
rtems_status_code status;
rtems_interval ticks;
int tick_count;
rtems_option option_set;
size_t rtems_size;
int32 return_code;
rtems_status_code status;
rtems_interval ticks;
int tick_count;
rtems_option option_set;
/* Implementation read size */
size_t impl_size;
rtems_id rtems_queue_id;
OS_impl_queue_internal_record_t *impl;

Expand Down Expand Up @@ -198,46 +199,43 @@ int32 OS_QueueGet_Impl(const OS_object_token_t *token, void *data, size_t size,
*/
status = rtems_message_queue_receive(rtems_queue_id, /* message queue descriptor */
data, /* pointer to message buffer */
&rtems_size, /* returned size of message */
&impl_size, /* returned size of message */
option_set, /* wait option */
ticks /* timeout */
);

if (status == RTEMS_SUCCESSFUL)
{
return_code = OS_SUCCESS;
}
else if (status == RTEMS_TIMEOUT)
{
return_code = OS_QUEUE_TIMEOUT;
}
else if (status == RTEMS_UNSATISFIED)
{
return_code = OS_QUEUE_EMPTY;
}
else
if (status != RTEMS_SUCCESSFUL)
{
/* Something else went wrong */
return_code = OS_ERROR;
OS_DEBUG("Unhandled queue_receive error: %s\n", rtems_status_text(status));
}
*size_copied = OSAL_SIZE_C(0);

/*
** Check the size of the message. If a valid message was
** obtained, indicate success.
*/
if (status == RTEMS_SUCCESSFUL)
{
*size_copied = rtems_size;
if (rtems_size != size)
/* Map the rtems error to the most appropriate OSAL return code */
if ((timeout == OS_PEND) && (status != RTEMS_TIMEOUT))
{
/* OS_PEND was supposed to pend forever until a message arrived
* so something else is wrong. Otherwise, at this point the only
* "acceptable" errno is TIMEDOUT for the other cases.
*/
return_code = OS_ERROR;
}
else if (status == RTEMS_UNSATISFIED)
{
return_code = OS_QUEUE_EMPTY;
}
else if (status == RTEMS_TIMEOUT)
{
return_code = OS_QUEUE_TIMEOUT;
}
else
{
/* Success, but the size was wrong */
return_code = OS_QUEUE_INVALID_SIZE;
/* Something else went wrong */
return_code = OS_ERROR;
OS_DEBUG("Unhandled queue_receive error: %s\n", rtems_status_text(status));
}
}
else
{
*size_copied = 0;
*size_copied = OSAL_SIZE_C(impl_size);
return_code = OS_SUCCESS;
}

return return_code;
Expand Down