ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rationalise Queue/Mail get/put APIs 

To line up with MemoryPool/Mail alloc, rework naming of get/put

    Queue::get -> try_get, try_get_for
    Queue::put -> try_put, try_put_for
    Mail::get -> try_get, try_get_for
    Mail::put (no change, but assert that it works)

In the future the names `get` and `put` can be used for untimed blocking
operations. In the interim, you have to use
`try_get_for(Kernel::wait_for_u32_forever)`.

`Mail::put` differs in that it has always been a non-blocking call, but
it can be assumed to always succeed when used correctly, because the
Queue has enough room to store a pointer to every block in the
MemoryPool. It could in future be made a `void` return, similar to the
change made to `Mutex::lock`.
pull/12901/head
Kevin Bracey 2020-04-21 14:39:50 +03:00
parent 166ada084e
commit 181446331e
5 changed files with 235 additions and 217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
TESTS/mbedmicro-rtos-mbed/mail/main.cpp
View File

@ -83,9 +83,8 @@ void receive_thread(Mail<mail_t, queue_size> *m, uint8_t thread_id, milliseconds
ThisThread::sleep_for(wait); ThisThread::sleep_for(wait);
for (uint32_t i = 0; i < queue_size; i++) { for (uint32_t i = 0; i < queue_size; i++) {
osEvent evt = m->get(); mail_t *mail = m->try_get_for(Kernel::wait_for_u32_forever);
if (evt.status == osEventMail) { if (mail) {
mail_t *mail = (mail_t *)evt.value.p;
const uint8_t id = mail->thread_id; const uint8_t id = mail->thread_id;
// verify thread id // verify thread id
@ -121,9 +120,8 @@ void test_single_thread_order(void)
for (uint32_t i = 0; i < QUEUE_SIZE; i++) { for (uint32_t i = 0; i < QUEUE_SIZE; i++) {
// mail receive (main thread) // mail receive (main thread)
osEvent evt = mail_box.get(); mail_t *mail = mail_box.try_get_for(Kernel::wait_for_u32_forever);
if (evt.status == osEventMail) { if (mail) {
mail_t *mail = (mail_t *)evt.value.p;
const uint8_t id = mail->thread_id; const uint8_t id = mail->thread_id;
// verify thread id // verify thread id
@ -163,9 +161,8 @@ void test_multi_thread_order(void)
for (uint32_t i = 0; i < QUEUE_SIZE; i++) { for (uint32_t i = 0; i < QUEUE_SIZE; i++) {
// mail receive (main thread) // mail receive (main thread)
osEvent evt = mail_box.get(); mail_t *mail = mail_box.try_get_for(Kernel::wait_for_u32_forever);
if (evt.status == osEventMail) { if (mail) {
mail_t *mail = (mail_t *)evt.value.p;
const uint8_t id = mail->thread_id; const uint8_t id = mail->thread_id;
// verify thread id // verify thread id
@ -279,8 +276,8 @@ void test_free_null()
/** Test get from empty mailbox with timeout set /** Test get from empty mailbox with timeout set
Given an empty mailbox Given an empty mailbox
When @a get is called on the mailbox with timeout of 50 When @a try_get_for is called on the mailbox with timeout of 50ms
Then mailbox returns status of osOK, but no data after specified amount of time Then mailbox returns no data
*/ */
void test_get_empty_timeout() void test_get_empty_timeout()
{ {
@ -288,23 +285,23 @@ void test_get_empty_timeout()
Timer timer; Timer timer;
timer.start(); timer.start();
osEvent evt = mail_box.get(50ms); uint32_t *mail = mail_box.try_get_for(50ms);
TEST_ASSERT_DURATION_WITHIN(5ms, 50ms, timer.elapsed_time()); TEST_ASSERT_DURATION_WITHIN(5ms, 50ms, timer.elapsed_time());
TEST_ASSERT_EQUAL(osEventTimeout, evt.status); TEST_ASSERT_NULL(mail);
} }
/** Test get from empty mailbox with 0 timeout /** Test get from empty mailbox with 0 timeout
Given an empty mailbox Given an empty mailbox
When @a get is called on the mailbox with timeout of 0 When @a try_get is called on the mailbox
Then mailbox returns status of osOK, but no data Then mailbox returns no data
*/ */
void test_get_empty_no_timeout() void test_get_empty_no_timeout()
{ {
Mail<uint32_t, 4> mail_box; Mail<uint32_t, 4> mail_box;
osEvent evt = mail_box.get(0ms); uint32_t *mail = mail_box.try_get();
TEST_ASSERT_EQUAL(osOK, evt.status); TEST_ASSERT_NULL(mail);
} }
/** Test mail order /** Test mail order
@ -317,7 +314,6 @@ void test_get_empty_no_timeout()
void test_order(void) void test_order(void)
{ {
osStatus status; osStatus status;
osEvent evt;
Mail<int32_t, 4> mail_box; Mail<int32_t, 4> mail_box;
const int32_t TEST_VAL1 = 123; const int32_t TEST_VAL1 = 123;
const int32_t TEST_VAL2 = 456; const int32_t TEST_VAL2 = 456;
@ -326,27 +322,21 @@ void test_order(void)
TEST_ASSERT_NOT_EQUAL(NULL, mail1); TEST_ASSERT_NOT_EQUAL(NULL, mail1);
*mail1 = TEST_VAL1; *mail1 = TEST_VAL1;
status = mail_box.put(mail1); mail_box.put(mail1);
TEST_ASSERT_EQUAL(osOK, status);
int32_t *mail2 = mail_box.try_alloc(); int32_t *mail2 = mail_box.try_alloc();
TEST_ASSERT_NOT_EQUAL(NULL, mail2); TEST_ASSERT_NOT_EQUAL(NULL, mail2);
*mail2 = TEST_VAL2; *mail2 = TEST_VAL2;
status = mail_box.put(mail2); mail_box.put(mail2);
TEST_ASSERT_EQUAL(osOK, status);
evt = mail_box.get(); mail1 = mail_box.try_get_for(Kernel::wait_for_u32_forever);
TEST_ASSERT_EQUAL(evt.status, osEventMail); TEST_ASSERT_NOT_NULL(mail1);
mail1 = (int32_t *)evt.value.p;
TEST_ASSERT_EQUAL(TEST_VAL1, *mail1); TEST_ASSERT_EQUAL(TEST_VAL1, *mail1);
evt = mail_box.get(); mail2 = mail_box.try_get_for(Kernel::wait_for_u32_forever);
TEST_ASSERT_EQUAL(evt.status, osEventMail); TEST_ASSERT_NOT_NULL(mail2);
mail2 = (int32_t *)evt.value.p;
TEST_ASSERT_EQUAL(TEST_VAL2, *mail2); TEST_ASSERT_EQUAL(TEST_VAL2, *mail2);
@ -369,7 +359,6 @@ void test_max_size()
{ {
osStatus status; osStatus status;
Mail<uint32_t, 4> mail_box; Mail<uint32_t, 4> mail_box;
const uint32_t TEST_VAL = 123;
// 1 OK // 1 OK
uint32_t *mail1 = mail_box.try_alloc(); uint32_t *mail1 = mail_box.try_alloc();
@ -422,13 +411,10 @@ void test_data_type(void)
TEST_ASSERT_NOT_EQUAL(NULL, mail); TEST_ASSERT_NOT_EQUAL(NULL, mail);
*mail = TEST_VAL; *mail = TEST_VAL;
status = mail_box.put(mail); mail_box.put(mail);
TEST_ASSERT_EQUAL(osOK, status);
osEvent evt = mail_box.get(); mail = mail_box.try_get_for(Kernel::wait_for_u32_forever);
TEST_ASSERT_EQUAL(evt.status, osEventMail); TEST_ASSERT_NOT_NULL(mail);
mail = (T *)evt.value.p;
TEST_ASSERT_EQUAL(TEST_VAL, *mail); TEST_ASSERT_EQUAL(TEST_VAL, *mail);

182
TESTS/mbedmicro-rtos-mbed/queue/main.cpp
View File

@ -38,44 +38,47 @@ using namespace std::chrono;
} while (0) } while (0)
#define THREAD_STACK_SIZE 512 #define THREAD_STACK_SIZE 512
#define TEST_UINT_MSG 0xDEADBEEF
#define TEST_UINT_MSG2 0xE1EE7
#define TEST_TIMEOUT 50ms #define TEST_TIMEOUT 50ms
static uint32_t msg;
static uint32_t msg2;
void thread_put_uint_msg(Queue<uint32_t, 1> *q) void thread_put_uint_msg(Queue<uint32_t, 1> *q)
{ {
ThisThread::sleep_for(TEST_TIMEOUT); ThisThread::sleep_for(TEST_TIMEOUT);
osStatus stat = q->put((uint32_t *) TEST_UINT_MSG); bool stat = q->try_put(&msg);
TEST_ASSERT_EQUAL(osOK, stat); TEST_ASSERT_TRUE(stat);
} }
void thread_get_uint_msg(Queue<uint32_t, 1> *q) void thread_get_uint_msg(Queue<uint32_t, 1> *q)
{ {
ThisThread::sleep_for(TEST_TIMEOUT); ThisThread::sleep_for(TEST_TIMEOUT);
osEvent evt = q->get(); uint32_t *v;
TEST_ASSERT_EQUAL(osEventMessage, evt.status); bool stat = q->try_get_for(Kernel::wait_for_u32_forever, &v);
TEST_ASSERT_EQUAL(TEST_UINT_MSG, evt.value.v); TEST_ASSERT_TRUE(stat)
TEST_ASSERT_EQUAL(&msg, v);
} }
/** Test pass uint msg /** Test pass msg
Given a queue for uint32_t messages with one slot Given a queue for uint32_t messages with one slot
When a uin32_t value is inserted into the queue When a uin32_t value is inserted into the queue
and a message is extracted from the queue and a message is extracted from the queue
Then the extracted message is the same as previously inserted message Then the extracted message is the same as previously inserted message
*/ */
void test_pass_uint() void test_pass()
{ {
Queue<uint32_t, 1> q; Queue<uint32_t, 1> q;
osStatus stat = q.put((uint32_t *)TEST_UINT_MSG); bool stat = q.try_put(&msg);
TEST_ASSERT_EQUAL(osOK, stat); TEST_ASSERT_TRUE(stat)
osEvent evt = q.get(); uint32_t *v;
TEST_ASSERT_EQUAL(osEventMessage, evt.status); stat = q.try_get_for(Kernel::wait_for_u32_forever, &v);
TEST_ASSERT_EQUAL(TEST_UINT_MSG, evt.value.v); TEST_ASSERT_TRUE(stat)
TEST_ASSERT_EQUAL(&msg, v);
} }
/** Test pass uint msg twice /** Test pass msg twice
Given a queue for uint32_t messages with one slot Given a queue for uint32_t messages with one slot
When a uin32_t value is inserted into the queue When a uin32_t value is inserted into the queue
@ -84,56 +87,38 @@ void test_pass_uint()
Then the extracted message is the same as previously inserted message for both iterations Then the extracted message is the same as previously inserted message for both iterations
*/ */
void test_pass_uint_twice() void test_pass_twice()
{ {
Queue<uint32_t, 1> q; Queue<uint32_t, 1> q;
osStatus stat = q.put((uint32_t *)TEST_UINT_MSG); bool stat = q.try_put(&msg);
TEST_ASSERT_EQUAL(osOK, stat); TEST_ASSERT_TRUE(stat);
osEvent evt = q.get(); uint32_t *v;
TEST_ASSERT_EQUAL(osEventMessage, evt.status); stat = q.try_get_for(Kernel::wait_for_u32_forever, &v);
TEST_ASSERT_EQUAL(TEST_UINT_MSG, evt.value.v); TEST_ASSERT_TRUE(stat);
TEST_ASSERT_EQUAL(&msg, v);
stat = q.put((uint32_t *)TEST_UINT_MSG2); stat = q.try_put(&msg2);
TEST_ASSERT_EQUAL(osOK, stat); TEST_ASSERT_TRUE(stat);
evt = q.get(); stat = q.try_get_for(Kernel::wait_for_u32_forever, &v);
TEST_ASSERT_EQUAL(osEventMessage, evt.status); TEST_ASSERT_TRUE(stat);
TEST_ASSERT_EQUAL(TEST_UINT_MSG2, evt.value.v); TEST_ASSERT_EQUAL(&msg2, v);
}
/** Test pass ptr msg
Given a queue for pointers to uint32_t messages with one slot
When a pointer to an uint32_t is inserted into the queue
and a message is extracted from the queue
Then the extracted message is the same as previously inserted message
*/
void test_pass_ptr()
{
Queue<uint32_t, 1> q;
uint32_t msg = TEST_UINT_MSG;
osStatus stat = q.put(&msg);
TEST_ASSERT_EQUAL(osOK, stat);
osEvent evt = q.get();
TEST_ASSERT_EQUAL(osEventMessage, evt.status);
TEST_ASSERT_EQUAL(&msg, evt.value.p);
} }
/** Test get from empty queue /** Test get from empty queue
Given an empty queue for uint32_t values Given an empty queue for uint32_t values
When @a get is called on the queue with timeout of 0 When @a get is called on the queue with timeout of 0
Then queue returns status of osOK, but no data Then queue returns status of false
*/ */
void test_get_empty_no_timeout() void test_get_empty_no_timeout()
{ {
Queue<uint32_t, 1> q; Queue<uint32_t, 1> q;
osEvent evt = q.get(0ms); uint32_t *v;
TEST_ASSERT_EQUAL(osOK, evt.status); bool stat = q.try_get(&v);
TEST_ASSERT_FALSE(stat);
} }
/** Test get from empty queue with timeout /** Test get from empty queue with timeout
@ -148,8 +133,9 @@ void test_get_empty_timeout()
Timer timer; Timer timer;
timer.start(); timer.start();
osEvent evt = q.get(50ms); uint32_t *v;
TEST_ASSERT_EQUAL(osEventTimeout, evt.status); bool stat = q.try_get_for(50ms, &v);
TEST_ASSERT_FALSE(stat);
TEST_ASSERT_DURATION_WITHIN(5ms, 50ms, timer.elapsed_time()); TEST_ASSERT_DURATION_WITHIN(5ms, 50ms, timer.elapsed_time());
} }
@ -171,9 +157,10 @@ void test_get_empty_wait_forever()
Timer timer; Timer timer;
timer.start(); timer.start();
osEvent evt = q.get(); uint32_t *v;
TEST_ASSERT_EQUAL(osEventMessage, evt.status); bool stat = q.try_get_for(Kernel::wait_for_u32_forever, &v);
TEST_ASSERT_EQUAL(TEST_UINT_MSG, evt.value.v); TEST_ASSERT_TRUE(stat);
TEST_ASSERT_EQUAL(&msg, v);
TEST_ASSERT_DURATION_WITHIN(TEST_TIMEOUT / 10, TEST_TIMEOUT, timer.elapsed_time()); TEST_ASSERT_DURATION_WITHIN(TEST_TIMEOUT / 10, TEST_TIMEOUT, timer.elapsed_time());
} }
@ -181,37 +168,37 @@ void test_get_empty_wait_forever()
* *
* Given a queue with one slot for uint32_t data * Given a queue with one slot for uint32_t data
* When a thread tries to insert two messages * When a thread tries to insert two messages
* Then first operation succeeds and second fails with @a osErrorResource * Then first operation succeeds and second fails
*/ */
void test_put_full_no_timeout() void test_put_full_no_timeout()
{ {
Queue<uint32_t, 1> q; Queue<uint32_t, 1> q;
osStatus stat = q.put((uint32_t *) TEST_UINT_MSG); bool stat = q.try_put(&msg);
TEST_ASSERT_EQUAL(osOK, stat); TEST_ASSERT_TRUE(stat);
stat = q.put((uint32_t *) TEST_UINT_MSG); stat = q.try_put(&msg);
TEST_ASSERT_EQUAL(osErrorResource, stat); TEST_ASSERT_FALSE(stat);
} }
/** Test put full timeout /** Test put full timeout
* *
* Given a queue with one slot for uint32_t data * Given a queue with one slot for uint32_t data
* When a thread tries to insert two messages with @ TEST_TIMEOUT timeout * When a thread tries to insert two messages with @ TEST_TIMEOUT timeout
* Then first operation succeeds and second fails with @a osErrorTimeout * Then first operation succeeds and second fails
*/ */
void test_put_full_timeout() void test_put_full_timeout()
{ {
Queue<uint32_t, 1> q; Queue<uint32_t, 1> q;
osStatus stat = q.put((uint32_t *) TEST_UINT_MSG, TEST_TIMEOUT); bool stat = q.try_put_for(TEST_TIMEOUT, &msg);
TEST_ASSERT_EQUAL(osOK, stat); TEST_ASSERT_TRUE(stat);
Timer timer; Timer timer;
timer.start(); timer.start();
stat = q.put((uint32_t *) TEST_UINT_MSG, TEST_TIMEOUT); stat = q.try_put_for(TEST_TIMEOUT, &msg);
TEST_ASSERT_EQUAL(osErrorTimeout, stat); TEST_ASSERT_FALSE(stat);
TEST_ASSERT_DURATION_WITHIN(TEST_TIMEOUT / 10, TEST_TIMEOUT, timer.elapsed_time()); TEST_ASSERT_DURATION_WITHIN(TEST_TIMEOUT / 10, TEST_TIMEOUT, timer.elapsed_time());
} }
@ -230,13 +217,13 @@ void test_put_full_waitforever()
t.start(callback(thread_get_uint_msg, &q)); t.start(callback(thread_get_uint_msg, &q));
osStatus stat = q.put((uint32_t *) TEST_UINT_MSG); bool stat = q.try_put(&msg);
TEST_ASSERT_EQUAL(osOK, stat); TEST_ASSERT_TRUE(stat);
Timer timer; Timer timer;
timer.start(); timer.start();
stat = q.put((uint32_t *) TEST_UINT_MSG, Kernel::wait_for_u32_forever); stat = q.try_put_for(Kernel::wait_for_u32_forever, &msg);
TEST_ASSERT_EQUAL(osOK, stat); TEST_ASSERT_TRUE(stat);
TEST_ASSERT_DURATION_WITHIN(TEST_TIMEOUT / 10, TEST_TIMEOUT, timer.elapsed_time()); TEST_ASSERT_DURATION_WITHIN(TEST_TIMEOUT / 10, TEST_TIMEOUT, timer.elapsed_time());
t.join(); t.join();
@ -252,19 +239,20 @@ void test_msg_order()
{ {
Queue<uint32_t, 2> q; Queue<uint32_t, 2> q;
osStatus stat = q.put((uint32_t *) TEST_UINT_MSG, TEST_TIMEOUT); bool stat = q.try_put_for(TEST_TIMEOUT, &msg);
TEST_ASSERT_EQUAL(osOK, stat); TEST_ASSERT_TRUE(stat);
stat = q.put((uint32_t *) TEST_UINT_MSG2, TEST_TIMEOUT); stat = q.try_put_for(TEST_TIMEOUT, &msg2);
TEST_ASSERT_EQUAL(osOK, stat); TEST_ASSERT_TRUE(stat);
osEvent evt = q.get(); uint32_t *v;
TEST_ASSERT_EQUAL(osEventMessage, evt.status); stat = q.try_get(&v);
TEST_ASSERT_EQUAL(TEST_UINT_MSG, evt.value.v); TEST_ASSERT_TRUE(stat);
TEST_ASSERT_EQUAL(&msg, v);
evt = q.get(); stat = q.try_get(&v);
TEST_ASSERT_EQUAL(osEventMessage, evt.status); TEST_ASSERT_TRUE(stat);
TEST_ASSERT_EQUAL(TEST_UINT_MSG2, evt.value.v); TEST_ASSERT_EQUAL(&msg2, v);
} }
/** Test message priority /** Test message priority
@ -277,19 +265,20 @@ void test_msg_prio()
{ {
Queue<uint32_t, 2> q; Queue<uint32_t, 2> q;
osStatus stat = q.put((uint32_t *) TEST_UINT_MSG, TEST_TIMEOUT, 0); bool stat = q.try_put_for(TEST_TIMEOUT, &msg, 0);
TEST_ASSERT_EQUAL(osOK, stat); TEST_ASSERT_TRUE(stat);
stat = q.put((uint32_t *) TEST_UINT_MSG2, TEST_TIMEOUT, 1); stat = q.try_put_for(TEST_TIMEOUT, &msg2, 1);
TEST_ASSERT_EQUAL(osOK, stat); TEST_ASSERT_TRUE(stat);
osEvent evt = q.get(); uint32_t *v;
TEST_ASSERT_EQUAL(osEventMessage, evt.status); stat = q.try_get(&v);
TEST_ASSERT_EQUAL(TEST_UINT_MSG2, evt.value.v); TEST_ASSERT_TRUE(stat);
TEST_ASSERT_EQUAL(&msg2, v);
evt = q.get(); stat = q.try_get(&v);
TEST_ASSERT_EQUAL(osEventMessage, evt.status); TEST_ASSERT_TRUE(stat);
TEST_ASSERT_EQUAL(TEST_UINT_MSG, evt.value.v); TEST_ASSERT_EQUAL(&msg, v);
} }
/** Test queue empty /** Test queue empty
@ -302,11 +291,11 @@ void test_queue_empty()
{ {
Queue<uint32_t, 1> q; Queue<uint32_t, 1> q;
TEST_ASSERT_EQUAL(true, q.empty()); TEST_ASSERT_TRUE(q.empty());
q.put((uint32_t *) TEST_UINT_MSG, TEST_TIMEOUT, 1); q.try_put_for(TEST_TIMEOUT, &msg, 1);
TEST_ASSERT_EQUAL(false, q.empty()); TEST_ASSERT_FALSE(q.empty());
} }
/** Test queue empty /** Test queue empty
@ -319,11 +308,11 @@ void test_queue_full()
{ {
Queue<uint32_t, 1> q; Queue<uint32_t, 1> q;
TEST_ASSERT_EQUAL(false, q.full()); TEST_ASSERT_FALSE(q.full());
q.put((uint32_t *) TEST_UINT_MSG, TEST_TIMEOUT, 1); q.try_put_for(TEST_TIMEOUT, &msg, 1);
TEST_ASSERT_EQUAL(true, q.full()); TEST_ASSERT_TRUE(q.full());
} }
utest::v1::status_t test_setup(const size_t number_of_cases) utest::v1::status_t test_setup(const size_t number_of_cases)
@ -333,9 +322,8 @@ utest::v1::status_t test_setup(const size_t number_of_cases)
} }
Case cases[] = { Case cases[] = {
Case("Test pass uint msg", test_pass_uint), Case("Test pass msg", test_pass),
Case("Test pass uint msg twice", test_pass_uint_twice), Case("Test pass msg twice", test_pass_twice),
Case("Test pass ptr msg", test_pass_ptr),
Case("Test get from empty queue no timeout", test_get_empty_no_timeout), Case("Test get from empty queue no timeout", test_get_empty_no_timeout),
Case("Test get from empty queue timeout", test_get_empty_timeout), Case("Test get from empty queue timeout", test_get_empty_timeout),
Case("Test get empty wait forever", test_get_empty_wait_forever), Case("Test get empty wait forever", test_get_empty_wait_forever),

6
TESTS/mbedmicro-rtos-mbed/threads/main.cpp
View File

@ -705,12 +705,12 @@ void test_msg_get()
TEST_ASSERT_EQUAL(Thread::WaitingMessageGet, t.get_state()); TEST_ASSERT_EQUAL(Thread::WaitingMessageGet, t.get_state());
queue.put((int32_t *)0xE1EE7); queue.try_put((int32_t *)0xE1EE7);
} }
void test_msg_put_thread(Queue<int32_t, 1> *queue) void test_msg_put_thread(Queue<int32_t, 1> *queue)
{ {
queue->put((int32_t *)0xDEADBEEF, Kernel::wait_for_u32_forever); queue->try_put_for(Kernel::wait_for_u32_forever, (int32_t *)0xDEADBEEF);
} }
@ -729,7 +729,7 @@ void test_msg_put()
Thread t(osPriorityNormal, THREAD_STACK_SIZE); Thread t(osPriorityNormal, THREAD_STACK_SIZE);
Queue<int32_t, 1> queue; Queue<int32_t, 1> queue;
queue.put((int32_t *)0xE1EE7); queue.try_put((int32_t *)0xE1EE7);
t.start(callback(test_msg_put_thread, &queue)); t.start(callback(test_msg_put_thread, &queue));

63
rtos/Mail.h
View File

@ -33,6 +33,7 @@
#include "rtos/mbed_rtos1_types.h" #include "rtos/mbed_rtos1_types.h"
#include "platform/mbed_toolchain.h" #include "platform/mbed_toolchain.h"
#include "platform/mbed_assert.h"
#include "platform/NonCopyable.h" #include "platform/NonCopyable.h"
#ifndef MBED_NO_GLOBAL_USING_DIRECTIVE #ifndef MBED_NO_GLOBAL_USING_DIRECTIVE
@ -289,31 +290,19 @@ public:
* @param mptr Memory block previously allocated with Mail::alloc or Mail::calloc. * @param mptr Memory block previously allocated with Mail::alloc or Mail::calloc.
* *
* @return Status code that indicates the execution status of the function (osOK on success). * @return Status code that indicates the execution status of the function (osOK on success).
* See note.
* *
* @note You may call this function from ISR context. * @note You may call this function from ISR context.
* @note As the mail should have already been allocated, and the memory pool is the same size
* as the queue, the put operation should always succeed, despite being implemented with
* Queue::try_put - there is room in the queue for every mail from the pool. Therefore
* use of the return value is deprecated, and the function will return void in future.
*/ */
osStatus put(T *mptr) osStatus put(T *mptr)
{ {
return _queue.put(mptr); bool ok = _queue.try_put(mptr);
} MBED_ASSERT(ok);
return ok ? osOK : osErrorResource;
/** Get a mail from the queue.
*
* @param millisec Timeout value.
*
* @return Event that contains mail information or error code.
* @retval osEventMessage Message received.
* @retval osOK No mail is available (and no timeout was specified).
* @retval osEventTimeout No mail has arrived during the given timeout period.
* @retval osErrorParameter A parameter is invalid or outside of a permitted range.
*
* @note You may call this function from ISR context if the millisec parameter is set to 0.
* @deprecated Pass a chrono duration, not an integer millisecond count. For example use `5s` rather than `5000`.
*/
MBED_DEPRECATED_SINCE("mbed-os-6.0.0", "Pass a chrono duration, not an integer millisecond count. For example use `5s` rather than `5000`.")
osEvent get(uint32_t millisec)
{
return get(std::chrono::duration<uint32_t, std::milli>(millisec));
} }
/** Get a mail from the queue. /** Get a mail from the queue.
@ -328,16 +317,46 @@ public:
* @a osErrorParameter A parameter is invalid or outside of a permitted range. * @a osErrorParameter A parameter is invalid or outside of a permitted range.
* *
* @note You may call this function from ISR context if the millisec parameter is set to 0. * @note You may call this function from ISR context if the millisec parameter is set to 0.
* @deprecated Replaced with try_get and try_get_for. In future get will be an untimed blocking call.
*/ */
osEvent get(Kernel::Clock::duration_u32 rel_time = Kernel::wait_for_u32_forever) MBED_DEPRECATED_SINCE("mbed-os-6.0.0", "Replaced with try_get and try_get_for. In future get will be an untimed blocking call.")
osEvent get(uint32_t millisec = osWaitForever)
{ {
osEvent evt = _queue.get(rel_time); osEvent evt = _queue.get(millisec);
if (evt.status == osEventMessage) { if (evt.status == osEventMessage) {
evt.status = osEventMail; evt.status = osEventMail;
} }
return evt; return evt;
} }
/** Get a mail from the queue.
*
* @return Pointer to received mail, or nullptr if none was received.
*
* @note You may call this function from ISR context.
*/
T *try_get()
{
T *mptr = nullptr;
_queue.try_get(&mptr);
return mptr;
}
/** Get a mail from the queue.
*
* @param rel_time Timeout value or Kernel::wait_for_u32_forever.
*
* @return Pointer to received mail, or nullptr if none was received.
*
* @note You may call this function from ISR context if the millisec parameter is set to 0.
*/
T *try_get_for(Kernel::Clock::duration_u32 rel_time)
{
T *mptr = nullptr;
_queue.try_get_for(rel_time, &mptr);
return mptr;
}
/** Free a memory block from a mail. /** Free a memory block from a mail.
* *
* @param mptr Pointer to the memory block that was obtained with Mail::get. * @param mptr Pointer to the memory block that was obtained with Mail::get.

141
rtos/Queue.h
View File

@ -122,6 +122,27 @@ public:
return osMessageQueueGetCount(_id); return osMessageQueueGetCount(_id);
} }
/** Inserts the given element to the end of the queue.
*
* This function puts the message pointed to by `data` into the queue. The
* parameter `prio` is used to sort the message according to their priority
* (higher numbers indicate higher priority) on insertion.
*
* The function does not block, and returns immediately if the queue is full.
*
* @param data Pointer to the element to insert into the queue.
* @param prio Priority of the operation or 0 in case of default.
* (default: 0)
*
* @return true if the element was inserted, false otherwise.
*
* @note You may call this function from ISR context.
*/
bool try_put(T *data, uint8_t prio = 0)
{
return try_put_for(Kernel::Clock::duration_u32::zero(), data, prio);
}
/** Inserts the given element to the end of the queue. /** Inserts the given element to the end of the queue.
* *
* This function puts the message pointed to by `data` into the queue. The * This function puts the message pointed to by `data` into the queue. The
@ -133,34 +154,27 @@ public:
* queue. * queue.
* *
* The parameter `rel_time` can have the following values: * The parameter `rel_time` can have the following values:
* - When the duration is 0 (the default), the function returns instantly. * - When the duration is 0, the function returns instantly. You could use
* `try_put` instead.
* - When the duration is Kernel::wait_for_u32_forever, the function waits for an * - When the duration is Kernel::wait_for_u32_forever, the function waits for an
* infinite time. * infinite time.
* - For all other values, the function waits for the given duration. * - For all other values, the function waits for the given duration.
* *
* @param rel_time Timeout for the operation to be executed.
* @param data Pointer to the element to insert into the queue. * @param data Pointer to the element to insert into the queue.
* @param rel_time Timeout for the operation to be executed, or 0 in case
* of no timeout. (default: 0)
* @param prio Priority of the operation or 0 in case of default. * @param prio Priority of the operation or 0 in case of default.
* (default: 0) * (default: 0)
* *
* @return Status code that indicates the execution status of the function: * @return true if the element was inserted, false otherwise.
* @a osOK The message has been successfully inserted
* into the queue.
* @a osErrorTimeout The message could not be inserted into the
* queue in the given time.
* @a osErrorResource The message could not be inserted because
* the queue is full.
* @a osErrorParameter Internal error or nonzero timeout specified
* in an ISR.
* *
* @note You may call this function from ISR context if the rel_time * @note You may call this function from ISR context if the rel_time
* parameter is set to 0. * parameter is set to 0.
* *
*/ */
osStatus put(T *data, Kernel::Clock::duration_u32 rel_time = Kernel::Clock::duration_u32::zero(), uint8_t prio = 0) bool try_put_for(Kernel::Clock::duration_u32 rel_time, T *data, uint8_t prio = 0)
{ {
return osMessageQueuePut(_id, &data, prio, rel_time.count()); osStatus status = osMessageQueuePut(_id, &data, prio, rel_time.count());
return status == osOK;
} }
/** Inserts the given element to the end of the queue. /** Inserts the given element to the end of the queue.
@ -198,25 +212,43 @@ public:
* *
* @note You may call this function from ISR context if the millisec * @note You may call this function from ISR context if the millisec
* parameter is set to 0. * parameter is set to 0.
* @deprecated Pass a chrono duration, not an integer millisecond count. For example use `5s` rather than `5000`. * @deprecated Replaced with try_put and try_put_for. In future put will be an untimed blocking call.
*/ */
MBED_DEPRECATED_SINCE("mbed-os-6.0.0", "Pass a chrono duration, not an integer millisecond count. For example use `5s` rather than `5000`.") MBED_DEPRECATED_SINCE("mbed-os-6.0.0", "Replaced with try_put and try_put_for. In future put will be an untimed blocking call.")
osStatus put(T *data, uint32_t millisec, uint8_t prio = 0) osStatus put(T *data, uint32_t millisec = 0, uint8_t prio = 0)
{ {
return put(data, std::chrono::duration<uint32_t, std::milli>(millisec), prio); return osMessageQueuePut(_id, &data, prio, millisec);
}
/** Get a message from the queue.
*
* This function retrieves a message from the queue. The message is stored
* in the location pointed to be the parameter `data_out`.
*
* The function does not block, and returns immediately if the queue is empty.
*
* @param[out] data_out Pointer to location to write the element retrieved from the queue.
*
* @return true if an element was received and written to data_out.
*
* @note You may call this function from ISR context.
*/
bool try_get(T **data_out)
{
return try_get_for(Kernel::Clock::duration_u32::zero(), data_out);
} }
/** Get a message or wait for a message from the queue. /** Get a message or wait for a message from the queue.
* *
* This function retrieves a message from the queue. The message is stored * This function retrieves a message from the queue. The message is stored
* in the value field of the returned `osEvent` object. * in the location pointed to be the parameter `data_out`.
* *
* The timeout specified by the parameter `rel_time` specifies how long the * The timeout specified by the parameter `rel_time` specifies how long the
* function waits to retrieve the message from the queue. * function waits to retrieve the message from the queue.
* *
* The timeout parameter can have the following values: * The timeout parameter can have the following values:
* - When the timeout is 0, the function returns instantly. * - When the timeout is 0, the function returns instantly.
* - When the timeout is Kernel::wait_for_u32_forever (default), the function waits * - When the timeout is Kernel::wait_for_u32_forever, the function waits
* infinite time until the message is retrieved. * infinite time until the message is retrieved.
* - When the timeout is any other value, the function waits for the * - When the timeout is any other value, the function waits for the
* specified time before returning a timeout error. * specified time before returning a timeout error.
@ -226,46 +258,17 @@ public:
* (FIFO) order. * (FIFO) order.
* *
* @param rel_time Timeout value. * @param rel_time Timeout value.
* (default: Kernel::wait_for_u32_forever). * @param[out] data_out Pointer to location to write the element retrieved from the queue.
* *
* @return Event information that includes the message in event. Message * @return true if an element was received and written to data_out.
* value and the status code in event.status:
* @a osEventMessage Message successfully received.
* @a osOK No message is available in the queue, and no
* timeout was specified.
* @a osEventTimeout No message was received before a timeout
* event occurred.
* @a osErrorParameter A parameter is invalid or outside of a
* permitted range.
* *
* @note You may call this function from ISR context if the rel_time * @note You may call this function from ISR context if the rel_time
* parameter is set to 0. * parameter is set to 0.
*/ */
osEvent get(Kernel::Clock::duration_u32 rel_time = Kernel::wait_for_u32_forever) bool try_get_for(Kernel::Clock::duration_u32 rel_time, T **data_out)
{ {
osEvent event; osStatus status = osMessageQueueGet(_id, data_out, nullptr, rel_time.count());
T *data = nullptr; return status == osOK;
osStatus_t res = osMessageQueueGet(_id, &data, nullptr, rel_time.count());
switch (res) {
case osOK:
event.status = (osStatus)osEventMessage;
event.value.p = data;
break;
case osErrorResource:
event.status = osOK;
break;
case osErrorTimeout:
event.status = (osStatus)osEventTimeout;
break;
case osErrorParameter:
default:
event.status = osErrorParameter;
break;
}
event.def.message_id = _id;
return event;
} }
/** Get a message or wait for a message from the queue. /** Get a message or wait for a message from the queue.
@ -301,12 +304,34 @@ public:
* *
* @note You may call this function from ISR context if the millisec * @note You may call this function from ISR context if the millisec
* parameter is set to 0. * parameter is set to 0.
* @deprecated Pass a chrono duration, not an integer millisecond count. For example use `5s` rather than `5000`. * @deprecated Replaced with try_get and try_get_for. In future get will be an untimed blocking call.
*/ */
MBED_DEPRECATED_SINCE("mbed-os-6.0.0", "Pass a chrono duration, not an integer millisecond count. For example use `5s` rather than `5000`.") MBED_DEPRECATED_SINCE("mbed-os-6.0.0", "Replaced with try_get and try_get_for. In future get will be an untimed blocking call.")
osEvent get(uint32_t millisec) osEvent get(uint32_t millisec = osWaitForever)
{ {
return get(std::chrono::duration<uint32_t, std::milli>(millisec)); osEvent event;
T *data = nullptr;
osStatus_t res = osMessageQueueGet(_id, &data, nullptr, millisec);
switch (res) {
case osOK:
event.status = (osStatus)osEventMessage;
event.value.p = data;
break;
case osErrorResource:
event.status = osOK;
break;
case osErrorTimeout:
event.status = (osStatus)osEventTimeout;
break;
case osErrorParameter:
default:
event.status = osErrorParameter;
break;
}
event.def.message_id = _id;
return event;
} }
private: private:
osMessageQueueId_t _id; osMessageQueueId_t _id;